From 4a2247c24efee48de53ca07302b6810ab7205621 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Mon, 8 Jun 2015 16:08:18 +0200 Subject: [PATCH] refactoring - move custom measures related classes in the measure.custom package --- .../src/main/java/org/sonar/server/db/DbClient.java | 2 +- .../custom}/persistence/CustomMeasureDao.java | 2 +- .../custom}/persistence/package-info.java | 2 +- .../custom}/ws/CustomMeasuresWs.java | 2 +- .../custom}/ws/CustomMeasuresWsAction.java | 2 +- .../custom}/ws/CustomMeasuresWsModule.java | 2 +- .../custom}/ws/DeleteAction.java | 2 +- .../custom}/ws/package-info.java | 2 +- .../server/platform/platformlevel/PlatformLevel1.java | 2 +- .../server/platform/platformlevel/PlatformLevel4.java | 2 +- .../custom}/persistence/CustomMeasureDaoTest.java | 4 ++-- .../custom}/persistence/CustomMeasureTesting.java | 2 +- .../custom}/ws/CustomMeasuresWsModuleTest.java | 2 +- .../custom}/ws/CustomMeasuresWsTest.java | 2 +- .../custom}/ws/DeleteActionTest.java | 8 ++++---- .../java/org/sonar/server/metric/ws/CreateActionTest.java | 4 ++-- .../java/org/sonar/server/metric/ws/DeleteActionTest.java | 4 ++-- .../java/org/sonar/server/metric/ws/UpdateActionTest.java | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/persistence/CustomMeasureDao.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/persistence/package-info.java (94%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/ws/CustomMeasuresWs.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/ws/CustomMeasuresWsAction.java (95%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/ws/CustomMeasuresWsModule.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/ws/DeleteAction.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{custommeasure => measure/custom}/ws/package-info.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/{custommeasure => measure/custom}/persistence/CustomMeasureDaoTest.java (95%) rename server/sonar-server/src/test/java/org/sonar/server/{custommeasure => measure/custom}/persistence/CustomMeasureTesting.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/{custommeasure => measure/custom}/ws/CustomMeasuresWsModuleTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/{custommeasure => measure/custom}/ws/CustomMeasuresWsTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/{custommeasure => measure/custom}/ws/DeleteActionTest.java (94%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index 29a59dceec7..b4194d66178 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java @@ -50,7 +50,7 @@ import org.sonar.server.component.db.ComponentIndexDao; import org.sonar.server.component.db.ComponentLinkDao; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.db.AnalysisReportDao; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; import org.sonar.server.dashboard.db.DashboardDao; import org.sonar.server.dashboard.db.WidgetDao; import org.sonar.server.dashboard.db.WidgetPropertyDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/CustomMeasureDao.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/CustomMeasureDao.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java index ff92ecd4004..c18755b1fc0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/CustomMeasureDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/CustomMeasureDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.persistence; +package org.sonar.server.measure.custom.persistence; import com.google.common.base.Function; import java.util.List; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/package-info.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/package-info.java index c236052bdd4..08372c57a68 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/persistence/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.custommeasure.persistence; +package org.sonar.server.measure.custom.persistence; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWs.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWs.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java index f67a62ff1e4..765904017df 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWs.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java index 2fa1a82ddf2..d6d392c98a4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.sonar.server.ws.WsAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModule.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java index 108cc8c6e09..f0c981e7e46 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModule.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.sonar.core.component.Module; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/DeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java index 56349d0cef2..993db3c7f9e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/DeleteAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; diff --git a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java index 29a6629de4c..4fca405b58d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/custommeasure/ws/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/package-info.java @@ -19,6 +19,6 @@ */ @ParametersAreNonnullByDefault -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java index cb582d899aa..9a746002a27 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java @@ -39,7 +39,7 @@ import org.sonar.server.component.db.ComponentIndexDao; import org.sonar.server.component.db.ComponentLinkDao; import org.sonar.server.component.db.SnapshotDao; import org.sonar.server.computation.db.AnalysisReportDao; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; import org.sonar.server.dashboard.db.DashboardDao; import org.sonar.server.dashboard.db.WidgetDao; import org.sonar.server.dashboard.db.WidgetPropertyDao; 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 21f69f49d65..5d816942ad3 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 @@ -75,7 +75,7 @@ import org.sonar.server.computation.ws.HistoryAction; import org.sonar.server.computation.ws.IsQueueEmptyWs; import org.sonar.server.computation.ws.QueueAction; import org.sonar.server.config.ws.PropertiesWs; -import org.sonar.server.custommeasure.ws.CustomMeasuresWsModule; +import org.sonar.server.measure.custom.ws.CustomMeasuresWsModule; import org.sonar.server.dashboard.template.GlobalDefaultDashboard; import org.sonar.server.dashboard.template.ProjectDefaultDashboard; import org.sonar.server.dashboard.template.ProjectIssuesDashboard; diff --git a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java index 60c6a0232d5..2d8e7e30add 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.persistence; +package org.sonar.server.measure.custom.persistence; import java.util.Arrays; import java.util.List; @@ -35,7 +35,7 @@ import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.offset; -import static org.sonar.server.custommeasure.persistence.CustomMeasureTesting.newCustomMeasureDto; +import static org.sonar.server.measure.custom.persistence.CustomMeasureTesting.newCustomMeasureDto; @Category(DbTests.class) public class CustomMeasureDaoTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureTesting.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureTesting.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java index 23c94cbd67f..20868a91635 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/persistence/CustomMeasureTesting.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.persistence; +package org.sonar.server.measure.custom.persistence; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; diff --git a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java index caff479e7e6..c0ed75c4b9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsModuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsModuleTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.junit.Test; import org.sonar.core.platform.ComponentContainer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java index 085ef9b8e61..d0a50285eba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/CustomMeasuresWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CustomMeasuresWsTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/DeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java index b31a733124b..67c43d5bd84 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/custommeasure/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/DeleteActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.custommeasure.ws; +package org.sonar.server.measure.custom.ws; import org.junit.After; import org.junit.Before; @@ -34,7 +34,7 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; @@ -42,8 +42,8 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.custommeasure.persistence.CustomMeasureTesting.newCustomMeasureDto; -import static org.sonar.server.custommeasure.ws.DeleteAction.PARAM_ID; +import static org.sonar.server.measure.custom.persistence.CustomMeasureTesting.newCustomMeasureDto; +import static org.sonar.server.measure.custom.ws.DeleteAction.PARAM_ID; public class DeleteActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java index 7a2f8e59a1f..5b33efe6e9f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java @@ -32,8 +32,8 @@ import org.sonar.core.metric.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; -import org.sonar.server.custommeasure.persistence.CustomMeasureTesting; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureTesting; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java index 2f8a108b48c..2175ff6c594 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java @@ -34,8 +34,8 @@ import org.sonar.core.metric.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; -import org.sonar.server.custommeasure.persistence.CustomMeasureTesting; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureTesting; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.metric.persistence.MetricDao; diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java index 8a8a9d75bc8..92365534125 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java @@ -32,7 +32,7 @@ import org.sonar.core.metric.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; -import org.sonar.server.custommeasure.persistence.CustomMeasureDao; +import org.sonar.server.measure.custom.persistence.CustomMeasureDao; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; @@ -42,7 +42,7 @@ import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.custommeasure.persistence.CustomMeasureTesting.newCustomMeasureDto; +import static org.sonar.server.measure.custom.persistence.CustomMeasureTesting.newCustomMeasureDto; import static org.sonar.server.metric.ws.UpdateAction.PARAM_DESCRIPTION; import static org.sonar.server.metric.ws.UpdateAction.PARAM_DOMAIN; import static org.sonar.server.metric.ws.UpdateAction.PARAM_ID; -- 2.39.5