SONAR-8867 remove usused RuleDao#selectEnabled(DbSession)

only override with ResultHandler is used

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java
index 53e3c95e857e33c078467c2b4d42ecd1c8a8e96d..68a896175b0269db84a922076063713714a5f3e2 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDao.java
@@ -67,10 +67,6 @@ public class RuleDao implements Dao {
     return executeLargeInputs(keys, mapper(session)::selectByKeys);
   }
 
-  public List<RuleDto> selectEnabled(DbSession session) {
-    return mapper(session).selectEnabled();
-  }
-
   public void selectEnabled(DbSession session, ResultHandler resultHandler) {
     mapper(session).selectEnabled(resultHandler);
   }

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleMapper.java
index e9fa557c827bd8b3e24a2ecdf2766d2df3b8e53b..c6d16a708d9ac7a010b381016faf3c7acd32793f 100644 (file)
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleMapper.java
@@ -29,8 +29,6 @@ public interface RuleMapper {
 
   List<RuleDto> selectAll();
 
-  List<RuleDto> selectEnabled();
-
   void selectEnabled(ResultHandler resultHandler);
 
   RuleDto selectById(long id);

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
index bf5aa357384deff1bbda48cb0ce593051ba77e1b..3791b255066e46e0250c2e014ad9b9d998ddb32b 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
@@ -120,29 +120,6 @@ public class RuleDaoTest {
     assertThat(rules.get(0).getId()).isEqualTo(1);
   }
 
-  @Test
-  public void selectEnabled() {
-    dbTester.prepareDbUnit(getClass(), "selectEnabled.xml");
-    List<RuleDto> ruleDtos = underTest.selectEnabled(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.getRemediationFunction()).isEqualTo("LINEAR");
-    assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET");
-    assertThat(ruleDto.getRemediationGapMultiplier()).isEqualTo("1h");
-    assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isEqualTo("5d");
-    assertThat(ruleDto.getRemediationBaseEffort()).isEqualTo("5min");
-    assertThat(ruleDto.getDefaultRemediationBaseEffort()).isEqualTo("10h");
-    assertThat(ruleDto.getGapDescription()).isEqualTo("squid.S115.effortToFix");
-  }
-
   @Test
   public void selectAll() {
     dbTester.prepareDbUnit(getClass(), "shared.xml");
@@ -168,6 +145,19 @@ public class RuleDaoTest {
     assertThat(rules.size()).isEqualTo(1);
     RuleDto ruleDto = rules.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.getRemediationFunction()).isEqualTo("LINEAR");
+    assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET");
+    assertThat(ruleDto.getRemediationGapMultiplier()).isEqualTo("1h");
+    assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isEqualTo("5d");
+    assertThat(ruleDto.getRemediationBaseEffort()).isEqualTo("5min");
+    assertThat(ruleDto.getDefaultRemediationBaseEffort()).isEqualTo("10h");
+    assertThat(ruleDto.getGapDescription()).isEqualTo("squid.S115.effortToFix");
   }
 
   @Test