Merged HEAD (5.2) to 5.2.N (5.2.1)

126435 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121907 gjames: RA-774 Renaming action to operation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:18:56 +00:00
parent f56cf7e3f2
commit 72dca1b5be
11 changed files with 71 additions and 76 deletions

View File

@@ -28,7 +28,7 @@ package org.alfresco.rest.api.nodes;
import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.api.model.NodeTarget;
import org.alfresco.rest.framework.Action;
import org.alfresco.rest.framework.Operation;
import org.alfresco.rest.framework.BinaryProperties;
import org.alfresco.rest.framework.WebApiDescription;
import org.alfresco.rest.framework.WebApiParam;
@@ -130,14 +130,14 @@ public class NodesEntityResource implements
nodes.deleteNode(nodeId);
}
@Action("copy")
@Operation("copy")
@WebApiDescription(title = "Copy Node", description="Copy one or more nodes (files or folders) to a new target folder, with option to rename.")
public Node copyById(String nodeId, NodeTarget target, Parameters parameters)
{
return nodes.copyNode(nodeId, target.getTargetParentId(), target.getName(), parameters);
}
@Action("move")
@Operation("move")
@WebApiDescription(title = "Move Node", description="Moves one or more nodes (files or folders) to a new target folder, with option to rename.")
public Node moveById(String nodeId, NodeTarget target, Parameters parameters)
{