SONARJAVA-4209 Fix cache context initialization in test kit and and context creation in VisitorsBridge

dorian-burihabwa-sonarsource · web-flow · commit b867d1a0bcca · 2022-04-21T15:44:53.000+02:00
* Fix overwriting of CacheContext in InternalCheckVerifier
* Fix InputFileScannerContext creation to use the write file when scanning without parsing
diff --git a/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java b/java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/internal/InternalCheckVerifier.java
@@ -294,8 +294,8 @@ private void verifyAll() {
 
     List<InputFile> filesToParse = files;
     if (isCacheEnabled) {
-      filesToParse = astScanner.scanWithoutParsing(files).get(false);
       visitorsBridge.setCacheContext(cacheContext);
+      filesToParse = astScanner.scanWithoutParsing(files).get(false);
     }
     astScanner.scan(filesToParse);
 
@@ -629,11 +629,6 @@ private SonarComponents sonarComponents() {
     SensorContext sensorContext;
     if (isCacheEnabled) {
       sensorContext = new CacheEnabledSensorContext(readCache, writeCache);
-      cacheContext = new InternalCacheContext(
-        sensorContext.isCacheEnabled(),
-        new JavaReadCacheImpl(sensorContext.previousCache()),
-        new JavaWriteCacheImpl(sensorContext.nextCache())
-      );
     } else {
       sensorContext = new InternalSensorContext();
     }
diff --git a/java-frontend/src/main/java/org/sonar/java/model/VisitorsBridge.java b/java-frontend/src/main/java/org/sonar/java/model/VisitorsBridge.java
@@ -177,7 +177,7 @@ public void setCacheContext(CacheContext cacheContext) {
   public boolean scanWithoutParsing(InputFile inputFile) {
     if (sonarComponents != null && sonarComponents.fileCanBeSkipped(inputFile)) {
       boolean allScansSucceeded = true;
-      var fileScannerContext = createScannerContext();
+      var fileScannerContext = createScannerContext(sonarComponents, inputFile, javaVersion, inAndroidContext, cacheContext);
       for (var scanner: scannersThatCannotBeSkipped) {
         try {
           allScansSucceeded &= scanner.scanWithoutParsing(fileScannerContext);
@@ -285,10 +285,11 @@ private static String ruleKey(JavaFileScanner scanner) {
     return "";
   }
 
-  protected InputFileScannerContext createScannerContext() {
+  protected static InputFileScannerContext createScannerContext(
+    SonarComponents sonarComponents, InputFile inputFile, JavaVersion javaVersion, boolean inAndroidContext, CacheContext cacheContext) {
     return new DefaultInputFileScannerContext(
       sonarComponents,
-      currentFile,
+      inputFile,
       javaVersion,
       inAndroidContext,
       cacheContext
