OicClient: Remove suffix "Resource" from CRUD methods

Change-Id: Idaf935960c9e8cebcfe240f1340137be205fe024
intel · Apr 22, 2016 · 6d32fdf · 6d32fdf
1 parent 472f99f
commit 6d32fdf
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/js/high-level-resource-creation-client.js b/js/high-level-resource-creation-client.js
@@ -42,7 +42,7 @@ new Promise( function( fulfill, reject ) {
 	} );
 } ).then( function( deviceId ) {
 	console.log( "deviceId discovered" );
-	return device.createResource( {
+	return device.create( {
 		id: {
 			deviceId: deviceId,
 			path: "/a/new-resource"
@@ -56,7 +56,7 @@ new Promise( function( fulfill, reject ) {
 } ).then( function( resource ) {
 	console.log( "remote resource successfully created with id " +
 		JSON.stringify( resource.id ) );
-	return device.deleteResource( resource.id );
+	return device.delete( resource.id );
 } ).then( function() {
 	console.log( "remote resource successfully deleted" );
 } ).catch( throwError );
diff --git a/lib/OicClient.js b/lib/OicClient.js
@@ -503,9 +503,9 @@ _.extend( devicePrototype, {
 			}, this ) );
 	},
 
-	createResource: function( resource ) {
+	create: function( resource ) {
 		return this._oneShotRequest( {
-			prefix: "createResource",
+			prefix: "create",
 			resourceId: resource.id,
 			method: "OC_REST_POST",
 			payload: _.extend( utils.objectToPayload( resource.properties ), {
@@ -519,9 +519,9 @@ _.extend( devicePrototype, {
 		} );
 	},
 
-	retrieveResource: function( id, queryParameters ) {
+	retrieve: function( id, queryParameters ) {
 		return this._oneShotRequest( {
-			prefix: "retrieveResource",
+			prefix: "retrieve",
 			resourceId: _.extend( {}, id, queryParameters ? {
 				path: id.path + "?" + querystring.stringify( queryParameters )
 			} : {} ),
@@ -535,18 +535,18 @@ _.extend( devicePrototype, {
 		} );
 	},
 
-	updateResource: function( resource ) {
+	update: function( resource ) {
 		return this._oneShotRequest( {
-			prefix: "updateResource",
+			prefix: "update",
 			resourceId: resource.id,
 			method: "OC_REST_PUT",
 			payload: utils.objectToPayload( resource.properties )
 		} );
 	},
 
-	deleteResource: function( id ) {
+	delete: function( id ) {
 		return this._oneShotRequest( {
-			prefix: "deleteResource",
+			prefix: "delete",
 			resourceId: id,
 			method: "OC_REST_DELETE",
 			createAnswer: function deleteResourceFromResponse() {

diff --git a/tests/tests/API Complex Payload/client.js b/tests/tests/API Complex Payload/client.js
@@ -42,7 +42,7 @@ async.series( [
 	},
 
 	function performRetrieve( callback ) {
-		device.retrieveResource( resource.id ).then(
+		device.retrieve( resource.id ).then(
 			function( resource ) {
 				testUtils.assert( "deepEqual", resource.properties, {
 					primitiveValue: 42,
@@ -58,7 +58,7 @@ async.series( [
 	},
 
 	function performUpdate( callback ) {
-		device.updateResource( _.extend( resource, {
+		device.update( _.extend( resource, {
 			properties: {
 				putValue: "A string",
 				anotherPutValue: 23.7,

diff --git a/tests/tests/API Create Delete/client.js b/tests/tests/API Create Delete/client.js
@@ -64,7 +64,7 @@ async.series( [
 	},
 
 	function createRemoteResource( callback ) {
-		device.createResource( newRemoteResourceTemplate ).then(
+		device.create( newRemoteResourceTemplate ).then(
 			function( resource ) {
 
 				// Use the newly created remote resource instead of the initial resource that we
@@ -86,7 +86,7 @@ async.series( [
 	},
 
 	function createDuplicateRemoteResource( callback ) {
-		device.createResource( newRemoteResourceTemplate ).then(
+		device.create( newRemoteResourceTemplate ).then(
 			function() {
 				callback( new Error( "Server created duplicate resource" ) );
 			}, function() {
@@ -97,7 +97,7 @@ async.series( [
 	},
 
 	function deleteRemoteResource( callback ) {
-		device.deleteResource( remoteResource.id ).then(
+		device.delete( remoteResource.id ).then(
 			function() {
 				utils.assert( "ok", true, "Client: Deleting the remote resource has succeeded" );
 				console.log( JSON.stringify( { killPeer: true } ) );

diff --git a/tests/tests/API Error Propagation/client.js b/tests/tests/API Error Propagation/client.js
@@ -40,15 +40,15 @@ async.series( [
 	},
 
 	function performFirstRetrieve( callback ) {
-		device.retrieveResource( id ).then(
+		device.retrieve( id ).then(
 			function() {
 				myUtils.die( "Client: First retrieve succeeded" );
 			},
 			function( error ) {
 				myUtils.assert( "ok", util.isError( error ),
 					"Client: First retrieve failed with Error" );
 				myUtils.assert( "strictEqual", error.message,
-					"retrieveResource: OCDoResource response failed",
+					"retrieve: OCDoResource response failed",
 					"Client: First error message is correct" );
 				myUtils.assert( "deepEqual", _.extend( {}, error ), {
 					result: 21,
@@ -59,7 +59,7 @@ async.series( [
 	},
 
 	function performSecondRetrieve( callback ) {
-		device.retrieveResource( id ).then(
+		device.retrieve( id ).then(
 			function() {
 				myUtils.die( "Client: Second retrieve succeeded" );
 			},

diff --git a/tests/tests/API Presence/client.js b/tests/tests/API Presence/client.js
@@ -110,7 +110,7 @@ async.series( [
 
 		// Start the presence cycling
 		theResource.properties.op = "cyclePresence";
-		device.updateResource( theResource ).catch( cleanup );
+		device.update( theResource ).catch( cleanup );
 	}
 
 ], function( error ) {

diff --git a/tests/tests/API Query Parameters/client.js b/tests/tests/API Query Parameters/client.js
@@ -36,12 +36,12 @@ new Promise( function discoverTheResource( fulfill, reject ) {
 	device.addEventListener( "resourcefound", resourcefound );
 	device.findResources().catch( teardown );
 } ).then( function retrieveTheResourceInGerman( resource ) {
-	return device.retrieveResource( resource.id, { language: "de" } );
+	return device.retrieve( resource.id, { language: "de" } );
 } ).then( function checkGermanAndRetrieveInHungarian( resource ) {
 	utils.assert( "deepEqual", resource.properties,
 		{ "How many angels can dance on the head of a pin?": "As many as wanting." },
 		"Client: Answer for language de is as expected" );
-	return device.retrieveResource( resource.id, { language: "hu" } );
+	return device.retrieve( resource.id, { language: "hu" } );
 } ).then( function checkHungarianAndQuit( resource ) {
 	utils.assert( "deepEqual", resource.properties,
 		{ "How many angels can dance on the head of a pin?": "Ahány akar." },

diff --git a/tests/tests/API Retrieve/client.js b/tests/tests/API Retrieve/client.js
@@ -22,15 +22,15 @@ console.log( JSON.stringify( { assertionCount: 5 } ) );
 
 async.series( [
 	function attemptFakeRetrieve( callback ) {
-		device.retrieveResource( { deviceId: "SomethingCrazy", path: "/going/nuts/here" } ).then(
+		device.retrieve( { deviceId: "SomethingCrazy", path: "/going/nuts/here" } ).then(
 			function( resource ) {
 				utils.assert( "ok", false, "Client: Retrieving fake resource succeeded: " +
 					JSON.stringify( resource ) );
 				callback();
 			},
 			function( error ) {
 				utils.assert( "strictEqual", "" + error,
-					"Error: retrieveResource: device not found",
+					"Error: retrieve: device not found",
 					"Client: Retrieving fake resource failed locally" );
 				callback();
 			} );
@@ -54,7 +54,7 @@ async.series( [
 		}, teardown );
 	},
 	function retrieveTheResource( callback ) {
-		device.retrieveResource( theResource.id ).then(
+		device.retrieve( theResource.id ).then(
 			function( resource ) {
 				utils.assert( "deepEqual", resource.properties, {
 					"How many angels can dance on the head of a pin?": "As many as wanting."
@@ -64,7 +64,7 @@ async.series( [
 			callback );
 	},
 	function retrieveTheResourceAgain( callback ) {
-		device.retrieveResource( theResource.id ).then(
+		device.retrieve( theResource.id ).then(
 			function() {
 				utils.assert( "ok", false,
 					"Client: Retrieving the resource a second time succeeded" );