inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

Browse Source 
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/HEAD/root@126358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:30:30 +00:00
parent 840c1ba969
commit 0b75a49b73
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java
View File

@@ -86,7 +86,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);
}

2
source/java/org/alfresco/rest/framework/resource/actions/interfaces/BinaryResourceAction.java
View File

@@ -65,7 +65,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);
}
}

2
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java
View File

@@ -173,7 +173,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: