Delete unused code in org.sonar.jpa.dao

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/BaseDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/BaseDao.java
index 6ce5db5d7294763b65982919c4e4924e8fe64a8d..354a954b26c17bac5c8a81210585f6f530a1b619 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/BaseDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/BaseDao.java
@@ -22,6 +22,10 @@ package org.sonar.jpa.dao;
 
 import org.sonar.api.database.DatabaseSession;
 
+/**
+ * @deprecated stop using Hibernate
+ */
+@Deprecated
 public class BaseDao {
 
   private final DatabaseSession session;

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/RulesDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/RulesDao.java
index e32447892ada2850e036d62acea42459305943c7..1a47b332c011308fed73b357eb23070b292de219 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/RulesDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/RulesDao.java
@@ -23,35 +23,12 @@ import org.sonar.api.database.DatabaseSession;
 import org.sonar.api.rules.Rule;
 import org.sonar.api.rules.RuleParam;
 
-import java.util.List;
-
 public class RulesDao extends BaseDao {
 
   public RulesDao(DatabaseSession session) {
     super(session);
   }
 
-  public List<Rule> getRules() {
-    return getSession().createQuery("FROM " + Rule.class.getSimpleName() + " r WHERE r.status<>:status")
-        .setParameter("status", Rule.STATUS_REMOVED)
-        .getResultList();
-  }
-
-  public List<Rule> getRulesByRepository(String repositoryKey) {
-    return getSession().createQuery("FROM " + Rule.class.getSimpleName() + " r WHERE r.pluginName=:pluginName and r.status<>:status")
-        .setParameter("pluginName", repositoryKey)
-        .setParameter("status", Rule.STATUS_REMOVED)
-        .getResultList();
-  }
-
-  /**
-   * @deprecated since 2.5 use {@link #getRulesByRepository(String)} instead.
-   */
-  @Deprecated
-  public List<Rule> getRulesByPlugin(String pluginKey) {
-    return getRulesByRepository(pluginKey);
-  }
-
   public Rule getRuleByKey(String repositoryKey, String ruleKey) {
     DatabaseSession session = getSession();
     return (Rule) session.getSingleResult(

diff --git a/sonar-core/src/test/java/org/sonar/jpa/dao/RulesDaoTest.java b/sonar-core/src/test/java/org/sonar/jpa/dao/RulesDaoTest.java
index 557ea22c2f54322bb7a32b563a4c6c382acd062a..e8256331e79e46ff24ef2523ad34930df2fb42ee 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/jpa/dao/RulesDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/dao/RulesDaoTest.java
@@ -24,10 +24,8 @@ import org.junit.Test;
 import org.sonar.api.rules.Rule;
 import org.sonar.jpa.test.AbstractDbUnitTestCase;
 
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 public class RulesDaoTest extends AbstractDbUnitTestCase {
@@ -39,18 +37,6 @@ public class RulesDaoTest extends AbstractDbUnitTestCase {
     rulesDao = new RulesDao(getSession());
   }
 
-  @Test
-  public void shouldGetRules() {
-    setupData("shouldGetRules");
-
-    List<Rule> rules = rulesDao.getRules();
-    assertThat(rules, notNullValue());
-    assertThat(rules.size(), is(2));
-
-    assertEquals("rule_one", rules.get(0).getKey());
-    assertEquals(1, rules.get(0).getParams().size());
-  }
-
   @Test
   public void shouldGetRuleWithRuleKeyAndPluginKey() {
     setupData("shouldGetRuleWithRuleKeyAndPluginKey");