SONAR-6676 remove Decorators for FILES and DIRECTORIES metrics

g711ab · Jul 23, 2015 · 44a68c4 · 44a68c4
1 parent c5a1dec
commit 44a68c4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 344 deletions.
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
@@ -22,8 +22,6 @@
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import java.util.List;
-import org.sonar.batch.compute.DirectoriesDecorator;
-import org.sonar.batch.compute.FilesDecorator;
 import org.sonar.batch.cpd.CpdComponents;
 import org.sonar.batch.issue.tracking.IssueTracking;
 import org.sonar.batch.scan.report.ConsoleReport;
@@ -63,11 +61,7 @@ public static Collection all(DefaultAnalysisMode analysisMode) {
       HtmlReport.class,
       IssuesReportBuilder.class,
       SourceProvider.class,
-      RuleNameProvider.class,
-
-      // to be moved to compute engine
-      DirectoriesDecorator.class,
-      FilesDecorator.class
+      RuleNameProvider.class
       );
     components.addAll(CorePropertyDefinitions.all());
     // CPD

diff --git a/sonar-batch/src/main/java/org/sonar/batch/compute/DirectoriesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/DirectoriesDecorator.java
diff --git a/sonar-batch/src/main/java/org/sonar/batch/compute/FilesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/FilesDecorator.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/compute/DirectoriesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/DirectoriesDecoratorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/compute/FilesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/FilesDecoratorTest.java
diff --git a/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java b/sonar-batch/src/test/java/org/sonar/batch/mediumtest/measures/MeasuresMediumTest.java
@@ -67,7 +67,7 @@ public void computeMeasuresOnSampleProject() throws Exception {
       .newScanTask(new File(tmpDir, "sonar-project.properties"))
       .start();
 
-    assertThat(result.allMeasures()).hasSize(25);
+    assertThat(result.allMeasures()).hasSize(18);
   }
 
   @Test
@@ -94,7 +94,7 @@ public void computeMeasuresOnTempProject() throws IOException {
         .build())
       .start();
 
-    assertThat(result.allMeasures()).hasSize(9);
+    assertThat(result.allMeasures()).hasSize(4);
 
     assertThat(result.allMeasures()).contains(new DefaultMeasure<Integer>()
       .forMetric(CoreMetrics.LINES)