From 984c17f7cddd6c8f18c68f20d7e3b1f2b1050d14 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Wed, 11 Aug 2010 14:26:01 +0000 Subject: [PATCH] ALF-4296 - different replication definition delete webscript http response code git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/action/RunningActionDelete.java | 4 ++-- .../web/scripts/action/RunningActionRestApiTest.java | 12 ++++++------ .../replication/ReplicationDefinitionDelete.java | 4 ++-- .../scripts/replication/ReplicationRestApiTest.java | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java b/source/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java index 39e911529d..9f22b88ded 100644 --- a/source/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java +++ b/source/java/org/alfresco/repo/web/scripts/action/RunningActionDelete.java @@ -63,8 +63,8 @@ public class RunningActionDelete extends AbstractActionWebscript // Request the cancel actionTrackingService.requestActionCancellation(action); - // Report it cancelled - status.setCode(Status.STATUS_GONE); + // Report it as having been cancelled + status.setCode(Status.STATUS_NO_CONTENT); status.setMessage("Action cancellation requested"); status.setRedirect(true); return null; diff --git a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java index 6e1d27617d..0d22007b43 100644 --- a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java @@ -746,8 +746,8 @@ public class RunningActionRestApiTest extends BaseWebScriptTest // Request it to cancel - response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); // Check it was cancelled @@ -755,8 +755,8 @@ public class RunningActionRestApiTest extends BaseWebScriptTest // Request again - no change - response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); assertEquals(true, actionTrackingService.isCancellationRequested(rd)); @@ -780,8 +780,8 @@ public class RunningActionRestApiTest extends BaseWebScriptTest // Ask for it to be cancelled via the webscript - response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key2), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_RUNNING_ACTION + key2), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); // Should still be in the cache, not running but cancelled diff --git a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java index 01719d6e4a..f2d17f4750 100644 --- a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java +++ b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationDefinitionDelete.java @@ -54,8 +54,8 @@ public class ReplicationDefinitionDelete extends AbstractReplicationWebscript // Delete it replicationService.deleteReplicationDefinition(replicationDefinition); - // Report it as gone - status.setCode(Status.STATUS_GONE); + // Report that we have deleted it + status.setCode(Status.STATUS_NO_CONTENT); status.setMessage("Replication Definition deleted"); status.setRedirect(true); return null; diff --git a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java index d7988bdfea..fe5fdd2f32 100644 --- a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java @@ -1197,8 +1197,8 @@ public class ReplicationRestApiTest extends BaseWebScriptTest txn.begin(); // Call the delete webscript - response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); // Let the node service do its work txn.commit(); @@ -1229,8 +1229,8 @@ public class ReplicationRestApiTest extends BaseWebScriptTest txn = transactionService.getUserTransaction(); txn.begin(); - response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test"), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); txn.commit(); Thread.sleep(50); @@ -1244,8 +1244,8 @@ public class ReplicationRestApiTest extends BaseWebScriptTest txn = transactionService.getUserTransaction(); txn.begin(); - response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test 3"), Status.STATUS_GONE); - assertEquals(Status.STATUS_GONE, response.getStatus()); + response = sendRequest(new DeleteRequest(URL_DEFINITION + "Test 3"), Status.STATUS_NO_CONTENT); + assertEquals(Status.STATUS_NO_CONTENT, response.getStatus()); txn.commit(); Thread.sleep(50);