refactor: convert constructor args to method parameter and store `Son…

…arLintEngine` as a local variable (#757)
ASSERT-KTH · Mar 23, 2022 · fc7af13 · fc7af13
1 parent 339abaa
commit fc7af13
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/main/java/sorald/rule/StaticAnalyzer.java b/src/main/java/sorald/rule/StaticAnalyzer.java
@@ -10,11 +10,12 @@ public interface StaticAnalyzer {
     /**
      * Scan files for violations of some rules.
      *
+     * @param projectRoot the root folder of the project.
      * @param files The files to analyze.
      * @param rule The rules to use.
      * @param classpath Classpath that includes any dependencies.
      * @return All violations of the rules found in the files.
      */
     Collection<RuleViolation> findViolations(
-            List<File> files, List<Rule> rule, List<String> classpath);
+            File projectRoot, List<File> files, List<Rule> rule, List<String> classpath);
 }
diff --git a/src/main/java/sorald/sonar/ProjectScanner.java b/src/main/java/sorald/sonar/ProjectScanner.java
@@ -64,7 +64,7 @@ public static Set<RuleViolation> scanProject(
 
         // TODO generalize to not directly use the SonarStaticAnalyzer
         var violations =
-                new SonarStaticAnalyzer(baseDir).findViolations(filesToScan, rules, classpath);
+                new SonarStaticAnalyzer().findViolations(baseDir, filesToScan, rules, classpath);
         return new HashSet<>(violations);
     }
 }
diff --git a/src/main/java/sorald/sonar/SonarStaticAnalyzer.java b/src/main/java/sorald/sonar/SonarStaticAnalyzer.java
@@ -15,22 +15,15 @@
 import sorald.rule.StaticAnalyzer;
 
 public class SonarStaticAnalyzer implements StaticAnalyzer {
-    private final File projectRoot;
-    private final SonarLintEngine sonarLint;
-
-    public SonarStaticAnalyzer(File projectRoot) {
-        this.projectRoot = projectRoot;
-        this.sonarLint = SonarLintEngine.getInstance();
-    }
 
     @Override
     public Collection<RuleViolation> findViolations(
-            List<File> files, List<Rule> rules, List<String> classpath) {
-        return analyze(files, rules, classpath);
+            File projectRoot, List<File> files, List<Rule> rules, List<String> classpath) {
+        return analyze(projectRoot, files, rules, classpath);
     }
 
     private Collection<RuleViolation> analyze(
-            List<File> files, List<Rule> rules, List<String> classpath) {
+            File projectRoot, List<File> files, List<Rule> rules, List<String> classpath) {
 
         List<JavaInputFile> inputFiles =
                 files.stream()
@@ -52,6 +45,7 @@ private Collection<RuleViolation> analyze(
                         .addInputFiles(inputFiles)
                         .build();
 
+        SonarLintEngine sonarLint = SonarLintEngine.getInstance();
         var issueHandler = new IssueHandler();
         sonarLint.analyze(config, issueHandler, null, null);
         sonarLint.stop();