SONARJAVA-5656 Make Measurer not @nullable in JavaFrontend (#5219)

Author: tomasz-tylenda-sonarsource

java-frontend/src/main/java/org/sonar/java/JavaFrontend.java

@@ -62,7 +62,7 @@ public class JavaFrontend {
   private final JavaAstScanner astScannerForTests;
   private final JavaAstScanner astScannerForGeneratedFiles;
 
-  public JavaFrontend(JavaVersion javaVersion, @Nullable SonarComponents sonarComponents, @Nullable Measurer measurer,
+  public JavaFrontend(JavaVersion javaVersion, @Nullable SonarComponents sonarComponents, Measurer measurer,
                       JavaResourceLocator javaResourceLocator, @Nullable SonarJavaIssueFilter postAnalysisIssueFilter, JavaCheck... visitors) {
     this.javaVersion = javaVersion;
     this.sonarComponents = sonarComponents;
@@ -74,11 +74,9 @@ public JavaFrontend(JavaVersion javaVersion, @Nullable SonarComponents sonarComp
 
     Iterable<JavaCheck> codeVisitors = ListUtils.concat(commonVisitors, Arrays.asList(visitors));
     Collection<JavaCheck> testCodeVisitors = new ArrayList<>(commonVisitors);
-    if (measurer != null) {
-      Iterable<JavaCheck> measurers = Collections.singletonList(measurer);
-      codeVisitors = ListUtils.concat(measurers, codeVisitors);
-      testCodeVisitors.add(measurer.new TestFileMeasurer());
-    }
+    Iterable<JavaCheck> measurers = Collections.singletonList(measurer);
+    codeVisitors = ListUtils.concat(measurers, codeVisitors);
+    testCodeVisitors.add(measurer.new TestFileMeasurer());
     List<File> classpath = new ArrayList<>();
     List<File> testClasspath = new ArrayList<>();
     List<JavaCheck> jspCodeVisitors = new ArrayList<>();

java-frontend/src/test/java/org/sonar/java/JavaFrontendTest.java

@@ -256,7 +256,7 @@ void test_scan_logs_when_caching_is_enabled_and_can_skip_unchanged_files() throw
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       specificSonarComponents,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );
@@ -289,7 +289,7 @@ void test_scan_logs_when_caching_is_enabled_and_cannot_skip_unchanged_files() th
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       specificSonarComponents,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );
@@ -322,7 +322,7 @@ void test_scan_logs_when_caching_is_enabled_and_cannot_determine_if_unchanged_fi
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       specificSonarComponents,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );
@@ -354,7 +354,7 @@ void test_scan_logs_when_caching_is_disabled_and_can_skip_unchanged_files() thro
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       specificSonarComponents,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );
@@ -386,7 +386,7 @@ void test_scan_logs_when_caching_is_disabled_and_cannot_skip_unchanged_files() t
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       specificSonarComponents,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );
@@ -411,7 +411,7 @@ void test_scan_logs_when_caching_is_disabled_when_sonar_components_is_null() {
     JavaFrontend frontend = new JavaFrontend(
       new JavaVersionImpl(),
       null,
-      null,
+      mock(Measurer.class),
       mock(JavaResourceLocator.class),
       mainCodeIssueScannerAndFilter
     );

java-frontend/src/test/java/org/sonar/java/JavaVersionAwareVisitorTest.java

@@ -30,6 +30,7 @@
 import org.sonar.plugins.java.api.tree.Tree;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 class JavaVersionAwareVisitorTest {
 
@@ -76,7 +77,7 @@ void no_java_version_matching() {
 
   private void checkIssues(JavaVersion version) {
     messages.clear();
-    JavaFrontend frontend = new JavaFrontend(version, null, null, null, null, javaChecks);
+    JavaFrontend frontend = new JavaFrontend(version, null, mock(Measurer.class), null, null, javaChecks);
     frontend.scan(Collections.singletonList(TestUtils.inputFile("src/test/files/JavaVersionAwareChecks.java")),
       Collections.emptyList(), Collections.emptyList());
   }

java-frontend/src/test/java/org/sonar/java/ast/visitors/FileLinesVisitorTest.java

@@ -25,6 +25,7 @@
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.FileLinesContext;
 import org.sonar.java.JavaFrontend;
+import org.sonar.java.Measurer;
 import org.sonar.java.SonarComponents;
 import org.sonar.java.TestUtils;
 import org.sonar.java.model.JavaVersionImpl;
@@ -49,7 +50,7 @@ private void checkLines(String filename, FileLinesContext context) {
     SonarComponents sonarComponents = mock(SonarComponents.class);
     when(sonarComponents.fileLinesContextFor(Mockito.any(InputFile.class))).thenReturn(context);
 
-    JavaFrontend frontend = new JavaFrontend(new JavaVersionImpl(), null, null, null, null, new FileLinesVisitor(sonarComponents));
+    JavaFrontend frontend = new JavaFrontend(new JavaVersionImpl(), null, mock(Measurer.class), null, null, new FileLinesVisitor(sonarComponents));
 
     frontend.scan(Collections.singletonList(inputFile), Collections.emptyList(), Collections.emptyList());
   }

java-frontend/src/test/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java

@@ -34,6 +34,7 @@
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.measures.FileLinesContextFactory;
 import org.sonar.java.JavaFrontend;
+import org.sonar.java.Measurer;
 import org.sonar.java.SonarComponents;
 import org.sonar.java.TestUtils;
 import org.sonar.java.classpath.ClasspathForMain;
@@ -253,7 +254,7 @@ void sealed_classes() {
 
   private void scan(InputFile inputFile) {
     JavaVersion javaVersion = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
-    JavaFrontend frontend = new JavaFrontend(javaVersion, null, null, null, null, syntaxHighlighterVisitor);
+    JavaFrontend frontend = new JavaFrontend(javaVersion, null, mock(Measurer.class), null, null, syntaxHighlighterVisitor);
     frontend.scan(Collections.singletonList(inputFile), Collections.emptyList(), Collections.emptyList());
   }