SONARJAVA-5571 Expose public api for SE engine that were mistakenly used by improper dependency

Author: alban-auzeill

its/ruling/src/test/resources/commons-beanutils/java-S2259.json

@@ -0,0 +1,5 @@
+{
+"commons-beanutils:commons-beanutils:src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java": [
+540
+]
+}

java-checks-aws/src/main/java/org/sonar/java/checks/aws/AwsConsumerBuilderUsageCheck.java

@@ -23,7 +23,6 @@
 import org.sonar.java.checks.helpers.ExpressionsHelper;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.java.model.ExpressionUtils;
-import org.sonar.java.model.Symbols;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.semantic.Symbol.MethodSymbol;
@@ -49,7 +48,7 @@ protected MethodMatchers getMethodInvocationMatchers() {
   @Override
   protected void onMethodInvocationFound(MethodInvocationTree mit) {
     MethodSymbol methodSymbol = mit.methodSymbol();
-    Symbol parentClass = Optional.ofNullable(methodSymbol.owner()).orElse(Symbols.unknownTypeSymbol);
+    Symbol parentClass = Optional.ofNullable(methodSymbol.owner()).orElse(Symbol.TypeSymbol.UNKNOWN_TYPE);
     Symbol.TypeSymbol returnType = methodSymbol.returnType();
     if (!returnType.isUnknown() && "Builder".equals(parentClass.name())) {
       String returnTypeName = returnType.type().fullyQualifiedName();

java-checks/src/main/java/org/sonar/java/checks/CollectionInappropriateCallsCheck.java

@@ -23,7 +23,6 @@
 import java.util.stream.Collectors;
 import org.sonar.check.Rule;
 import org.sonar.java.model.ExpressionUtils;
-import org.sonar.java.model.Symbols;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;
@@ -144,7 +143,7 @@ private static Type getTypeArgumentAt(Type type, int index) {
         return parameters.get(index);
       }
     }
-    return Symbols.unknownType;
+    return Type.UNKNOWN;
   }
 
   private static Type findSuperTypeMatching(Type type, String genericTypeName) {
@@ -155,7 +154,7 @@ private static Type findSuperTypeMatching(Type type, String genericTypeName) {
       .stream()
       .filter(superType -> superType.is(genericTypeName))
       .findFirst()
-      .orElse(Symbols.unknownType);
+      .orElse(Type.UNKNOWN);
   }
 
   private static boolean isArgumentCompatible(Type argumentType, Type collectionParameterType) {

java-checks/src/main/java/org/sonar/java/checks/security/CipherBlockChainingCheck.java

@@ -20,7 +20,6 @@
 import org.sonar.check.Rule;
 import org.sonar.java.checks.methods.AbstractMethodDetection;
 import org.sonar.java.model.ExpressionUtils;
-import org.sonar.java.model.Symbols;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.semantic.Symbol;
 import org.sonar.plugins.java.api.tree.AssignmentExpressionTree;
@@ -183,7 +182,7 @@ private static Symbol symbol(ExpressionTree expression) {
       if (expression.is(Tree.Kind.MEMBER_SELECT)) {
         return ((MemberSelectExpressionTree) expression).identifier().symbol();
       }
-      return Symbols.unknownSymbol;
+      return Symbol.UNKNOWN_SYMBOL;
     }
 
     private static Symbol ivSymbol(NewClassTree newClassTree) {
@@ -194,7 +193,7 @@ private static Symbol ivSymbol(NewClassTree newClassTree) {
       if (parent.is(Tree.Kind.ASSIGNMENT)) {
         return symbol(((AssignmentExpressionTree) parent).variable());
       }
-      return Symbols.unknownSymbol;
+      return Symbol.UNKNOWN_SYMBOL;
     }
   }
 }

java-checks/src/main/java/org/sonar/java/checks/tests/AssertionTypesCheck.java

@@ -23,7 +23,6 @@
 import org.sonar.java.checks.helpers.MethodTreeUtils;
 import org.sonar.java.checks.helpers.UnitTestUtils;
 import org.sonar.java.model.ExpressionUtils;
-import org.sonar.java.model.Symbols;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.JavaFileScannerContext;
 import org.sonar.plugins.java.api.semantic.MethodMatchers;
@@ -353,11 +352,11 @@ boolean isPrimitive() {
 
     static Type expectedArgumentType(MethodInvocationTree mit, int argumentIndex) {
       if (mit.methodSymbol().isUnknown()) {
-        return Symbols.unknownType;
+        return Type.UNKNOWN;
       }
       List<Type> parameterTypes = mit.methodSymbol().parameterTypes();
       if (argumentIndex >= parameterTypes.size()) {
-        return Symbols.unknownType;
+        return Type.UNKNOWN;
       }
       return parameterTypes.get(argumentIndex).erasure();
     }

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

@@ -32,7 +32,7 @@ public abstract class AbstractTypedTree extends JavaTree {
   public Type symbolType() {
     return typeBinding != null
       ? root.sema.type(typeBinding)
-      : Symbols.unknownType;
+      : Type.UNKNOWN;
   }
 
 }

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

@@ -55,7 +55,7 @@ public List<Symbol> declarationParameters() {
 
   @Override
   public Symbol.TypeSymbol returnType() {
-    return Symbols.unknownTypeSymbol;
+    return TypeSymbol.UNKNOWN_TYPE;
   }
 
   @Override
@@ -75,7 +75,7 @@ public Symbol owner() {
 
   @Override
   public Type type() {
-    return Symbols.unknownType;
+    return Type.UNKNOWN;
   }
 
   @Override

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

@@ -58,7 +58,7 @@ public Symbol owner() {
 
   @Override
   public Type type() {
-    return Symbols.unknownType;
+    return Type.UNKNOWN;
   }
 
   @Override

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

@@ -114,7 +114,7 @@ public TypeSymbol returnType() {
       ITypeBinding methodBindingReturnType = methodBinding().getReturnType();
       // In rare circumstances, when the semantic information is incomplete, methodBindingReturnType can be null.
       if (methodBindingReturnType == null) {
-        return Symbols.unknownTypeSymbol;
+        return TypeSymbol.UNKNOWN_TYPE;
       }
       this.returnType = sema.typeSymbol(methodBindingReturnType);
     }

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

@@ -72,7 +72,7 @@ List<Type> types(ITypeBinding[] typeBindings) {
 
   public Symbol packageSymbol(@Nullable IPackageBinding packageBinding) {
     if (packageBinding == null) {
-      return Symbols.rootPackage;
+      return Symbol.ROOT_PACKAGE;
     }
     return symbols.computeIfAbsent(packageBinding, k -> new JPackageSymbol(this, (IPackageBinding) k));
   }
@@ -119,7 +119,7 @@ static IBinding declarationBinding(IBinding binding) {
   public Type getClassType(String fullyQualifiedName) {
     return nameToTypeCache.computeIfAbsent(fullyQualifiedName, t -> {
       ITypeBinding typeBinding = resolveType(t);
-      return typeBinding != null ? type(typeBinding) : Symbols.unknownType;
+      return typeBinding != null ? type(typeBinding) : Type.UNKNOWN;
     });
   }