SONARJAVA-4267 Fix skipping of generated files (#4119)

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

@@ -32,6 +32,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import javax.annotation.Nullable;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.utils.log.Logger;
@@ -142,10 +143,7 @@ public void scan(Iterable<InputFile> sourceFiles, Iterable<InputFile> testFiles,
       successfullyScanned += testFilesScannedWithoutParsing.get(true).size();
       total += testFilesScannedWithoutParsing.get(true).size() + testFilesScannedWithoutParsing.get(false).size();
 
-      Map<Boolean, List<InputFile>> generatedFilesScannedWithoutParsing = astScannerForGeneratedFiles.scanWithoutParsing(generatedFiles);
-      generatedFiles = generatedFilesScannedWithoutParsing.get(false);
-      successfullyScanned += generatedFilesScannedWithoutParsing.get(true).size();
-      total += generatedFilesScannedWithoutParsing.get(true).size() + generatedFilesScannedWithoutParsing.get(false).size();
+      total += StreamSupport.stream(generatedFiles.spliterator(), false).count();
 
       LOG.info(
         "Server-side caching is enabled. The Java analyzer was able to leverage cached data from previous analyses for {} out of {} files. These files will not be parsed.",

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

@@ -64,6 +64,7 @@
 import org.sonar.java.classpath.ClasspathForMain;
 import org.sonar.java.classpath.ClasspathForTest;
 import org.sonar.java.exceptions.ApiMismatchException;
+import org.sonar.java.model.GeneratedFile;
 import org.sonar.java.model.JProblem;
 import org.sonar.java.model.LineUtils;
 import org.sonar.java.reporting.AnalyzerMessage;
@@ -451,6 +452,10 @@ public boolean canSkipUnchangedFiles() throws ApiMismatchException {
 
 
   public boolean fileCanBeSkipped(InputFile inputFile) {
+    if (inputFile instanceof GeneratedFile) {
+      // Generated files should not be skipped as we cannot assess the change status of the source file
+      return false;
+    }
     boolean canSkipInContext;
     try {
       canSkipInContext = canSkipUnchangedFiles();

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

@@ -23,6 +23,7 @@
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -77,6 +78,7 @@
 import org.sonar.java.classpath.ClasspathForMain;
 import org.sonar.java.classpath.ClasspathForTest;
 import org.sonar.java.exceptions.ApiMismatchException;
+import org.sonar.java.model.GeneratedFile;
 import org.sonar.java.model.JParserTestUtils;
 import org.sonar.java.model.JavaTree;
 import org.sonar.java.reporting.AnalyzerMessage;
@@ -714,6 +716,23 @@ void skipUnchangedFiles_throws_a_NoSuchMethodError_when_canSkipUnchangedFiles_no
     assertThat(error).hasCause(new NoSuchMethodError("API version mismatch :-("));
   }
 
+  @Test
+  void fileCanBeSkipped_returns_false_when_the_file_is_a_generated_file() throws ApiMismatchException {
+    SensorContextTester sensorContextTester = SensorContextTester.create(new File(""));
+    SonarComponents sonarComponents = spy(
+      new SonarComponents(
+        fileLinesContextFactory,
+        sensorContextTester.fileSystem(),
+        mock(ClasspathForMain.class),
+        mock(ClasspathForTest.class),
+        checkFactory
+      )
+    );
+    InputFile inputFile = new GeneratedFile(Path.of("non-existing-generated-file.java"));
+
+    assertThat(sonarComponents.fileCanBeSkipped(inputFile)).isFalse();
+  }
+
   @Test
   void fileCanBeSkipped_always_returns_false_when_skipUnchangedFiles_is_false() throws ApiMismatchException {
 

java-frontend/src/test/java/org/sonar/java/model/VisitorsBridgeTest.java

@@ -20,6 +20,7 @@
 package org.sonar.java.model;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +39,6 @@
 import org.sonar.api.utils.log.LoggerLevel;
 import org.sonar.java.AnalysisException;
 import org.sonar.java.CheckFailureException;
-import org.sonar.plugins.java.api.internal.EndOfAnalysis;
 import org.sonar.java.JavaVersionAwareVisitor;
 import org.sonar.java.SonarComponents;
 import org.sonar.java.TestUtils;
@@ -54,6 +54,7 @@
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.ModuleScannerContext;
 import org.sonar.plugins.java.api.caching.CacheContext;
+import org.sonar.plugins.java.api.internal.EndOfAnalysis;
 import org.sonar.plugins.java.api.tree.CompilationUnitTree;
 import org.sonar.plugins.java.api.tree.SyntaxToken;
 import org.sonar.plugins.java.api.tree.SyntaxTrivia;
@@ -491,6 +492,21 @@ void scanWithoutParsing_returns_false_when_the_file_cannot_be_skipped() throws A
       assertThat(visitorsBridge.scanWithoutParsing(inputFile)).isFalse();
     }
 
+    @Test
+    void scanWithoutParsing_returns_false_when_the_file_is_a_generated_file() throws ApiMismatchException {
+      InputFile inputFile = new GeneratedFile(Path.of("non-existing-generated-file.java"));
+
+      SonarComponents sonarComponents = spy(new SonarComponents(null, null, null, null, null));
+      doReturn(true).when(sonarComponents).canSkipUnchangedFiles();
+      VisitorsBridge visitorsBridge = new VisitorsBridge(
+        Collections.singletonList(new EndOfAnalysisVisitor()),
+        Collections.emptyList(),
+        sonarComponents
+      );
+
+      assertThat(visitorsBridge.scanWithoutParsing(inputFile)).isFalse();
+    }
+
     @Test
     void scanWithoutParsing_returns_true_for_scanners_that_do_not_override_scanWithoutParsing() throws ApiMismatchException {
       JavaFileScanner scanner = new DefaultEndOfAnalysisCheck();