SONAR-6528 WS api/projects/delete use ids instead of uuids as a parameter

diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java
index 6b6b08add26d4df227c808ff3a9a9af924b2e56e..87670ef6f68223c15e76af0506e6aec7308a0a3a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java
@@ -37,7 +37,8 @@ import java.util.List;
 
 public class DeleteAction implements ProjectsWsAction {
   private static final String ACTION = "delete";
-  private static final String PARAM_UUIDS = "uuids";
+
+  private static final String PARAM_UUIDS = "ids";
   private static final String PARAM_KEYS = "keys";
 
   private final ComponentCleanerService componentCleanerService;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
index 7f85f27ec4ab9838eac4e3ca0b0eb95bb923de7b..89f655fc10aae2f4dbfcb54c0e729048b6411f4d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
@@ -124,7 +124,7 @@ public class DeleteActionTest {
     long snapshotId4 = insertNewProjectInDbAndReturnSnapshotId(4);
 
     ws.newPostRequest("api/projects", "delete")
-      .setParam("uuids", "project-uuid-1, project-uuid-3, project-uuid-4").execute();
+      .setParam("ids", "project-uuid-1, project-uuid-3, project-uuid-4").execute();
     dbSession.commit();
 
     assertThat(dbClient.componentDao().selectByUuids(dbSession, Arrays.asList("project-uuid-1", "project-uuid-3", "project-uuid-4"))).isEmpty();
@@ -180,7 +180,7 @@ public class DeleteActionTest {
     userSessionRule.setGlobalPermissions(UserRole.ADMIN);
     insertNewProjectInDbAndReturnSnapshotId(1);
 
-    WsTester.Result result = ws.newPostRequest("api/projects", "delete").setParam("uuids", "project-uuid-1").execute();
+    WsTester.Result result = ws.newPostRequest("api/projects", "delete").setParam("ids", "project-uuid-1").execute();
 
     result.assertNoContent();
   }