[DO NOT MERGE] AIRES-8088 Fix SemSitter frontend gaps found on the ECJ replacement PoC

java-checks/src/test/java/org/sonar/java/checks/DeadStoreCheckTest.java

@@ -64,7 +64,7 @@ private static class EraseSymbols extends BaseTreeVisitor {
     @Override
     public void visitVariable(VariableTree tree) {
       if (tree instanceof VariableTreeImpl varImpl) {
-        varImpl.variableBinding = null;
+        varImpl.variableSymbol = null;
       }
       super.visitVariable(tree);
     }

java-checks/src/test/java/org/sonar/java/checks/helpers/JParserTestUtils.java

@@ -19,7 +19,6 @@
 import com.google.common.io.Files;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.sonar.java.model.JParser;
@@ -83,9 +82,9 @@ public static CompilationUnitTree parse(File file) {
   }
 
   public static CompilationUnitTree parse(String source) {
-    List<File> classpath = Arrays.asList(new File("target/test-classes"), new File("target/classes"));
+    List<File> classpath = List.of(new File("target/test-classes"), new File("target/classes"));
     JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
-    return JParser.parse(JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).astParser(), version.toString(), "test", source);
+    return JParser.parse(version.toString(), "test", source, classpath);
   }
 
 }

java-checks/src/test/java/org/sonar/java/checks/helpers/SpringContextModelTestUtils.java

@@ -174,6 +174,6 @@ private static CompilationUnitTree parse(File file, List<File> classpath) {
       throw new IllegalStateException("Unable to read file '" + file.getAbsolutePath() + "'", e);
     }
     JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
-    return JParser.parse(JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).astParser(), version.toString(), file.getName(), source);
+    return JParser.parse(version.toString(), file.getName(), source);
   }
 }

java-frontend/pom.xml

@@ -18,12 +18,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>jdt-package</artifactId>
-      <version>1.9.0.1840</version>
-    </dependency>
-
     <dependency>
       <groupId>org.sonarsource.api.plugin</groupId>
       <artifactId>sonar-plugin-api</artifactId>
@@ -92,6 +86,16 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.27.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.tukaani</groupId>
+      <artifactId>xz</artifactId>
+      <version>1.10</version>
+    </dependency>
 
     <dependency>
       <groupId>org.sonarsource.java</groupId>
@@ -144,6 +148,18 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${maven.multiModuleProjectDirectory}/semsitter-bridge/prebuilt</directory>
+        <includes>
+          <include>bridge-*.xz</include>
+        </includes>
+        <targetPath>bridge</targetPath>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

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

@@ -19,12 +19,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BooleanSupplier;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.java.annotations.VisibleForTesting;
 
-public class ProgressMonitor implements IProgressMonitor, Runnable {
+public class ProgressMonitor implements Runnable {
 
   private final Logger logger;
   private final long period;
@@ -84,7 +83,6 @@ public void run() {
     }
   }
 
-  @Override
   public void beginTask(String name, int totalWork) {
     if (totalWork <= 0) {
       unknownTotalWork = true;
@@ -96,7 +94,6 @@ public void beginTask(String name, int totalWork) {
     thread.start();
   }
 
-  @Override
   public void done() {
     if (success && analysisProgress.isLastBatch()) {
       log("100% analyzed");
@@ -107,7 +104,6 @@ public void done() {
     join();
   }
 
-  @Override
   public boolean isCanceled() {
     if (isCanceled.getAsBoolean()) {
       log("Batch processing: Cancelled!");
@@ -116,7 +112,6 @@ public boolean isCanceled() {
     return false;
   }
 
-  @Override
   public void setCanceled(boolean value) {
     // do nothing
   }
@@ -129,25 +124,21 @@ private void join() {
     }
   }
 
-  @Override
   public void worked(int work) {
     processedWork += work;
     if (processedWork == totalWork) {
       success = true;
     }
   }
 
-  @Override
   public void internalWorked(double work) {
     // do nothing
   }
 
-  @Override
   public void setTaskName(String name) {
     // do nothing
   }
 
-  @Override
   public void subTask(String name) {
     // do nothing
   }

java-frontend/src/main/java/org/sonar/java/model/AbstractTypedTree.java

@@ -16,23 +16,19 @@
  */
 package org.sonar.java.model;
 
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.sonar.plugins.java.api.semantic.Type;
-
 import javax.annotation.Nullable;
+import org.sonar.plugins.java.api.semantic.Type;
 
 /**
  * This class is intended for internal use during semantic analysis and should not be used in checks.
  */
 public abstract class AbstractTypedTree extends JavaTree {
 
   @Nullable
-  public ITypeBinding typeBinding;
+  public Type type;
 
   public Type symbolType() {
-    return typeBinding != null
-      ? root.sema.type(typeBinding)
-      : Type.UNKNOWN;
+    return type != null ? type : Type.UNKNOWN;
   }
 
 }