Rename class with the good name

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 b382b8cf02e4674792f1abe2d50d005c1cff604a..2fb00f2a0bc9e1eb812e85f634bc6a9ac7553b92 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/MyBatis.java
@@ -155,7 +155,7 @@ public class MyBatis implements BatchComponent, ServerComponent {
       SchemaMigrationMapper.class, SemaphoreMapper.class, UserMapper.class, WidgetMapper.class, WidgetPropertyMapper.class,
       MeasureMapper.class, SnapshotDataMapper.class, SnapshotSourceMapper.class, ActionPlanMapper.class, ActionPlanStatsMapper.class,
       NotificationQueueMapper.class, CharacteristicMapper.class,
-      GroupMembershipMapper.class, QualityProfileMapper.class, ActiveRuleMapper2.class
+      GroupMembershipMapper.class, QualityProfileMapper.class, ActiveRuleMapper.class
     };
     loadMappers(conf, mappers);
     configureLogback(mappers);

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
index d3d0318cf3548e35408835173ac880cecc2cd891..2346103e655d1abc876471571dc1db194c8ff873 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleDao.java
@@ -33,7 +33,7 @@ public class ActiveRuleDao implements ServerComponent {
   }
 
   public void insert(ActiveRuleDto dto, SqlSession session) {
-    session.getMapper(ActiveRuleMapper2.class).insert(dto);
+    session.getMapper(ActiveRuleMapper.class).insert(dto);
   }
 
   public void insert(ActiveRuleDto dto) {
@@ -47,7 +47,7 @@ public class ActiveRuleDao implements ServerComponent {
   }
 
   public void insert(ActiveRuleParamDto dto, SqlSession session) {
-    session.getMapper(ActiveRuleMapper2.class).insertParameter(dto);
+    session.getMapper(ActiveRuleMapper.class).insertParameter(dto);
   }
 
   public void insert(ActiveRuleParamDto dto) {

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java
new file mode 100644 (file)
index 0000000..e406857
--- /dev/null
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper.java
@@ -0,0 +1,29 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2013 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.
+ */
+
+package org.sonar.core.qualityprofile.db;
+
+public interface ActiveRuleMapper {
+
+  void insert(ActiveRuleDto dto);
+
+  void insertParameter(ActiveRuleParamDto dto);
+
+}

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper2.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper2.java
deleted file mode 100644 (file)
index 025043d..0000000
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/ActiveRuleMapper2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 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.
- */
-
-package org.sonar.core.qualityprofile.db;
-
-public interface ActiveRuleMapper2 {
-
-  void insert(ActiveRuleDto dto);
-
-  void insertParameter(ActiveRuleParamDto dto);
-
-}

diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
index bf8f1b86cb040388dcb720ac75e877f944a746e4..f7178820d9d084754abb7de3d91ff2fdaeb4e5d3 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/ActiveRuleMapper.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.qualityprofile.db.ActiveRuleMapper2">
+<mapper namespace="org.sonar.core.qualityprofile.db.ActiveRuleMapper">
 
   <sql id="activeRuleColumns">
     p.id,