From f250df68da43e8d679595e378335f76534941762 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:52:33 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 125355 gjames: RA-901: Success code for move operation should be 200 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/nodes/NodesEntityResource.java | 5 ++++- .../test-java/org/alfresco/rest/api/tests/NodeApiTest.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java b/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java index e079c73a90..736c7054cd 100644 --- a/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java +++ b/source/java/org/alfresco/rest/api/nodes/NodesEntityResource.java @@ -37,6 +37,7 @@ import org.alfresco.util.ParameterCheck; import org.apache.lucene.store.Lock; import org.springframework.beans.factory.InitializingBean; +import javax.servlet.http.HttpServletResponse; import java.io.InputStream; /** @@ -133,7 +134,9 @@ public class NodesEntityResource implements } @Operation("move") - @WebApiDescription(title = "Move Node", description="Moves one or more nodes (files or folders) to a new target folder, with option to rename.") + @WebApiDescription(title = "Move Node", + description="Moves one or more nodes (files or folders) to a new target folder, with option to rename.", + successStatus = HttpServletResponse.SC_OK) public Node moveById(String nodeId, NodeTarget target, Parameters parameters, WithResponse withResponse) { return nodes.moveOrCopyNode(nodeId, target.getTargetParentId(), target.getName(), parameters, false); diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 0aedb15cd9..9e73a16aa7 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -1320,7 +1320,7 @@ public class NodeApiTest extends AbstractBaseApiTest NodeTarget tgt = new NodeTarget(); tgt.setTargetParentId(f2Id); - HttpResponse response = post("nodes/"+d1Id+"/move", user1, toJsonAsStringNonNull(tgt), null, 201); + HttpResponse response = post("nodes/"+d1Id+"/move", user1, toJsonAsStringNonNull(tgt), null, 200); Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); assertEquals(d1Name, documentResp.getName()); @@ -1334,7 +1334,7 @@ public class NodeApiTest extends AbstractBaseApiTest tgt.setName(d1NewName); tgt.setTargetParentId(f1Id); - response = post("nodes/"+d1Id+"/move", user1, toJsonAsStringNonNull(tgt), null, 201); + response = post("nodes/"+d1Id+"/move", user1, toJsonAsStringNonNull(tgt), null, 200); documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); assertEquals(d1NewName, documentResp.getName());