Copy RuleDao#selectEnabledAndNonManual() from sonar-server to sonar-db

The source method in org.sonar.server.rule.db can not be dropped as it's still
used through DAOv2

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java b/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
index 83db14f57f91c9039c0b690937ec17af29b2bc50..43ced3fc20038e71f72d815174e3958686684bd9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/db/RuleDao.java
@@ -92,10 +92,6 @@ public class RuleDao extends BaseDao<RuleMapper, RuleDto, RuleKey> {
     return mapper(session).selectAll();
   }
 
-  public List<RuleDto> selectByEnabledAndNotManual(DbSession session) {
-    return mapper(session).selectEnablesAndNonManual();
-  }
-
   /**
    * Nested DTO RuleParams
    */
@@ -139,6 +135,6 @@ public class RuleDao extends BaseDao<RuleMapper, RuleDto, RuleKey> {
   }
 
   public List<RuleDto> selectEnabledAndNonManual(DbSession session) {
-    return mapper(session).selectEnablesAndNonManual();
+    return mapper(session).selectEnabledAndNonManual();
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
index fbf5a7c9e8b8a84a1f6f34bd78821b83adf97b09..84237ad7ff82c1e6cf58594c44c853e65057d678 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/db/RuleDaoTest.java
@@ -75,31 +75,6 @@ public class RuleDaoTest {
     assertThat(ruleDto.getEffortToFixDescription()).isEqualTo("squid.S115.effortToFix");
   }
 
-  @Test
-  public void select_enables_and_non_manual() {
-    dbTester.prepareDbUnit(getClass(), "select_enables_and_non_manual.xml");
-    List<RuleDto> ruleDtos = dao.selectByEnabledAndNotManual(dbTester.getSession());
-
-    assertThat(ruleDtos.size()).isEqualTo(1);
-    RuleDto ruleDto = ruleDtos.get(0);
-    assertThat(ruleDto.getId()).isEqualTo(1);
-    assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
-    assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
-    assertThat(ruleDto.getDescriptionFormat()).isEqualTo(Format.HTML);
-    assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY);
-    assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
-    assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
-    assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100);
-    assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101);
-    assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR");
-    assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET");
-    assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h");
-    assertThat(ruleDto.getDefaultRemediationCoefficient()).isEqualTo("5d");
-    assertThat(ruleDto.getRemediationOffset()).isEqualTo("5min");
-    assertThat(ruleDto.getDefaultRemediationOffset()).isEqualTo("10h");
-    assertThat(ruleDto.getEffortToFixDescription()).isEqualTo("squid.S115.effortToFix");
-  }
-
   @Test
   public void select_by_id() {
     dbTester.prepareDbUnit(getClass(), "selectById.xml");

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml b/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml
deleted file mode 100644 (file)
index fe85e59..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/rule/db/RuleDaoTest/select_enables_and_non_manual.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<dataset>
-
-  <rules tags="[null]" system_tags="[null]" id="1" plugin_rule_key="AvoidNull" plugin_name="checkstyle" name="Avoid Null" description="Should avoid NULL" status="READY"
-         note_data="Rule note with accents éèà" note_user_login="polop.palap" note_created_at="2013-12-25" description_format="HTML"
-         characteristic_id="100" default_characteristic_id="101"
-         remediation_function="LINEAR" default_remediation_function="LINEAR_OFFSET"
-         remediation_coeff="1h" default_remediation_coeff="5d"
-         remediation_offset="5min" default_remediation_offset="10h"
-         effort_to_fix_description="squid.S115.effortToFix"/>
-
-  <rules tags="[null]" system_tags="[null]" id="2" plugin_rule_key="AvoidNull" plugin_name="squid" name="Avoid Null" description="Should avoid NULL" status="REMOVED"
-         note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         characteristic_id="[null]" default_characteristic_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
-         effort_to_fix_description="[null]"/>
-
-  <rules tags="[null]" system_tags="[null]" id="3" plugin_rule_key="AvoidNull" plugin_name="manual" name="Manual Rule" description="Should not appear" status="READY"
-         note_data="[null]" note_user_login="[null]" note_created_at="[null]" description_format="HTML"
-         characteristic_id="[null]" default_characteristic_id="[null]"
-         remediation_function="[null]" default_remediation_function="[null]"
-         remediation_coeff="[null]" default_remediation_coeff="[null]"
-         remediation_offset="[null]" default_remediation_offset="[null]"
-         effort_to_fix_description="[null]"/>
-
-</dataset>

diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java
index 8be99ab58321147e1bb69d5aa37a4b2db195e7f6..c58859013854c4a479f21fa188011dd21046ceb5 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDao.java
@@ -52,6 +52,10 @@ public class RuleDao implements Dao {
     return executeLargeInputs(keys, new KeyToDto(mapper(session)));
   }
 
+  public List<RuleDto> selectEnabledAndNonManual(DbSession session) {
+    return mapper(session).selectEnabledAndNonManual();
+  }
+
   private RuleMapper mapper(DbSession session) {
     return session.getMapper(RuleMapper.class);
   }

diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
index 79a1eebfe4264b5bb72c95d70de7b642fdeb8cff..9e957944c2be612fa185a0edea09d695b7c297fc 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleMapper.java
@@ -29,7 +29,7 @@ public interface RuleMapper {
 
   List<RuleDto> selectAll();
 
-  List<RuleDto> selectEnablesAndNonManual();
+  List<RuleDto> selectEnabledAndNonManual();
 
   List<RuleDto> selectNonManual();
 

diff --git a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 4651984855ad218f8c5c0355b0fb67c4160b6e58..f03f57abcedc007017df84483a5678c4bfbd0f0d 100644 (file)
--- a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -52,7 +52,7 @@
     </where>
   </select>
 
-  <select id="selectEnablesAndNonManual" resultType="Rule">
+  <select id="selectEnabledAndNonManual" resultType="Rule">
     select
     <include refid="selectColumns"/>
     from rules r

diff --git a/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java
index 499e80f34b857c3a20588853fe1a57d2a1dbf043..c6265510d7620fae40921f88fb9e7d78c5bf5e2a 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/rule/RuleDaoTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
 import org.sonar.db.RowNotFoundException;
@@ -86,4 +87,30 @@ public class RuleDaoTest {
     assertThat(rules).hasSize(1);
     assertThat(rules.get(0).getId()).isEqualTo(1);
   }
+
+  @Test
+  public void selectEnabledAndNonManual() {
+    dbTester.prepareDbUnit(getClass(), "selectEnabledAndNonManual.xml");
+    List<RuleDto> ruleDtos = underTest.selectEnabledAndNonManual(dbTester.getSession());
+
+    assertThat(ruleDtos.size()).isEqualTo(1);
+    RuleDto ruleDto = ruleDtos.get(0);
+    assertThat(ruleDto.getId()).isEqualTo(1);
+    assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
+    assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
+    assertThat(ruleDto.getDescriptionFormat()).isEqualTo(RuleDto.Format.HTML);
+    assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY);
+    assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle");
+    assertThat(ruleDto.getNoteData()).isEqualTo("Rule note with accents \u00e9\u00e8\u00e0");
+    assertThat(ruleDto.getSubCharacteristicId()).isEqualTo(100);
+    assertThat(ruleDto.getDefaultSubCharacteristicId()).isEqualTo(101);
+    assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR");
+    assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET");
+    assertThat(ruleDto.getRemediationCoefficient()).isEqualTo("1h");
+    assertThat(ruleDto.getDefaultRemediationCoefficient()).isEqualTo("5d");
+    assertThat(ruleDto.getRemediationOffset()).isEqualTo("5min");
+    assertThat(ruleDto.getDefaultRemediationOffset()).isEqualTo("10h");
+    assertThat(ruleDto.getEffortToFixDescription()).isEqualTo("squid.S115.effortToFix");
+  }
+
 }