From ee3feed2adbaf61fd040967fbf39b2730531dbec Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 12:32:51 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126619 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 125356 gjames: RA-917 Success code for restore operation should be 200 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/trashcan/TrashcanEntityResource.java | 3 ++- source/test-java/org/alfresco/rest/DeletedNodesTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java b/source/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java index 90ca09f858..b22f433487 100644 --- a/source/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java +++ b/source/java/org/alfresco/rest/api/trashcan/TrashcanEntityResource.java @@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -72,7 +73,7 @@ public class TrashcanEntityResource implements } @Operation("restore") - @WebApiDescription(title = "Restore deleted Node", description="Restores an archived node") + @WebApiDescription(title = "Restore deleted Node", description="Restores an archived node",successStatus = HttpServletResponse.SC_OK) public Node restoreDeletedNode(String nodeId, Void ignored, Parameters parameters, WithResponse withResponse) { return deletedNodes.restoreArchivedNode(nodeId); diff --git a/source/test-java/org/alfresco/rest/DeletedNodesTest.java b/source/test-java/org/alfresco/rest/DeletedNodesTest.java index 9048d8875c..1fe50f61d0 100644 --- a/source/test-java/org/alfresco/rest/DeletedNodesTest.java +++ b/source/test-java/org/alfresco/rest/DeletedNodesTest.java @@ -174,7 +174,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest delete(URL_NODES, u1.getId(), documentSameName.getId(), 204); //Now we can restore it. - post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, 201); + post(URL_DELETED_NODES+"/"+document.getId()+"/restore", u1.getId(), null, null, 200); delete(URL_NODES, u1.getId(), createdFolder.getId(), 204); @@ -186,7 +186,7 @@ public class DeletedNodesTest extends AbstractSingleNetworkSiteTest //User 2 can't restore it but user 1 can. post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u2.getId(), null, null, Status.STATUS_FORBIDDEN); - post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 201); + post(URL_DELETED_NODES+"/"+createdFolder.getId()+"/restore", u1.getId(), null, null, 200); } /**