From: Teryk Bellahsene Date: Fri, 29 May 2015 13:27:15 +0000 (+0200) Subject: SONAR-6528 WS api/projects/delete use ids instead of uuids as a parameter X-Git-Tag: 5.2-RC1~1769 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c029d84f8bb4f1c52d3c2b519f06938912a0337d;p=sonarqube.git 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 6b6b08add26..87670ef6f68 100644 --- 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 7f85f27ec4a..89f655fc10a 100644 --- 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(); }