From 78a2510b8d8d08c2913d499d2e4d466719adacbf Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 10:47:42 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126358 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 119623 jvonka: RA-663: Update REST fwk - fix BinaryResource update (currently masks entity PUT operation) - use "updateProperty" (instead of "update") to be consistent with other binary resource methods - note: REST fwk relies on unique method names across the resource actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/nodes/NodesEntityResource.java | 2 +- .../resource/actions/interfaces/BinaryResourceAction.java | 2 +- .../rest/framework/webscripts/ResourceWebScriptPut.java | 2 +- .../rest/framework/tests/api/mocks3/FlockEntityResource.java | 2 +- .../rest/framework/tests/api/mocks3/FlocketEntityResource.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java index ce536767b0..2dcb21d10e 100644 --- a/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java +++ b/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java @@ -93,7 +93,7 @@ public class NodesEntityResource implements @Override @WebApiDescription(title = "Upload content", description = "Upload content") @BinaryProperties({"content"}) - public void update(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters) + public void updateProperty(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters) { nodes.updateContent(fileNodeId, contentInfo, stream, parameters); } diff --git a/source/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java b/source/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java index 7537113b7b..7a5b7e9773 100755 --- a/source/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java +++ b/source/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java @@ -90,7 +90,7 @@ public interface BinaryResourceAction * @param contentInfo Basic information about the content stream * @param params {@link Parameters} */ - public void update (String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params); + public void updateProperty (String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params); } } diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java index 5886bfa054..d90b0d6771 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java @@ -198,7 +198,7 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId()); } BinaryResourceAction.Update binUpdater = (BinaryResourceAction.Update) resource.getResource(); - binUpdater.update(params.getEntityId(),params.getContentInfo(), params.getStream(), params); + binUpdater.updateProperty(params.getEntityId(),params.getContentInfo(), params.getStream(), params); //Don't pass anything to the callback - its just successful return null; default: diff --git a/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java b/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java index d0ba5bb17f..ad924a36bd 100755 --- a/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java +++ b/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlockEntityResource.java @@ -47,7 +47,7 @@ public class FlockEntityResource implements BinaryResourceAction.Read, BinaryRes @Override @WebApiDescription(title = "Updates a photo") @BinaryProperties("photo") - public void update(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params) + public void updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params) { return; } diff --git a/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java b/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java index fb5e7c1a1d..8612a5a420 100755 --- a/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java +++ b/source/test-java/org/alfresco/rest/framework/tests/api/mocks3/FlocketEntityResource.java @@ -43,7 +43,7 @@ public class FlocketEntityResource implements BinaryResourceAction.Read, BinaryR @Override @WebApiDescription(title = "Updates a flocket") @BinaryProperties({"photo","album"}) - public void update(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params) + public void updateProperty(String entityId, BasicContentInfo contentInfo, InputStream stream, Parameters params) { return; }