From f44b951918f62358c74665308911b484fecfe10f Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Wed, 11 Aug 2010 18:11:16 +0000 Subject: [PATCH] Changed status response code of DELETE workflow-instance REST API to 200 to be consistent with all other DELETE APIs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/workflow/WorkflowInstanceDelete.java | 3 --- .../repo/web/scripts/workflow/WorkflowRestApiTest.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java index 8c41c84d02..e699304b00 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowInstanceDelete.java @@ -20,8 +20,6 @@ package org.alfresco.repo.web.scripts.workflow; import java.util.Map; -import javax.servlet.http.HttpServletResponse; - import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptRequest; @@ -55,7 +53,6 @@ public class WorkflowInstanceDelete extends AbstractWorkflowWebscript workflowService.cancelWorkflow(workflowInstanceId); } - status.setCode(HttpServletResponse.SC_NO_CONTENT); return null; } diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java index ada0de7a6a..13f7a414f6 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java @@ -560,8 +560,8 @@ public class WorkflowRestApiTest extends BaseWebScriptTest WorkflowInstance adhocInstance = startTask.getPath().getInstance(); - Response response = sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + adhocInstance.getId()), 204); - assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); + Response response = sendRequest(new DeleteRequest(URL_WORKFLOW_INSTANCES + "/" + adhocInstance.getId()), 200); + assertEquals(Status.STATUS_OK, response.getStatus()); assertNull(workflowService.getWorkflowById(adhocInstance.getId())); }