SONARPY-201 Move call to coverage sensor in PythonScanner

pynicolas · pynicolas · commit e5137cdd1933 · 2017-05-05T12:54:24.000+02:00
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonScanner.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonScanner.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.sonar.api.SonarProduct;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.TextRange;
 import org.sonar.api.batch.rule.Checks;
@@ -39,8 +40,10 @@
 import org.sonar.api.measures.FileLinesContextFactory;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.rule.RuleKey;
+import org.sonar.api.utils.Version;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
+import org.sonar.plugins.python.coverage.PythonCoverageSensor;
 import org.sonar.python.IssueLocation;
 import org.sonar.python.PythonCheck;
 import org.sonar.python.PythonCheck.PreciseIssue;
@@ -58,6 +61,8 @@ public class PythonScanner {
   private static final Number[] FUNCTIONS_DISTRIB_BOTTOM_LIMITS = {1, 2, 4, 6, 8, 10, 12, 20, 30};
   private static final Number[] FILES_DISTRIB_BOTTOM_LIMITS = {0, 5, 10, 20, 30, 60, 90};
 
+  private static final Version V6_0 = Version.create(6, 0);
+
   private final SensorContext context;
   private final Parser<Grammar> parser;
   private final List<InputFile> inputFiles;
@@ -82,6 +87,9 @@ public void scanFiles() {
     for (InputFile pythonFile : inputFiles) {
       scanFile(pythonFile);
     }
+    if (!isSonarLint(context)) {
+      (new PythonCoverageSensor()).execute(context, linesOfCodeByFile);
+    }
   }
 
   private void scanFile(InputFile inputFile) {
@@ -208,7 +216,7 @@ private void saveFilesComplexityDistribution(InputFile inputFile, MetricVisitor
       .save();
   }
 
-  public Map<InputFile, Set<Integer>> linesOfCodeByFile() {
-    return linesOfCodeByFile;
+  private static boolean isSonarLint(SensorContext context) {
+    return context.getSonarQubeVersion().isGreaterThanOrEqual(V6_0) && context.runtime().getProduct() == SonarProduct.SONARLINT;
   }
 }
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonSquidSensor.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/PythonSquidSensor.java
@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.sonar.api.SonarProduct;
 import org.sonar.api.batch.fs.FilePredicates;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputFile.Type;
@@ -32,15 +31,11 @@
 import org.sonar.api.batch.sensor.SensorDescriptor;
 import org.sonar.api.issue.NoSonarFilter;
 import org.sonar.api.measures.FileLinesContextFactory;
-import org.sonar.api.utils.Version;
-import org.sonar.plugins.python.coverage.PythonCoverageSensor;
 import org.sonar.python.PythonCheck;
 import org.sonar.python.checks.CheckList;
 
 public final class PythonSquidSensor implements Sensor {
 
-  private static final Version V6_0 = Version.create(6, 0);
-
   private final Checks<PythonCheck> checks;
   private final FileLinesContextFactory fileLinesContextFactory;
   private final NoSonarFilter noSonarFilter;
@@ -69,14 +64,6 @@ public void execute(SensorContext context) {
 
     PythonScanner scanner = new PythonScanner(context, checks, fileLinesContextFactory, noSonarFilter, inputFiles);
     scanner.scanFiles();
-
-    if (!isSonarLint(context)) {
-      (new PythonCoverageSensor()).execute(context, scanner.linesOfCodeByFile());
-    }
-  }
-
-  private static boolean isSonarLint(SensorContext context) {
-    return context.getSonarQubeVersion().isGreaterThanOrEqual(V6_0) && context.runtime().getProduct() == SonarProduct.SONARLINT;
   }
 
 }
