move metric related classes in a specific package - SONAR-6570

8 files changed, 33 insertions, 8 deletions

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
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
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
index 94d22922788..94d22922788 100644
--- 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
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
index 1100b166b82..1100b166b82 100644
--- 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
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
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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="org.sonar.core.measure.db.MetricMapper">
+<mapper namespace="org.sonar.core.metric.db.MetricMapper">
 
   <sql id="metricColumns">
     m.id,
@@ -22,7 +22,7 @@
     m.delete_historical_data as deleteHistoricalData
   </sql>
 
-  <select id="selectByKey" parameterType="map" resultType="org.sonar.core.measure.db.MetricDto">
+  <select id="selectByKey" parameterType="map" resultType="org.sonar.core.metric.db.MetricDto">
     SELECT
     <include refid="metricColumns"/>
     FROM metrics m
@@ -31,7 +31,7 @@
     </where>
   </select>
 
-  <select id="selectAllEnabled" parameterType="map" resultType="org.sonar.core.measure.db.MetricDto">
+  <select id="selectAllEnabled" parameterType="map" resultType="org.sonar.core.metric.db.MetricDto">
     SELECT
     <include refid="metricColumns"/>
     FROM metrics m
@@ -49,7 +49,7 @@
     ORDER BY UPPER(m.short_name)
   </select>
 
-  <insert id="insert" parameterType="org.sonar.core.measure.db.MetricDto" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+  <insert id="insert" parameterType="org.sonar.core.metric.db.MetricDto" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
     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
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;