Remove useless methods from MeasuresDao

diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java
index 5c15b01414a7d81f5522c8566858c2a32c89b97d..23636e511333b93f2fbf7f4583397f250f9f704e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java
@@ -88,7 +88,7 @@ public class RegisterMetrics {
       @Override
       public boolean apply(Metric metric) {
         // It should be better to use the template mechanism (as it's done in #RegisterDashboards to register provided user manager metrics
-        return !metric.getUserManaged() || measuresDao.getMetric(metric) == null;
+        return !metric.getUserManaged() || measuresDao.getMetric(metric.getKey()) == null;
       }
     }));
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
index 4cb2153786f2ad4317d8fcd159657b53f7129e80..af536fab964d80f595de612b6419c9a305f8eb77 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
@@ -125,7 +125,7 @@ public class RegisterMetricsTest extends AbstractDbUnitTestCase {
     loader.start();
 
     assertThat(measuresDao.getMetric("deprecated").getEnabled()).isFalse();
-    assertThat(measuresDao.getMetric(CoreMetrics.COMPLEXITY).getEnabled()).isTrue();
+    assertThat(measuresDao.getMetric(CoreMetrics.COMPLEXITY_KEY).getEnabled()).isTrue();
   }
 
   @Test

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java b/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
index 1ed2f16042a8334730bda89d7118afc6854c601d..372674b94c4c51f3bc63af2dd602d96c5aa3bb54 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dao/MeasuresDao.java
@@ -19,17 +19,14 @@
  */
 package org.sonar.jpa.dao;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.sonar.api.database.DatabaseSession;
-import org.sonar.api.measures.Metric;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.collect.Lists.newArrayList;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.sonar.api.database.DatabaseSession;
+import org.sonar.api.measures.Metric;
 
 public class MeasuresDao {
 
@@ -40,18 +37,6 @@ public class MeasuresDao {
     this.session = session;
   }
 
-  public Metric getMetric(Metric metric) {
-    return getMetricsByName().get(metric.getKey());
-  }
-
-  public List<Metric> getMetrics(List<Metric> metrics) {
-    List<Metric> result = newArrayList();
-    for (Metric metric : metrics) {
-      result.add(getMetric(metric));
-    }
-    return result;
-  }
-
   public Metric getMetric(String metricName) {
     return getMetricsByName().get(metricName);
   }
@@ -69,16 +54,6 @@ public class MeasuresDao {
     });
   }
 
-  public Collection<Metric> getUserDefinedMetrics() {
-    return CollectionUtils.select(getMetricsByName().values(), new Predicate() {
-      @Override
-      public boolean evaluate(Object o) {
-        Metric m = (Metric) o;
-        return m.getEnabled() && m.getOrigin() != Metric.Origin.JAV;
-      }
-    });
-  }
-
   public void disableAutomaticMetrics() {
     session.createQuery("update " + Metric.class.getSimpleName() + " m set m.enabled=false where m.userManaged=false").executeUpdate();
     session.commit();
@@ -97,7 +72,7 @@ public class MeasuresDao {
   }
 
   private void persistMetricWithoutClear(Metric metric) {
-    Metric dbMetric = getMetric(metric);
+    Metric dbMetric = getMetric(metric.getKey());
     if (dbMetric != null) {
       dbMetric.merge(metric);
       session.getEntityManager().merge(dbMetric);
@@ -107,19 +82,6 @@ public class MeasuresDao {
     }
   }
 
-  public void persistMetric(Metric metric) {
-    persistMetricWithoutClear(metric);
-    metricsByName.clear();
-  }
-
-  public void disabledMetrics(Collection<Metric> metrics) {
-    for (Metric metric : metrics) {
-      metric.setEnabled(Boolean.FALSE);
-      session.getEntityManager().persist(metric);
-      metricsByName.put(metric.getName(), metric);
-    }
-  }
-
   private Map<String, Metric> getMetricsByName() {
     if (metricsByName.isEmpty()) {
       List<Metric> metrics = session.getResults(Metric.class);

diff --git a/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java b/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java
index d525fe3c7c6f782aeb44d8e2d1735dfd741580ac..bab9bcd488d91d960c76b1835ad87d4d5e39b220 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java
@@ -45,19 +45,6 @@ public class MeasuresDaoTest extends AbstractDbUnitTestCase {
     getSession().save(project);
   }
 
-  @Test
-  public void shouldReturnUserDefinedMetrics() {
-    for (Metric metric : createMetrics()) {
-      getSession().save(metric);
-    }
-
-    Collection<Metric> metrics = service.getUserDefinedMetrics();
-    assertThat(metrics.size(), is(2));
-    for (Metric metric : metrics) {
-      assertThat(metric.getOrigin(), not(Metric.Origin.JAV));
-    }
-  }
-
   @Test
   public void shouldRegisterMetrics() {
     Collection<Metric> newMetrics = createMetrics();
@@ -67,20 +54,6 @@ public class MeasuresDaoTest extends AbstractDbUnitTestCase {
     assertThat(metrics.size(), is(newMetrics.size()));
   }
 
-  @Test
-  public void shouldDisabledMetrics() {
-    Collection<Metric> newMetrics = createMetrics();
-
-    service.disabledMetrics(newMetrics);
-
-    Collection<Metric> allMetrics = service.getMetrics();
-    assertThat(allMetrics.size(), is(newMetrics.size()));
-
-    Collection<Metric> disabledMetrics = service.getEnabledMetrics();
-    assertThat(disabledMetrics.size(), is(0));
-  }
-
-
   private Collection<Metric> createMetrics() {
     Metric m1 = new Metric("metric1");
     m1.setEnabled(false);