diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2015-07-22 17:06:56 +0200 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2015-07-23 10:38:32 +0200 |
| commit | 5e36720bed53fd3237cc34935c94a48a83fd25d4 (patch) | |
| tree | e962ddde43bdb8e2d493813d224b2ee85a259310 | |
| parent | 51f8fa984e4a2c11ededba97e6b2c0a2fe29bb02 (diff) | |
| download | sonarqube-5e36720bed53fd3237cc34935c94a48a83fd25d4.tar.gz sonarqube-5e36720bed53fd3237cc34935c94a48a83fd25d4.zip | |
SONAR-6725 drop aggregation of measures of PACKAGES metric
3 files changed, 1 insertions, 5 deletions
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 da148f7f6c6..752fc5edead 100644 --- 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 56aad8afb72..faec6be9514 100644 --- 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 e3ddc9ba336..810e0758916 100644 --- 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 |