From d686c696d9cebbb533e609551c959d6f4eb8cba9 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Fri, 29 May 2015 16:56:42 +0200 Subject: [PATCH] SONAR-6529 WS api/projects/bulk_delete change action from delete to bulk_delete --- .../platformlevel/PlatformLevel4.java | 3 ++- ...eleteAction.java => BulkDeleteAction.java} | 6 ++--- ...ionTest.java => BulkDeleteActionTest.java} | 22 +++++++++---------- .../server/project/ws/ProjectsWsTest.java | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/project/ws/{DeleteAction.java => BulkDeleteAction.java} (93%) rename server/sonar-server/src/test/java/org/sonar/server/project/ws/{DeleteActionTest.java => BulkDeleteActionTest.java} (93%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 74bb372ca4a..ab1d0513ecc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -207,6 +207,7 @@ import org.sonar.server.plugins.ws.PluginWSCommons; import org.sonar.server.plugins.ws.PluginsWs; import org.sonar.server.plugins.ws.UninstallAction; import org.sonar.server.plugins.ws.UpdatesAction; +import org.sonar.server.project.ws.BulkDeleteAction; import org.sonar.server.project.ws.GhostsAction; import org.sonar.server.project.ws.ProjectsWs; import org.sonar.server.project.ws.ProvisionedAction; @@ -578,7 +579,7 @@ public class PlatformLevel4 extends PlatformLevel { ResourcesWs.class, ComponentsWs.class, ProjectsWs.class, - org.sonar.server.project.ws.DeleteAction.class, + BulkDeleteAction.class, org.sonar.server.component.ws.AppAction.class, org.sonar.server.component.ws.SearchAction.class, EventsWs.class, 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/BulkDeleteAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/BulkDeleteAction.java index 87670ef6f68..6ebf54a3574 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/BulkDeleteAction.java @@ -35,8 +35,8 @@ import javax.annotation.Nullable; import java.util.List; -public class DeleteAction implements ProjectsWsAction { - private static final String ACTION = "delete"; +public class BulkDeleteAction implements ProjectsWsAction { + private static final String ACTION = "bulk_delete"; private static final String PARAM_UUIDS = "ids"; private static final String PARAM_KEYS = "keys"; @@ -45,7 +45,7 @@ public class DeleteAction implements ProjectsWsAction { private final DbClient dbClient; private final UserSession userSession; - public DeleteAction(ComponentCleanerService componentCleanerService, DbClient dbClient, UserSession userSession) { + public BulkDeleteAction(ComponentCleanerService componentCleanerService, DbClient dbClient, UserSession userSession) { this.componentCleanerService = componentCleanerService; this.dbClient = dbClient; this.userSession = userSession; 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/BulkDeleteActionTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java index 89f655fc10a..f73b4baa96a 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/BulkDeleteActionTest.java @@ -21,6 +21,7 @@ package org.sonar.server.project.ws; import com.google.common.collect.ImmutableMap; +import java.util.Arrays; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -69,16 +70,15 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; -import java.util.Arrays; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @Category(DbTests.class) -public class DeleteActionTest { +public class BulkDeleteActionTest { + private static final String ACTION = "bulk_delete"; @ClassRule public static DbTester db = new DbTester(); @ClassRule @@ -104,7 +104,7 @@ public class DeleteActionTest { when(resourceType.getBooleanProperty(anyString())).thenReturn(true); ResourceTypes mockResourceTypes = mock(ResourceTypes.class); when(mockResourceTypes.get(anyString())).thenReturn(resourceType); - ws = new WsTester(new ProjectsWs(new DeleteAction(new ComponentCleanerService(dbClient, new IssueAuthorizationIndexer(dbClient, es.client()), new IssueIndexer( + ws = new WsTester(new ProjectsWs(new BulkDeleteAction(new ComponentCleanerService(dbClient, new IssueAuthorizationIndexer(dbClient, es.client()), new IssueIndexer( dbClient, es.client()), new SourceLineIndexer(dbClient, es.client()), new TestIndexer(dbClient, es.client()), mockResourceTypes), dbClient, userSessionRule))); db.truncateTables(); es.truncateIndices(); @@ -123,7 +123,7 @@ public class DeleteActionTest { long snapshotId3 = insertNewProjectInDbAndReturnSnapshotId(3); long snapshotId4 = insertNewProjectInDbAndReturnSnapshotId(4); - ws.newPostRequest("api/projects", "delete") + ws.newPostRequest("api/projects", ACTION) .setParam("ids", "project-uuid-1, project-uuid-3, project-uuid-4").execute(); dbSession.commit(); @@ -145,7 +145,7 @@ public class DeleteActionTest { insertNewProjectInDbAndReturnSnapshotId(3); insertNewProjectInDbAndReturnSnapshotId(4); - ws.newPostRequest("api/projects", "delete") + ws.newPostRequest("api/projects", ACTION) .setParam("keys", "project-key-1, project-key-3, project-key-4").execute(); dbSession.commit(); @@ -161,7 +161,7 @@ public class DeleteActionTest { insertNewProjectInIndexes(3); insertNewProjectInIndexes(4); - ws.newPostRequest("api/projects", "delete") + ws.newPostRequest("api/projects", ACTION) .setParam("keys", "project-key-1, project-key-3, project-key-4").execute(); String remainingProjectUuid = "project-uuid-2"; @@ -180,7 +180,7 @@ public class DeleteActionTest { userSessionRule.setGlobalPermissions(UserRole.ADMIN); insertNewProjectInDbAndReturnSnapshotId(1); - WsTester.Result result = ws.newPostRequest("api/projects", "delete").setParam("ids", "project-uuid-1").execute(); + WsTester.Result result = ws.newPostRequest("api/projects", ACTION).setParam("ids", "project-uuid-1").execute(); result.assertNoContent(); } @@ -190,7 +190,7 @@ public class DeleteActionTest { userSessionRule.setGlobalPermissions(UserRole.CODEVIEWER, UserRole.ISSUE_ADMIN, UserRole.USER); expectedException.expect(ForbiddenException.class); - ws.newPostRequest("api/projects", "delete").setParam("uuids", "whatever-the-uuid").execute(); + ws.newPostRequest("api/projects", ACTION).setParam("uuids", "whatever-the-uuid").execute(); } @Test @@ -200,7 +200,7 @@ public class DeleteActionTest { dbClient.componentDao().insert(dbSession, ComponentTesting.newFileDto(ComponentTesting.newProjectDto(), "file-uuid")); dbSession.commit(); - ws.newPostRequest("api/projects", "delete").setParam("uuids", "file-uuid").execute(); + ws.newPostRequest("api/projects", ACTION).setParam("uuids", "file-uuid").execute(); } @Test @@ -211,7 +211,7 @@ public class DeleteActionTest { dbSession.commit(); when(resourceType.getBooleanProperty(anyString())).thenReturn(false); - ws.newPostRequest("api/projects", "delete").setParam("uuids", "project-uuid").execute(); + ws.newPostRequest("api/projects", ACTION).setParam("uuids", "project-uuid").execute(); } private long insertNewProjectInDbAndReturnSnapshotId(int id) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java index 3dbe27a988d..34d94846bd1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java @@ -40,7 +40,7 @@ public class ProjectsWsTest { @Before public void setUp() { ws = new WsTester(new ProjectsWs( - new DeleteAction(mock(ComponentCleanerService.class), mock(DbClient.class), mock(UserSession.class)), + new BulkDeleteAction(mock(ComponentCleanerService.class), mock(DbClient.class), mock(UserSession.class)), new GhostsAction(mock(DbClient.class), mock(UserSession.class)), new ProvisionedAction(mock(DbClient.class), mock(UserSession.class)) )); -- 2.39.5