From 22a324f1513e5a6c476da42f980c0beef247324e Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Fri, 22 May 2015 17:54:41 +0200 Subject: [PATCH] move metric related classes in a specific package - SONAR-6570 --- .../org/sonar/server/batch/GlobalAction.java | 2 +- .../computation/measure/MetricCache.java | 2 +- .../step/PersistDuplicationsStep.java | 2 +- .../java/org/sonar/server/db/DbClient.java | 2 +- .../persistence/MetricDao.java | 6 ++--- .../metric/persistence/package-info.java | 24 ++++++++++++++++++ .../{measure => metric}/ws/ListAction.java | 4 +-- .../{measure => metric}/ws/MetricsWs.java | 2 +- .../ws/MetricsWsAction.java | 2 +- .../platformlevel/PlatformLevel1.java | 2 +- .../platformlevel/PlatformLevel4.java | 4 +-- .../{measure => metric}/ws/example-list.json | 0 .../sonar/server/batch/GlobalActionTest.java | 4 +-- .../computation/measure/MetricCacheTest.java | 2 +- .../step/PersistDuplicationsStepTest.java | 4 +-- .../step/PersistMeasuresStepTest.java | 15 +++++------ ...stNumberOfDaysSinceLastCommitStepTest.java | 2 +- .../persistence/MetricDaoTest.java | 4 +-- .../ws/ListActionTest.java | 8 +++--- .../{measure => metric}/ws/MetricTesting.java | 4 +-- .../{measure => metric}/ws/MetricsWsTest.java | 2 +- .../MetricDaoTest/manual_metric.xml | 0 .../persistence/MetricDaoTest/shared.xml | 0 .../ws/ListActionTest/list_metrics.json | 0 .../{measure => metric}/db/MetricDto.java | 2 +- .../{measure => metric}/db/MetricMapper.java | 2 +- .../sonar/core/metric/db/package-info.java | 25 +++++++++++++++++++ .../org/sonar/core/persistence/MyBatis.java | 2 +- .../db/MeasureFilterDaoTest/shared.xml | 0 .../shouldInsert-result.xml | 0 .../{measure => metric}/db/MetricMapper.xml | 8 +++--- .../{measure => metric}/db/MetricDtoTest.java | 2 +- 32 files changed, 94 insertions(+), 44 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/{measure => metric}/persistence/MetricDao.java (94%) create mode 100644 server/sonar-server/src/main/java/org/sonar/server/metric/persistence/package-info.java rename server/sonar-server/src/main/java/org/sonar/server/{measure => metric}/ws/ListAction.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{measure => metric}/ws/MetricsWs.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{measure => metric}/ws/MetricsWsAction.java (96%) rename server/sonar-server/src/main/resources/org/sonar/server/{measure => metric}/ws/example-list.json (100%) rename server/sonar-server/src/test/java/org/sonar/server/{measure => metric}/persistence/MetricDaoTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{measure => metric}/ws/ListActionTest.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/{measure => metric}/ws/MetricTesting.java (96%) rename server/sonar-server/src/test/java/org/sonar/server/{measure => metric}/ws/MetricsWsTest.java (97%) rename server/sonar-server/src/test/resources/org/sonar/server/{measure => metric}/persistence/MetricDaoTest/manual_metric.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/{measure => metric}/persistence/MetricDaoTest/shared.xml (100%) rename server/sonar-server/src/test/resources/org/sonar/server/{measure => metric}/ws/ListActionTest/list_metrics.json (100%) rename sonar-core/src/main/java/org/sonar/core/{measure => metric}/db/MetricDto.java (99%) rename sonar-core/src/main/java/org/sonar/core/{measure => metric}/db/MetricMapper.java (97%) create mode 100644 sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java rename sonar-core/src/{test => main}/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml (100%) rename sonar-core/src/{test => main}/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml (100%) rename sonar-core/src/main/resources/org/sonar/core/{measure => metric}/db/MetricMapper.xml (88%) rename sonar-core/src/test/java/org/sonar/core/{measure => metric}/db/MetricDtoTest.java (98%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java index 84529cae0b7..23956d9bbba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.batch.protocol.input.GlobalRepositories; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MetricCache.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MetricCache.java index febaaf9e6a3..ac130fda554 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MetricCache.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/MetricCache.java @@ -22,7 +22,7 @@ package org.sonar.server.computation.measure; import com.google.common.base.Function; import com.google.common.collect.Maps; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java index fd678891c96..e6cb38a50fa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java @@ -26,7 +26,7 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Range; import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.computation.ComputationContext; 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 56334b663af..6e6df811f34 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 @@ -48,7 +48,7 @@ import org.sonar.server.dashboard.db.WidgetPropertyDao; import org.sonar.server.event.db.EventDao; import org.sonar.server.issue.db.IssueDao; import org.sonar.server.measure.persistence.MeasureDao; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.qualityprofile.db.ActiveRuleDao; import org.sonar.server.rule.db.RuleDao; import org.sonar.server.source.db.FileSourceDao; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MetricDao.java b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MetricDao.java rename to server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java index 32bf681229d..ae463280213 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/persistence/MetricDao.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/MetricDao.java @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.persistence; +package org.sonar.server.metric.persistence; import com.google.common.collect.Maps; import org.apache.ibatis.session.RowBounds; import org.sonar.api.server.ServerSide; -import org.sonar.core.measure.db.MetricDto; -import org.sonar.core.measure.db.MetricMapper; +import org.sonar.core.metric.db.MetricDto; +import org.sonar.core.metric.db.MetricMapper; import org.sonar.core.persistence.DaoComponent; import org.sonar.core.persistence.DbSession; import org.sonar.server.es.SearchOptions; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/package-info.java new file mode 100644 index 00000000000..2b47d5bda85 --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/persistence/package-info.java @@ -0,0 +1,24 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.server.metric.persistence; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ListAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/ListAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/measure/ws/ListAction.java rename to server/sonar-server/src/main/java/org/sonar/server/metric/ws/ListAction.java index 9ba67c1f013..d77523a52be 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/ListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/ListAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.sonar.api.measures.Metric; import org.sonar.api.server.ws.Request; @@ -26,7 +26,7 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.server.ws.WebService.Param; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.db.DbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java index 2f352ef3bc6..0d6f060fafc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWs.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.sonar.api.server.ws.RailsHandler; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java index 61b28ba802b..e9a6f0ea048 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/ws/MetricsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.sonar.server.ws.WsAction; 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 0be187f699d..4fa1e41d2aa 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 @@ -49,7 +49,7 @@ import org.sonar.server.event.db.EventDao; import org.sonar.server.issue.db.IssueDao; import org.sonar.server.issue.index.IssueIndex; import org.sonar.server.measure.persistence.MeasureDao; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.platform.DatabaseServerCompatibility; import org.sonar.server.platform.DefaultServerFileSystem; import org.sonar.server.platform.Platform; 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 a7af1692d96..192c9fecd65 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 @@ -133,8 +133,8 @@ import org.sonar.server.measure.MeasureFilterEngine; import org.sonar.server.measure.MeasureFilterExecutor; import org.sonar.server.measure.MeasureFilterFactory; import org.sonar.server.measure.ws.ManualMeasuresWs; -import org.sonar.server.measure.ws.MetricsWs; import org.sonar.server.measure.ws.TimeMachineWs; +import org.sonar.server.metric.ws.MetricsWs; import org.sonar.server.notifications.NotificationCenter; import org.sonar.server.notifications.NotificationService; import org.sonar.server.permission.InternalPermissionService; @@ -432,7 +432,7 @@ public class PlatformLevel4 extends PlatformLevel { TimeMachineWs.class, ManualMeasuresWs.class, MetricsWs.class, - org.sonar.server.measure.ws.ListAction.class, + org.sonar.server.metric.ws.ListAction.class, // quality gates QualityGateDao.class, diff --git a/server/sonar-server/src/main/resources/org/sonar/server/measure/ws/example-list.json b/server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-list.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/measure/ws/example-list.json rename to server/sonar-server/src/main/resources/org/sonar/server/metric/ws/example-list.json diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java index b9ffed89f19..3f26d051c4f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java @@ -27,14 +27,14 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; import org.sonar.core.properties.PropertiesDao; import org.sonar.core.properties.PropertyDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MetricCacheTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MetricCacheTest.java index ef27d3ba663..8670bb1821e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MetricCacheTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/measure/MetricCacheTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.sonar.core.persistence.DbTester; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index 2b96c2b4b6a..67c9dfc2781 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -34,7 +34,7 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Range; import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.batch.protocol.output.BatchReportWriter; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.server.computation.ComputationContext; @@ -45,7 +45,7 @@ import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; import org.sonar.server.db.DbClient; import org.sonar.server.measure.persistence.MeasureDao; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.test.DbTests; import java.io.File; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 4a75cd23e32..cc0acaff668 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -20,11 +20,6 @@ package org.sonar.server.computation.step; -import java.io.File; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -44,7 +39,7 @@ import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.batch.protocol.output.BatchReportWriter; import org.sonar.core.component.ComponentDto; import org.sonar.core.measure.db.MeasureDto; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.core.rule.RuleDto; @@ -59,11 +54,17 @@ import org.sonar.server.computation.language.LanguageRepository; import org.sonar.server.computation.measure.MetricCache; import org.sonar.server.db.DbClient; import org.sonar.server.measure.persistence.MeasureDao; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.rule.RuleTesting; import org.sonar.server.rule.db.RuleDao; import org.sonar.test.DbTests; +import java.io.File; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index 884c854b79a..b764fed9939 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -34,7 +34,7 @@ import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReportReader; import org.sonar.batch.protocol.output.BatchReportWriter; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbTester; import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.component.DbComponentsRefCache; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MetricDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MetricDaoTest.java rename to server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java index 06039d91cdb..ee5913e8ff1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/persistence/MetricDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.persistence; +package org.sonar.server.metric.persistence; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/measure/ws/ListActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java index 4bbcb9b1406..66ad2d8bd8e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.apache.commons.lang.StringUtils; import org.junit.After; @@ -26,15 +26,15 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.sonar.api.server.ws.WebService.Param; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.server.db.DbClient; -import org.sonar.server.measure.persistence.MetricDao; +import org.sonar.server.metric.persistence.MetricDao; import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; -import static org.sonar.server.measure.ws.ListAction.PARAM_IS_CUSTOM; +import static org.sonar.server.metric.ws.ListAction.PARAM_IS_CUSTOM; public class ListActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricTesting.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricTesting.java rename to server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java index 753faf4689c..c991e27318e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.math.RandomUtils; import org.sonar.api.measures.Metric; -import org.sonar.core.measure.db.MetricDto; +import org.sonar.core.metric.db.MetricDto; public class MetricTesting { private MetricTesting() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java index 030a28e021a..3dc57d56e3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/MetricsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.measure.ws; +package org.sonar.server.metric.ws; import org.junit.Test; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MetricDaoTest/manual_metric.xml b/server/sonar-server/src/test/resources/org/sonar/server/metric/persistence/MetricDaoTest/manual_metric.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MetricDaoTest/manual_metric.xml rename to server/sonar-server/src/test/resources/org/sonar/server/metric/persistence/MetricDaoTest/manual_metric.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MetricDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/metric/persistence/MetricDaoTest/shared.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/measure/persistence/MetricDaoTest/shared.xml rename to server/sonar-server/src/test/resources/org/sonar/server/metric/persistence/MetricDaoTest/shared.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/ws/ListActionTest/list_metrics.json b/server/sonar-server/src/test/resources/org/sonar/server/metric/ws/ListActionTest/list_metrics.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/measure/ws/ListActionTest/list_metrics.json rename to server/sonar-server/src/test/resources/org/sonar/server/metric/ws/ListActionTest/list_metrics.json diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MetricDto.java b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java similarity index 99% rename from sonar-core/src/main/java/org/sonar/core/measure/db/MetricDto.java rename to sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java index e23be8104a5..d2131c9008b 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MetricDto.java +++ b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.core.metric.db; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-core/src/main/java/org/sonar/core/measure/db/MetricMapper.java b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricMapper.java similarity index 97% rename from sonar-core/src/main/java/org/sonar/core/measure/db/MetricMapper.java rename to sonar-core/src/main/java/org/sonar/core/metric/db/MetricMapper.java index 16b737866fc..e7b4d2cde68 100644 --- a/sonar-core/src/main/java/org/sonar/core/measure/db/MetricMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricMapper.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.core.metric.db; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.session.RowBounds; diff --git a/sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java b/sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java new file mode 100644 index 00000000000..77b704b45d7 --- /dev/null +++ b/sonar-core/src/main/java/org/sonar/core/metric/db/package-info.java @@ -0,0 +1,25 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +@ParametersAreNonnullByDefault +package org.sonar.core.metric.db; + +import javax.annotation.ParametersAreNonnullByDefault; + diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java index c933f606dcb..abf18b7ef4c 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java @@ -82,7 +82,7 @@ import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.measure.db.MeasureFilterDto; import org.sonar.core.measure.db.MeasureFilterMapper; import org.sonar.core.measure.db.MeasureMapper; -import org.sonar.core.measure.db.MetricMapper; +import org.sonar.core.metric.db.MetricMapper; import org.sonar.core.notification.db.NotificationQueueDto; import org.sonar.core.notification.db.NotificationQueueMapper; import org.sonar.core.permission.GroupWithPermissionDto; diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml rename to sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shared.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml b/sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml similarity index 100% rename from sonar-core/src/test/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml rename to sonar-core/src/main/resources/org/sonar/core/measure/db/MeasureFilterDaoTest/shouldInsert-result.xml diff --git a/sonar-core/src/main/resources/org/sonar/core/measure/db/MetricMapper.xml b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml similarity index 88% rename from sonar-core/src/main/resources/org/sonar/core/measure/db/MetricMapper.xml rename to sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml index 77757491d88..0f07acb06d0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/measure/db/MetricMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml @@ -1,7 +1,7 @@ - + m.id, @@ -22,7 +22,7 @@ m.delete_historical_data as deleteHistoricalData - SELECT FROM metrics m @@ -31,7 +31,7 @@ - SELECT FROM metrics m @@ -49,7 +49,7 @@ ORDER BY UPPER(m.short_name) - + INSERT INTO metrics ( name, description, direction, domain, short_name, qualitative, val_type, user_managed, enabled, origin, worst_value, best_value, optimized_best_value, hidden, delete_historical_data) VALUES ( diff --git a/sonar-core/src/test/java/org/sonar/core/measure/db/MetricDtoTest.java b/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java similarity index 98% rename from sonar-core/src/test/java/org/sonar/core/measure/db/MetricDtoTest.java rename to sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java index 93ce3e37163..5c7b9ebfd40 100644 --- a/sonar-core/src/test/java/org/sonar/core/measure/db/MetricDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.core.measure.db; +package org.sonar.core.metric.db; import org.junit.Test; -- 2.39.5