SONARJAVA-7300 Decouple the Sonar Java frontend from Eclipse JDT core

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

@@ -17,14 +17,11 @@
 package org.sonar.java.checks.helpers;
 
 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;
 import org.sonar.java.model.JParserConfig;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.tree.*;
@@ -77,7 +74,7 @@ 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"));
     JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
-    return JParser.parse(JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).astParser(), version.toString(), "test", source);
+    return JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse("test", source);
   }
 
 }

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

@@ -22,7 +22,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.sonar.java.model.JParser;
 import org.sonar.java.model.JParserConfig;
 import org.sonar.plugins.java.api.JavaVersion;
 import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
@@ -85,7 +84,7 @@ 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"));
     JavaVersion version = JParserConfig.MAXIMUM_SUPPORTED_JAVA_VERSION;
-    return JParser.parse(JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).astParser(), version.toString(), "test", source);
+    return JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse("test", source);
   }
 
 }

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

@@ -28,7 +28,6 @@
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.java.SonarComponents;
 import org.sonar.java.checks.verifier.TestUtils;
-import org.sonar.java.model.JParser;
 import org.sonar.java.model.JParserConfig;
 import org.sonar.java.model.VisitorsBridge;
 import org.sonar.java.model.springcontext.BeanDefinitionGatherer;
@@ -174,6 +173,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 JParserConfig.Mode.FILE_BY_FILE.create(version, classpath).parse(file.getName(), source);
   }
 }

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

@@ -234,7 +234,7 @@ private void scanInBatches(BatchModeContext context, List<InputFile> allInputFil
     }
   }
 
-  private <T extends InputFile> void scanBatch(BatchModeContext context, List<T> batchFiles, AnalysisProgress analysisProgress) {
+  private void scanBatch(BatchModeContext context, List<InputFile> batchFiles, AnalysisProgress analysisProgress) {
     analysisProgress.startBatch(batchFiles.size());
     Set<Runnable> environmentsCleaners = new HashSet<>();
     JParserConfig.Mode.BATCH

java-frontend/src/main/java/org/sonar/java/ast/JavaAstScanner.java

@@ -103,7 +103,7 @@ public void scanForTesting(Iterable<? extends InputFile> inputFiles, Consumer<Co
   }
 
   private void scan(Iterable<? extends InputFile> inputFiles, Consumer<CompilationUnitTree> modifyCompilationUnit) {
-    List<? extends InputFile> filesNames = filterModuleInfo(inputFiles).toList();
+    List<InputFile> filesNames = filterModuleInfo(inputFiles).collect(Collectors.toList());
     AnalysisProgress analysisProgress = new AnalysisProgress(filesNames.size());
     try {
       boolean shouldIgnoreUnnamedModuleForSplitPacakge = sonarComponents != null &&

java-frontend/src/main/java/org/sonar/java/model/JInitializerBlockSymbol.java → java-frontend/src/main/java/org/sonar/java/jdt/JDTInitializerBlockSymbol.java

@@ -14,10 +14,11 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonar.java.model;
+package org.sonar.java.jdt;
 
 import java.util.Collections;
 import java.util.List;
+import org.sonar.java.model.Symbols;
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.semantic.SymbolMetadata;
 import org.sonar.plugins.java.api.semantic.Type;
@@ -29,11 +30,11 @@
  * defined inside an initializer block can have an owner other than the containing class. This is necessary to properly
  * detect them as local variables.
  */
-final class JInitializerBlockSymbol implements Symbol.MethodSymbol {
+final class JDTInitializerBlockSymbol implements Symbol.MethodSymbol {
   private final TypeSymbol owner;
   private final boolean isStatic;
 
-  public JInitializerBlockSymbol(TypeSymbol owner, boolean isStatic) {
+  public JDTInitializerBlockSymbol(TypeSymbol owner, boolean isStatic) {
     this.owner = owner;
     this.isStatic = isStatic;
   }

java-frontend/src/main/java/org/sonar/java/model/JMethodSymbol.java → java-frontend/src/main/java/org/sonar/java/jdt/JDTMethodSymbol.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonar.java.model;
+package org.sonar.java.jdt;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,7 +33,7 @@
 import org.sonar.plugins.java.api.tree.MethodTree;
 import org.sonar.plugins.java.api.tree.VariableTree;
 
-final class JMethodSymbol extends JSymbol implements Symbol.MethodSymbol {
+final class JDTMethodSymbol extends JDTSymbol implements Symbol.MethodSymbol {
 
   /**
    * Cache for {@link #parameterTypes()}.
@@ -59,7 +59,7 @@ final class JMethodSymbol extends JSymbol implements Symbol.MethodSymbol {
 
   private final String signature;
 
-  JMethodSymbol(JSema sema, IMethodBinding methodBinding) {
+  JDTMethodSymbol(JDTSema sema, IMethodBinding methodBinding) {
     super(sema, methodBinding);
     this.signature = methodBinding().getDeclaringClass().getBinaryName()
       + "#" + name()
@@ -93,7 +93,7 @@ public List<Symbol> declarationParameters() {
         IMethodBinding methodBinding = methodBinding();
         ITypeBinding[] parameterTypeBindings = methodBinding.getParameterTypes();
         for (int i = 0; i < parameterTypeBindings.length; i++) {
-          parameters.add(new JVariableSymbol.ParameterPlaceholderSymbol(i, sema, methodBinding.getMethodDeclaration(), parameterTypeBindings[i]));
+          parameters.add(new JDTVariableSymbol.ParameterPlaceholderSymbol(i, sema, methodBinding.getMethodDeclaration(), parameterTypeBindings[i]));
         }
       }
     }
@@ -183,6 +183,12 @@ public boolean isParametrizedMethod() {
     return !isUnknown() && (methodBinding().isParameterizedMethod() || methodBinding().isGenericMethod());
   }
 
+  @Nullable
+  @Override
+  public Object annotationElementDefaultValue() {
+    return isUnknown() ? null : JDTSymbolMetadata.convertAnnotationValue(sema, methodBinding().getDefaultValue());
+  }
+
   @Override
   public boolean isDefaultMethod() {
     return !isUnknown() && Modifier.isDefault(binding.getModifiers());