SONAR-6725 drop aggregation of measures of PACKAGES metric

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CoreFormulaRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CoreFormulaRepositoryImpl.java
index da148f7f6c602127c32cf99fcd9d054dbe250b7b..752fc5edead039ee13efb47a155f4a81f1093a98 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CoreFormulaRepositoryImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CoreFormulaRepositoryImpl.java
@@ -38,7 +38,6 @@ import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTIO
 import static org.sonar.api.measures.CoreMetrics.FUNCTION_COMPLEXITY_KEY;
 import static org.sonar.api.measures.CoreMetrics.GENERATED_LINES_KEY;
 import static org.sonar.api.measures.CoreMetrics.GENERATED_NCLOC_KEY;
-import static org.sonar.api.measures.CoreMetrics.PACKAGES_KEY;
 import static org.sonar.api.measures.CoreMetrics.STATEMENTS_KEY;
 
 public class CoreFormulaRepositoryImpl implements CoreFormulaRepository {
@@ -55,7 +54,6 @@ public class CoreFormulaRepositoryImpl implements CoreFormulaRepository {
     new SumFormula(CLASSES_KEY),
     new SumFormula(FUNCTIONS_KEY),
     new SumFormula(STATEMENTS_KEY),
-    new SumFormula(PACKAGES_KEY),
     new SumFormula(COMMENTED_OUT_CODE_LINES_KEY),
     new SumFormula(COMPLEXITY_KEY),
     new SumFormula(COMPLEXITY_IN_CLASSES_KEY),

diff --git a/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java b/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java
index 56aad8afb7232a71f02b9c0ffe65ae43e2310ca9..faec6be9514b746ab11c3127f267a497b469eb1b 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java
+++ b/sonar-core/src/main/java/org/sonar/core/metric/BatchMetrics.java
@@ -75,7 +75,6 @@ import static org.sonar.api.measures.CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_L
 import static org.sonar.api.measures.CoreMetrics.OVERALL_LINES_TO_COVER;
 import static org.sonar.api.measures.CoreMetrics.OVERALL_UNCOVERED_CONDITIONS;
 import static org.sonar.api.measures.CoreMetrics.OVERALL_UNCOVERED_LINES;
-import static org.sonar.api.measures.CoreMetrics.PACKAGES;
 import static org.sonar.api.measures.CoreMetrics.PUBLIC_API;
 import static org.sonar.api.measures.CoreMetrics.PUBLIC_UNDOCUMENTED_API;
 import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES;
@@ -112,7 +111,6 @@ public class BatchMetrics {
     PUBLIC_UNDOCUMENTED_API,
 
     FILES,
-    PACKAGES,
     DIRECTORIES,
     CLASSES,
     FUNCTIONS,

diff --git a/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java b/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java
index e3ddc9ba3368867df3aa94265916db1d175fe593..810e075891657df9b47749bc2e98a8e09ee07058 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/metric/BatchMetricsTest.java
@@ -37,7 +37,7 @@ public class BatchMetricsTest {
 
   @Test
   public void check_number_of_allowed_core_metrics() throws Exception {
-    assertThat(SENSOR_METRICS_WITHOUT_METRIC_PLUGIN.getMetrics()).hasSize(54);
+    assertThat(SENSOR_METRICS_WITHOUT_METRIC_PLUGIN.getMetrics()).hasSize(53);
   }
 
   @Test