SONARPY-235 Factorize code between PylintSensor and PylintImportSensor

pynicolas · alban-auzeill · commit 9c445aa40d75 · 2018-01-15T16:20:42.000+01:00
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintImportSensor.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintImportSensor.java
@@ -111,7 +111,7 @@ private static void saveIssues(List<Issue> issues, SensorContext context) {
     }
   }
 
-  private static void processRule(Issue pylintIssue, InputFile pyfile, @Nullable ActiveRule rule, SensorContext context) {
+  public static void processRule(Issue pylintIssue, InputFile pyfile, @Nullable ActiveRule rule, SensorContext context) {
     if (rule != null) {
       NewIssue newIssue = context
         .newIssue()
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintSensor.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintSensor.java
@@ -23,24 +23,19 @@
 import java.io.IOException;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.FilePredicates;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.rule.ActiveRule;
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonar.api.batch.sensor.issue.NewIssue;
 import org.sonar.api.config.Settings;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.plugins.python.Python;
 
 public class PylintSensor implements Sensor {
 
-  private static final Logger LOG = LoggerFactory.getLogger(PylintSensor.class);
-
   private PylintConfiguration conf;
   private Settings settings;
 
@@ -92,7 +87,7 @@ public void execute(SensorContext sensorContext) {
     }
   }
 
-  protected void analyzeFile(SensorContext context, InputFile file, File out) throws IOException {
+  private void analyzeFile(SensorContext context, InputFile file, File out) throws IOException {
     FileSystem fileSystem = context.fileSystem();
 
     String pylintConfigPath = conf.getPylintConfigPath(fileSystem);
@@ -103,19 +98,7 @@ protected void analyzeFile(SensorContext context, InputFile file, File out) thro
 
     for (Issue pylintIssue : issues) {
       ActiveRule rule = context.activeRules().find(RuleKey.of(PylintRuleRepository.REPOSITORY_KEY, pylintIssue.getRuleId()));
-
-      if (rule != null) {
-        NewIssue newIssue = context
-          .newIssue()
-          .forRule(rule.ruleKey());
-        newIssue.at(newIssue.newLocation()
-          .on(file)
-          .at(file.selectLine(pylintIssue.getLine()))
-          .message(pylintIssue.getDescription()));
-        newIssue.save();
-      } else {
-        LOG.warn("Pylint rule '{}' is unknown in Sonar", pylintIssue.getRuleId());
-      }
+      PylintImportSensor.processRule(pylintIssue, file, rule, context);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private static void saveIssues(List<Issue> issues, SensorContext context) {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- private static void processRule(Issue pylintIssue, InputFile pyfile, @Nullable ActiveRule rule, SensorContext context) {`
	`114`	`+ public static void processRule(Issue pylintIssue, InputFile pyfile, @Nullable ActiveRule rule, SensorContext context) {`
`115`	`115`	`if (rule != null) {`
`116`	`116`	`NewIssue newIssue = context`
`117`	`117`	`.newIssue()`