diff --git a/java-checks/src/test/java/org/sonar/java/checks/DeadStoreCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/DeadStoreCheckTest.java index a539841b022..5b8121a0fe1 100644 --- a/java-checks/src/test/java/org/sonar/java/checks/DeadStoreCheckTest.java +++ b/java-checks/src/test/java/org/sonar/java/checks/DeadStoreCheckTest.java @@ -20,6 +20,7 @@ import org.sonar.java.checks.verifier.CheckVerifier; import org.sonar.java.checks.verifier.TestUtils; import org.sonar.java.model.declaration.VariableTreeImpl; +import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.BaseTreeVisitor; import org.sonar.plugins.java.api.tree.VariableTree; @@ -64,7 +65,7 @@ private static class EraseSymbols extends BaseTreeVisitor { @Override public void visitVariable(VariableTree tree) { if (tree instanceof VariableTreeImpl varImpl) { - varImpl.variableBinding = null; + varImpl.setSymbol(Symbol.UNKNOWN_SYMBOL); } super.visitVariable(tree); } diff --git a/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java b/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java index 09c44fc0ac2..4e001d09122 100644 --- a/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java +++ b/java-frontend/src/main/java/org/sonar/java/JavaFrontend.java @@ -250,7 +250,7 @@ private static void scanAsBatchCallback(InputFile inputFile, JParserConfig.Resul Duration duration = PerformanceMeasure.start(context.descriptor(inputFile)); scanner.simpleScan(inputFile, result, ast -> // In batch mode, we delay the cleaning of the environment as it will be used in later processing. - environmentsCleaners.add(ast.sema.getEnvironmentCleaner()) + environmentsCleaners.add(ast.getEnvironmentCleaner()) ); duration.stop(); } diff --git a/java-frontend/src/main/java/org/sonar/java/ast/JavaAstScanner.java b/java-frontend/src/main/java/org/sonar/java/ast/JavaAstScanner.java index fcd39ab2a21..5674d4f34ed 100644 --- a/java-frontend/src/main/java/org/sonar/java/ast/JavaAstScanner.java +++ b/java-frontend/src/main/java/org/sonar/java/ast/JavaAstScanner.java @@ -102,7 +102,6 @@ public void scanForTesting(Iterable inputFiles, Consumer inputFiles, Consumer modifyCompilationUnit) { List filesNames = filterModuleInfo(inputFiles).toList(); AnalysisProgress analysisProgress = new AnalysisProgress(filesNames.size()); @@ -166,7 +165,7 @@ public void simpleScan(InputFile inputFile, JParserConfig.Result result, Consume modifyCompilationUnit.accept(ast); visitor.visitFile(ast, sonarComponents != null && sonarComponents.fileCanBeSkipped(inputFile)); String path = inputFile.toString(); - Set undefinedTypes = ast.sema.undefinedTypes(); + Set undefinedTypes = ast.undefinedTypes(); collectUndefinedTypes(path, undefinedTypes); cleanUp.accept(ast); telemetryAnalysisKeys = javaAnalysisKeys.success(); @@ -196,7 +195,7 @@ public void simpleScan(InputFile inputFile, JParserConfig.Result result, Consume private static void cleanUpAst(JavaTree.CompilationUnitTreeImpl ast) { // release environment used for semantic resolution - ast.sema.getEnvironmentCleaner().run(); + ast.getEnvironmentCleaner().run(); } private void collectUndefinedTypes(String path, Set undefinedTypes) { diff --git a/java-frontend/src/main/java/org/sonar/java/model/AbstractTypedTree.java b/java-frontend/src/main/java/org/sonar/java/model/AbstractTypedTree.java index f2d6def6b5e..e9945b8a8f2 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/AbstractTypedTree.java +++ b/java-frontend/src/main/java/org/sonar/java/model/AbstractTypedTree.java @@ -16,23 +16,22 @@ */ package org.sonar.java.model; -import org.eclipse.jdt.core.dom.ITypeBinding; +import java.util.Objects; import org.sonar.plugins.java.api.semantic.Type; -import javax.annotation.Nullable; - /** * 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; + private Type symbolType = Type.UNKNOWN; + + public void setSymbolType(Type symbolType) { + this.symbolType = Objects.requireNonNull(symbolType); + } public Type symbolType() { - return typeBinding != null - ? root.sema.type(typeBinding) - : Type.UNKNOWN; + return symbolType; } } diff --git a/java-frontend/src/main/java/org/sonar/java/model/JParser.java b/java-frontend/src/main/java/org/sonar/java/model/JParser.java index e58aeb7f024..911c60bc7d6 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/JParser.java +++ b/java-frontend/src/main/java/org/sonar/java/model/JParser.java @@ -312,13 +312,12 @@ static JavaTree.CompilationUnitTreeImpl convert(String version, String unitName, JParser converter = new JParser(); converter.sema = new JSema(astNode.getAST()); - converter.sema.undefinedTypes.addAll(undefinedTypes); converter.compilationUnit = astNode; converter.tokenManager = createTokenManager(version, unitName, source); converter.lineColumnConverter = lineColumnConverter; JavaTree.CompilationUnitTreeImpl tree = converter.convertCompilationUnit(astNode); - tree.sema = converter.sema; + tree.setSemanticModel(converter.sema, undefinedTypes, converter.sema.getEnvironmentCleaner()); JWarning.Mapper.warningsFor(astNode, converter.lineColumnConverter).mappedInto(tree); ASTUtils.mayTolerateMissingType(astNode.getAST()); @@ -598,7 +597,7 @@ private JavaTree.CompilationUnitTreeImpl convertCompilationUnit(CompilationUnit if (!isModuleImport) { // There is no method to resolve bindings for a module import. - t.binding = e2.resolveBinding(); + t.setSymbol(sema.importSymbolOrUnknown(e2.resolveBinding())); } imports.add(t); @@ -776,8 +775,9 @@ private ClassTreeImpl convertUnnamedClassDeclaration(AbstractTypeDeclaration e) ClassTreeImpl t = new ClassTreeImpl(Tree.Kind.IMPLICIT_CLASS, null, members, null); - t.typeBinding = e.resolveBinding(); - declaration(t.typeBinding, t); + ITypeBinding binding = e.resolveBinding(); + t.setSymbol(sema.typeSymbolOrUnknown(binding)); + declaration(binding, t); return t; } @@ -823,8 +823,9 @@ private ClassTreeImpl convertTypeDeclaration(AbstractTypeDeclaration e) { // no-op for annotation-types completeSuperInterfaces(e, t); - t.typeBinding = e.resolveBinding(); - declaration(t.typeBinding, t); + ITypeBinding binding = e.resolveBinding(); + t.setSymbol(sema.typeSymbolOrUnknown(binding)); + declaration(binding, t); return t; } @@ -995,8 +996,9 @@ private EnumConstantTreeImpl processEnumConstantDeclaration(EnumConstantDeclarat members, lastTokenIn(e.getAnonymousClassDeclaration(), TerminalToken.TokenNameRBRACE) ); - classBody.typeBinding = e.getAnonymousClassDeclaration().resolveBinding(); - declaration(classBody.typeBinding, classBody); + ITypeBinding binding = e.getAnonymousClassDeclaration().resolveBinding(); + classBody.setSymbol(sema.typeSymbolOrUnknown(binding)); + declaration(binding, classBody); } final int separatorTokenIndex = firstTokenIndexAfter(e); @@ -1014,12 +1016,14 @@ private EnumConstantTreeImpl processEnumConstantDeclaration(EnumConstantDeclarat } IdentifierTreeImpl identifier = createSimpleName(e.getName()); + IMethodBinding constructorBinding; if (e.getAnonymousClassDeclaration() == null) { - identifier.binding = excludeRecovery(e.resolveConstructorBinding(), arguments.size()); + constructorBinding = excludeRecovery(e.resolveConstructorBinding(), arguments.size()); } else { - identifier.binding = findConstructorForAnonymousClass(e.getAST(), identifier.typeBinding, e.resolveConstructorBinding()); + constructorBinding = findConstructorForAnonymousClass(e.getAST(), e.getName().resolveTypeBinding(), e.resolveConstructorBinding()); } - usage(identifier.binding, identifier); + identifier.setSymbol(sema.symbolOrUnknown(constructorBinding)); + usage(constructorBinding, identifier); EnumConstantTreeImpl t = new EnumConstantTreeImpl( convertModifiers(e.modifiers()), @@ -1027,8 +1031,9 @@ private EnumConstantTreeImpl processEnumConstantDeclaration(EnumConstantDeclarat new NewClassTreeImpl(identifier, arguments, classBody), separatorToken ); - t.variableBinding = e.resolveVariable(); - declaration(t.variableBinding, t); + IVariableBinding binding = e.resolveVariable(); + t.setSymbol(sema.variableSymbolOrUnknown(binding)); + declaration(binding, t); return t; } @@ -1080,8 +1085,9 @@ private int processAnnotationTypeMemberDeclaration(AnnotationTypeMemberDeclarati .complete(convertType(e.getType()), createSimpleName(e.getName()), lastTokenIn(e, TerminalToken.TokenNameSEMICOLON)) .completeWithModifiers(convertModifiers(e.modifiers())); - t.methodBinding = e.resolveBinding(); - declaration(t.methodBinding, t); + IMethodBinding binding = e.resolveBinding(); + t.setSymbol(sema.methodSymbolOrUnknown(binding)); + declaration(binding, t); members.add(t); return tokenManager.lastIndexIn(e, TerminalToken.TokenNameSEMICOLON); @@ -1135,7 +1141,7 @@ private int processMethodDeclaration(MethodDeclaration e, List members) { InternalSyntaxToken throwsToken = tt.isEmpty() ? null : firstTokenBefore((Type) tt.get(0), TerminalToken.TokenNamethrows); InternalSyntaxToken semcolonToken = body == null ? lastTokenIn(e, TerminalToken.TokenNameSEMICOLON) : null; MethodTreeImpl t = new MethodTreeImpl( - returnType == null ? null : applyExtraDimensions(convertType(returnType), e.extraDimensions()), + returnType == null ? null : applyExtraDimensions(convertType(returnType), e.extraDimensions(), returnType.resolveBinding()), createSimpleName(e.getName()), formalParameters, throwsToken, @@ -1147,8 +1153,9 @@ private int processMethodDeclaration(MethodDeclaration e, List members) { ).completeWithTypeParameters( convertTypeParameters(e.typeParameters()) ); - t.methodBinding = e.resolveBinding(); - declaration(t.methodBinding, t); + IMethodBinding binding = e.resolveBinding(); + t.setSymbol(sema.methodSymbolOrUnknown(binding)); + declaration(binding, t); members.add(t); return tokenManager.lastIndexIn(e, body == null ? TerminalToken.TokenNameSEMICOLON : TerminalToken.TokenNameRBRACE); @@ -1161,15 +1168,16 @@ private int processFieldDeclaration(FieldDeclaration fieldDeclaration, List extraDimensions) { - ITypeBinding typeBinding = ((AbstractTypedTree) type).typeBinding; + private TypeTree applyExtraDimensions(TypeTree type, List extraDimensions, @Nullable ITypeBinding typeBinding) { for (int i = 0; i < extraDimensions.size(); i++) { Dimension e = (Dimension) extraDimensions.get(i); type = new JavaTree.ArrayTypeTreeImpl( @@ -1283,7 +1290,7 @@ private TypeTree applyExtraDimensions(TypeTree type, List extraDimensions) { firstTokenIn(e, TerminalToken.TokenNameRBRACKET) ); if (typeBinding != null) { - ((JavaTree.ArrayTypeTreeImpl) type).typeBinding = typeBinding.createArrayType(i + 1); + ((JavaTree.ArrayTypeTreeImpl) type).setSymbolType(sema.typeOrUnknown(typeBinding.createArrayType(i + 1))); } } return type; @@ -1310,16 +1317,19 @@ private VariableTreeImpl convertVariable(VariableDeclarationFragment declaration private VariableTreeImpl convertVariable(SingleVariableDeclaration e) { // TODO are extraDimensions and varargs mutually exclusive? TypeTree type = convertType(e.getType()); - type = applyExtraDimensions(type, e.extraDimensions()); + ITypeBinding typeBinding = e.getType().resolveBinding(); + type = applyExtraDimensions(type, e.extraDimensions(), typeBinding); + if (typeBinding != null && !e.extraDimensions().isEmpty()) { + typeBinding = typeBinding.createArrayType(e.extraDimensions().size()); + } if (e.isVarargs()) { - ITypeBinding typeBinding = ((AbstractTypedTree) type).typeBinding; type = new JavaTree.ArrayTypeTreeImpl( type, (List) convertAnnotations(e.varargsAnnotations()), firstTokenAfter(e.getType(), TerminalToken.TokenNameELLIPSIS) ); if (typeBinding != null) { - ((JavaTree.ArrayTypeTreeImpl) type).typeBinding = typeBinding.createArrayType(1); + ((JavaTree.ArrayTypeTreeImpl) type).setSymbolType(sema.typeOrUnknown(typeBinding.createArrayType(1))); } } @@ -1339,12 +1349,13 @@ private VariableTreeImpl completeInitializerAndBinding(VariableTreeImpl t, Varia convertExpression(e.getInitializer()) ); } - t.variableBinding = e.resolveBinding(); - if (t.variableBinding != null) { + IVariableBinding binding = e.resolveBinding(); + t.setSymbol(sema.variableSymbolOrUnknown(binding)); + if (binding != null) { if (t.type() instanceof InferedTypeTree inferredType) { - inferredType.typeBinding = t.variableBinding.getType(); + inferredType.setSymbolType(sema.typeOrUnknown(binding.getType())); } - declaration(t.variableBinding, t); + declaration(binding, t); } return t; } @@ -1358,10 +1369,10 @@ private void addVariableToList(VariableDeclarationExpression e2, List list) { VariableTreeImpl t = new VariableTreeImpl(createSimpleName(fragment.getName())); t.completeModifiers(modifiers); if (fragment.getInitializer() == null) { - t.completeType(applyExtraDimensions(type, fragment.extraDimensions())); + t.completeType(applyExtraDimensions(type, fragment.extraDimensions(), e2.getType().resolveBinding())); } else { t.completeTypeAndInitializer( - applyExtraDimensions(type, fragment.extraDimensions()), + applyExtraDimensions(type, fragment.extraDimensions(), e2.getType().resolveBinding()), firstTokenBefore(fragment.getInitializer(), TerminalToken.TokenNameEQUAL), convertExpression(fragment.getInitializer()) ); @@ -1369,15 +1380,16 @@ private void addVariableToList(VariableDeclarationExpression e2, List list) { if (i < e2.fragments().size() - 1) { t.setEndToken(firstTokenAfter(fragment, TerminalToken.TokenNameCOMMA)); } - t.variableBinding = fragment.resolveBinding(); - declaration(t.variableBinding, t); + IVariableBinding binding = fragment.resolveBinding(); + t.setSymbol(sema.variableSymbolOrUnknown(binding)); + declaration(binding, t); list.add(t); } } private VarTypeTreeImpl convertVarType(SimpleType simpleType) { VarTypeTreeImpl varTree = new VarTypeTreeImpl(firstTokenIn(simpleType.getName(), TerminalToken.TokenNameIdentifier)); - varTree.typeBinding = simpleType.resolveBinding(); + varTree.setSymbolType(sema.typeOrUnknown(simpleType.resolveBinding())); return varTree; } @@ -1386,8 +1398,8 @@ private IdentifierTreeImpl createSimpleName(SimpleName e) { Token token = tokenManager.get(tokenIndex); boolean isUnnamedVariable = token.tokenType == TerminalToken.TokenNameUNDERSCORE; IdentifierTreeImpl t = new IdentifierTreeImpl(createSyntaxToken(tokenIndex), isUnnamedVariable); - t.typeBinding = e.resolveTypeBinding(); - t.binding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveTypeBinding())); + t.setSymbol(sema.symbolOrUnknown(e.resolveBinding())); return t; } @@ -1411,7 +1423,7 @@ private void addStatementToList(Statement node, List statements) for (int i = 0; i < e.fragments().size(); i++) { VariableDeclarationFragment fragment = (VariableDeclarationFragment) e.fragments().get(i); VariableTreeImpl t = new VariableTreeImpl(createSimpleName(fragment.getName())) - .completeType(applyExtraDimensions(tType, fragment.extraDimensions())) + .completeType(applyExtraDimensions(tType, fragment.extraDimensions(), e.getType().resolveBinding())) .completeModifiers(modifiers); Expression initalizer = fragment.getInitializer(); if (initalizer != null) { @@ -1421,8 +1433,9 @@ private void addStatementToList(Statement node, List statements) TerminalToken endTokenType = i < e.fragments().size() - 1 ? TerminalToken.TokenNameCOMMA : TerminalToken.TokenNameSEMICOLON; t.setEndToken(firstTokenAfter(fragment, endTokenType)); - t.variableBinding = fragment.resolveBinding(); - declaration(t.variableBinding, t); + IVariableBinding binding = fragment.resolveBinding(); + t.setSymbol(sema.variableSymbolOrUnknown(binding)); + declaration(binding, t); statements.add(t); } } else { @@ -1650,7 +1663,7 @@ private List convertSwitchStatements(List list) { private ExpressionTree convertExpressionFromCase(Expression e) { if (e.getNodeType() == ASTNode.CASE_DEFAULT_EXPRESSION) { - return new DefaultPatternTreeImpl(firstTokenIn(e, TerminalToken.TokenNamedefault), e.resolveTypeBinding()); + return new DefaultPatternTreeImpl(firstTokenIn(e, TerminalToken.TokenNamedefault), sema.typeOrUnknown(e.resolveTypeBinding())); } if (e.getNodeType() == ASTNode.NULL_LITERAL) { return new NullPatternTreeImpl((LiteralTreeImpl) convertExpression(e)); @@ -1665,7 +1678,7 @@ private PatternTree convertPattern(Pattern p) { switch (p.getNodeType()) { case ASTNode.TYPE_PATTERN: TypePattern typePattern = (TypePattern) p; - return new TypePatternTreeImpl(convertVariable(typePattern), typePattern.resolveTypeBinding()); + return new TypePatternTreeImpl(convertVariable(typePattern), sema.typeOrUnknown(typePattern.resolveTypeBinding())); case ASTNode.RECORD_PATTERN: RecordPattern recordPattern = (RecordPattern) p; List nestedPatterns = recordPattern.patterns().stream() @@ -1682,7 +1695,7 @@ private PatternTree convertPattern(Pattern p) { convertPattern(g.getPattern()), firstTokenBefore(g.getExpression(), TerminalToken.TokenNameRestrictedIdentifierWhen), convertExpression(g.getExpression()), - g.resolveTypeBinding()); + sema.typeOrUnknown(g.resolveTypeBinding())); case ASTNode.NULL_PATTERN: // It is not clear how to reach this one, it seems to be possible only with badly constructed AST // fall-through. Do nothing for now. @@ -1843,13 +1856,14 @@ private ExpressionStatementTreeImpl convertConstructorInvocation(ConstructorInvo convertTypeArguments(e.typeArguments()), arguments ); - t.methodBinding = e.resolveConstructorBinding(); - if (t.methodBinding != null) { - t.typeBinding = t.methodBinding.getDeclaringClass(); - t.methodBinding = excludeRecovery(t.methodBinding, arguments.size()); - } - i.binding = t.methodBinding; - usage(i.binding, i); + IMethodBinding binding = e.resolveConstructorBinding(); + if (binding != null) { + t.setSymbolType(sema.typeOrUnknown(binding.getDeclaringClass())); + binding = excludeRecovery(binding, arguments.size()); + } + t.setMethodSymbol(sema.methodSymbolOrUnknown(binding)); + i.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, i); return new ExpressionStatementTreeImpl( t, lastTokenIn(e, TerminalToken.TokenNameSEMICOLON) @@ -1878,13 +1892,14 @@ private ExpressionStatementTreeImpl convertSuperConstructorInvocation(SuperConst convertTypeArguments(e.typeArguments()), arguments ); - t.methodBinding = e.resolveConstructorBinding(); - if (t.methodBinding != null) { - t.typeBinding = t.methodBinding.getDeclaringClass(); - t.methodBinding = excludeRecovery(t.methodBinding, arguments.size()); - } - i.binding = t.methodBinding; - usage(i.binding, i); + IMethodBinding binding = e.resolveConstructorBinding(); + if (binding != null) { + t.setSymbolType(sema.typeOrUnknown(binding.getDeclaringClass())); + binding = excludeRecovery(binding, arguments.size()); + } + t.setMethodSymbol(sema.methodSymbolOrUnknown(binding)); + i.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, i); return new ExpressionStatementTreeImpl( t, lastTokenIn(e, TerminalToken.TokenNameSEMICOLON) @@ -1905,7 +1920,7 @@ private YieldStatementTreeImpl convertYield(YieldStatement e) { private ExpressionTree convertExpression(Expression node) { ExpressionTree t = createExpression(node); - ((AbstractTypedTree) t).typeBinding = node.resolveTypeBinding(); + ((AbstractTypedTree) t).setSymbolType(sema.typeOrUnknown(node.resolveTypeBinding())); return t; } @@ -1988,13 +2003,13 @@ private ExpressionTree createExpression(Expression node) { private IdentifierTreeImpl convertSimpleName(SimpleName e) { IdentifierTreeImpl t = createSimpleName(e); - usage(t.binding, t); + usage(e.resolveBinding(), t); return t; } private MemberSelectExpressionTreeImpl convertQualifiedName(QualifiedName e) { IdentifierTreeImpl rhs = createSimpleName(e.getName()); - usage(rhs.binding, rhs); + usage(e.getName().resolveBinding(), rhs); return new MemberSelectExpressionTreeImpl( convertExpression(e.getQualifier()), firstTokenAfter(e.getQualifier(), TerminalToken.TokenNameDOT), @@ -2004,7 +2019,7 @@ private MemberSelectExpressionTreeImpl convertQualifiedName(QualifiedName e) { private MemberSelectExpressionTreeImpl convertFieldAccess(FieldAccess e) { IdentifierTreeImpl rhs = createSimpleName(e.getName()); - usage(rhs.binding, rhs); + usage(e.getName().resolveBinding(), rhs); return new MemberSelectExpressionTreeImpl( convertExpression(e.getExpression()), firstTokenAfter(e.getExpression(), TerminalToken.TokenNameDOT), @@ -2014,7 +2029,7 @@ private MemberSelectExpressionTreeImpl convertFieldAccess(FieldAccess e) { private MemberSelectExpressionTreeImpl convertFieldAccess(SuperFieldAccess e) { IdentifierTreeImpl rhs = createSimpleName(e.getName()); - usage(rhs.binding, rhs); + usage(e.getName().resolveBinding(), rhs); if (e.getQualifier() == null) { // super.name return new MemberSelectExpressionTreeImpl( @@ -2025,15 +2040,15 @@ private MemberSelectExpressionTreeImpl convertFieldAccess(SuperFieldAccess e) { } // qualifier.super.name AbstractTypedTree qualifier = (AbstractTypedTree) convertExpression(e.getQualifier()); - KeywordSuper keywordSuper = new KeywordSuper(firstTokenAfter(e.getQualifier(), TerminalToken.TokenNamesuper), null); + ITypeBinding qualifierBinding = e.getQualifier().resolveTypeBinding(); + KeywordSuper keywordSuper = new KeywordSuper(firstTokenAfter(e.getQualifier(), TerminalToken.TokenNamesuper), sema.superSymbolOrUnknown(qualifierBinding)); MemberSelectExpressionTreeImpl qualifiedSuper = new MemberSelectExpressionTreeImpl( (ExpressionTree) qualifier, firstTokenAfter(e.getQualifier(), TerminalToken.TokenNameDOT), keywordSuper ); - if (qualifier.typeBinding != null) { - keywordSuper.typeBinding = qualifier.typeBinding; - qualifiedSuper.typeBinding = keywordSuper.typeBinding.getSuperclass(); + if (qualifierBinding != null) { + qualifiedSuper.setSymbolType(sema.typeOrUnknown(qualifierBinding.getSuperclass())); } return new MemberSelectExpressionTreeImpl( qualifiedSuper, @@ -2044,12 +2059,13 @@ private MemberSelectExpressionTreeImpl convertFieldAccess(SuperFieldAccess e) { private ExpressionTree convertThisExpression(ThisExpression e) { if (e.getQualifier() == null) { - return new KeywordThis(firstTokenIn(e, TerminalToken.TokenNamethis), null); + return new KeywordThis(firstTokenIn(e, TerminalToken.TokenNamethis), sema.thisSymbolOrUnknown(e.resolveTypeBinding())); } KeywordThis keywordThis = new KeywordThis( firstTokenAfter(e.getQualifier(), TerminalToken.TokenNamethis), - e.resolveTypeBinding() + sema.thisSymbolOrUnknown(e.resolveTypeBinding()) ); + keywordThis.setSymbolType(sema.typeOrUnknown(e.resolveTypeBinding())); return new MemberSelectExpressionTreeImpl( convertExpression(e.getQualifier()), firstTokenAfter(e.getQualifier(), TerminalToken.TokenNameDOT), @@ -2200,8 +2216,9 @@ private NewClassTreeImpl convertClassInstanceCreation(ClassInstanceCreation e) { members, lastTokenIn(e.getAnonymousClassDeclaration(), TerminalToken.TokenNameRBRACE) ); - classBody.typeBinding = e.getAnonymousClassDeclaration().resolveBinding(); - declaration(classBody.typeBinding, classBody); + ITypeBinding binding = e.getAnonymousClassDeclaration().resolveBinding(); + classBody.setSymbol(sema.typeSymbolOrUnknown(binding)); + declaration(binding, classBody); } NewClassTreeImpl t = new NewClassTreeImpl( @@ -2220,12 +2237,15 @@ private NewClassTreeImpl convertClassInstanceCreation(ClassInstanceCreation e) { IdentifierTreeImpl i = (IdentifierTreeImpl) t.getConstructorIdentifier(); int nbArguments = arguments.size(); + IMethodBinding binding; if (e.getAnonymousClassDeclaration() == null) { - i.binding = excludeRecovery(e.resolveConstructorBinding(), nbArguments); + binding = excludeRecovery(e.resolveConstructorBinding(), nbArguments); } else { - i.binding = excludeRecovery(findConstructorForAnonymousClass(e.getAST(), i.typeBinding, e.resolveConstructorBinding()), nbArguments); + Type constructorType = e.getType() instanceof ParameterizedType parameterizedType ? parameterizedType.getType() : e.getType(); + binding = excludeRecovery(findConstructorForAnonymousClass(e.getAST(), constructorType.resolveBinding(), e.resolveConstructorBinding()), nbArguments); } - usage(i.binding, i); + i.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, i); return t; } @@ -2250,7 +2270,7 @@ private BinaryExpressionTreeImpl convertInfixExpression(InfixExpression e) { ); for (Object o : e.extendedOperands()) { Expression e2 = (Expression) o; - t.typeBinding = e.resolveTypeBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveTypeBinding())); t = new BinaryExpressionTreeImpl( op.kind, t, @@ -2284,9 +2304,10 @@ private MethodInvocationTreeImpl convertMethodInvocation(MethodInvocation e) { convertTypeArguments(e.typeArguments()), arguments ); - t.methodBinding = excludeRecovery(e.resolveMethodBinding(), arguments.size()); - rhs.binding = t.methodBinding; - usage(rhs.binding, rhs); + IMethodBinding binding = excludeRecovery(e.resolveMethodBinding(), arguments.size()); + t.setMethodSymbol(sema.methodSymbolOrUnknown(binding)); + rhs.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, rhs); return t; } @@ -2309,15 +2330,15 @@ private MethodInvocationTreeImpl convertMethodInvocation(SuperMethodInvocation e } else { final int firstDotTokenIndex = tokenManager.firstIndexAfter(e.getQualifier(), TerminalToken.TokenNameDOT); AbstractTypedTree qualifier = (AbstractTypedTree) convertExpression(e.getQualifier()); - KeywordSuper keywordSuper = new KeywordSuper(firstTokenAfter(e.getQualifier(), TerminalToken.TokenNamesuper), null); + ITypeBinding qualifierBinding = e.getQualifier().resolveTypeBinding(); + KeywordSuper keywordSuper = new KeywordSuper(firstTokenAfter(e.getQualifier(), TerminalToken.TokenNamesuper), sema.superSymbolOrUnknown(qualifierBinding)); MemberSelectExpressionTreeImpl qualifiedSuper = new MemberSelectExpressionTreeImpl( (ExpressionTree) qualifier, createSyntaxToken(firstDotTokenIndex), keywordSuper ); - if (qualifier.typeBinding != null) { - keywordSuper.typeBinding = qualifier.typeBinding; - qualifiedSuper.typeBinding = keywordSuper.typeBinding.getSuperclass(); + if (qualifierBinding != null) { + qualifiedSuper.setSymbolType(sema.typeOrUnknown(qualifierBinding.getSuperclass())); } outermostSelect = new MemberSelectExpressionTreeImpl( qualifiedSuper, @@ -2331,9 +2352,10 @@ private MethodInvocationTreeImpl convertMethodInvocation(SuperMethodInvocation e null, arguments ); - t.methodBinding = excludeRecovery(e.resolveMethodBinding(), arguments.size()); - rhs.binding = t.methodBinding; - usage(rhs.binding, rhs); + IMethodBinding binding = excludeRecovery(e.resolveMethodBinding(), arguments.size()); + t.setMethodSymbol(sema.methodSymbolOrUnknown(binding)); + rhs.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, rhs); return t; } @@ -2384,9 +2406,9 @@ private LambdaExpressionTreeImpl convertLambdaExpression(LambdaExpression e) { t = new VariableTreeImpl(createSimpleName(o.getName())); IVariableBinding variableBinding = o.resolveBinding(); if (variableBinding != null) { - t.variableBinding = variableBinding; - ((InferedTypeTree) t.type()).typeBinding = variableBinding.getType(); - declaration(t.variableBinding, t); + t.setSymbol(sema.variableSymbolOrUnknown(variableBinding)); + ((InferedTypeTree) t.type()).setSymbolType(sema.typeOrUnknown(variableBinding.getType())); + declaration(variableBinding, t); } } else { t = convertVariable((SingleVariableDeclaration) o); @@ -2404,7 +2426,7 @@ private LambdaExpressionTreeImpl convertLambdaExpression(LambdaExpression e) { firstTokenBefore(body, TerminalToken.TokenNameARROW), body.getNodeType() == ASTNode.BLOCK ? convertBlock((Block) body) : convertExpression((Expression) body) ); - tree.methodBinding = e.resolveMethodBinding(); + tree.setSymbol(sema.methodSymbolOrUnknown(e.resolveMethodBinding())); return tree; } @@ -2414,8 +2436,9 @@ private MethodReferenceTreeImpl convertMethodReference(CreationReference e) { lastTokenIn(e, TerminalToken.TokenNameCOLON_COLON) ); IdentifierTreeImpl i = new IdentifierTreeImpl(lastTokenIn(e, TerminalToken.TokenNamenew)); - i.binding = e.resolveMethodBinding(); - usage(i.binding, i); + IMethodBinding binding = e.resolveMethodBinding(); + i.setSymbol(sema.symbolOrUnknown(binding)); + usage(binding, i); t.complete(convertTypeArguments(e.typeArguments()), i); return t; } @@ -2426,7 +2449,7 @@ private MethodReferenceTreeImpl convertMethodReference(ExpressionMethodReference firstTokenAfter(e.getExpression(), TerminalToken.TokenNameCOLON_COLON) ); IdentifierTreeImpl i = createSimpleName(e.getName()); - usage(i.binding, i); + usage(e.getName().resolveBinding(), i); t.complete(convertTypeArguments(e.typeArguments()), i); return t; } @@ -2437,7 +2460,7 @@ private MethodReferenceTreeImpl convertMethodReference(TypeMethodReference e) { firstTokenAfter(e.getType(), TerminalToken.TokenNameCOLON_COLON) ); IdentifierTreeImpl i = createSimpleName(e.getName()); - usage(i.binding, i); + usage(e.getName().resolveBinding(), i); t.complete(convertTypeArguments(e.typeArguments()), i); return t; } @@ -2460,7 +2483,7 @@ private MethodReferenceTreeImpl convertMethodReference(SuperMethodReference e) { ); } IdentifierTreeImpl i = createSimpleName(e.getName()); - usage(i.binding, i); + usage(e.getName().resolveBinding(), i); t.complete(convertTypeArguments(e.typeArguments()), i); return t; } @@ -2507,7 +2530,7 @@ private ExpressionTree convertLiteral(NumberLiteral e) { default: throw new IllegalStateException(); } - ((LiteralTreeImpl) result).typeBinding = e.resolveTypeBinding(); + ((LiteralTreeImpl) result).setSymbolType(sema.typeOrUnknown(e.resolveTypeBinding())); if (unaryMinus) { return new InternalPrefixUnaryExpression(Tree.Kind.UNARY_MINUS, createSyntaxToken(tokenIndex - 1), result); } @@ -2568,10 +2591,10 @@ private KeywordSuper unqualifiedKeywordSuper(ASTNode node) { InternalSyntaxToken token = firstTokenIn(node, TerminalToken.TokenNamesuper); do { if (node instanceof AbstractTypeDeclaration abstractTypeDeclaration) { - return new KeywordSuper(token, abstractTypeDeclaration.resolveBinding()); + return new KeywordSuper(token, sema.superSymbolOrUnknown(abstractTypeDeclaration.resolveBinding())); } if (node instanceof AnonymousClassDeclaration anonymousClassDeclaration) { - return new KeywordSuper(token, anonymousClassDeclaration.resolveBinding()); + return new KeywordSuper(token, sema.superSymbolOrUnknown(anonymousClassDeclaration.resolveBinding())); } node = node.getParent(); } while (true); @@ -2634,7 +2657,7 @@ private JavaTree.PrimitiveTypeTreeImpl convertPrimitiveType(PrimitiveType e) { throw new IllegalStateException(e.getPrimitiveTypeCode().toString()); } t.complete(convertAnnotations(e.annotations())); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } @@ -2659,7 +2682,7 @@ private JavaTree.UnionTypeTreeImpl convertUnionType(UnionType e) { } } JavaTree.UnionTypeTreeImpl t = new JavaTree.UnionTypeTreeImpl(alternatives); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } @@ -2678,7 +2701,7 @@ private TypeTree convertArrayType(ArrayType e) { createSyntaxToken(nextTokenIndex(tokenIndex, TerminalToken.TokenNameRBRACKET)) ); if (elementTypeBinding != null) { - ((JavaTree.ArrayTypeTreeImpl) t).typeBinding = elementTypeBinding.createArrayType(i + 1); + ((JavaTree.ArrayTypeTreeImpl) t).setSymbolType(sema.typeOrUnknown(elementTypeBinding.createArrayType(i + 1))); } } return t; @@ -2700,7 +2723,7 @@ private JavaTree.ParameterizedTypeTreeImpl convertParameterizedType(Parameterize ) ) ); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } @@ -2711,7 +2734,7 @@ private MemberSelectExpressionTreeImpl convertQualifiedType(QualifiedType e) { createSimpleName(e.getName()) ); ((IdentifierTreeImpl) t.identifier()).complete(convertAnnotations(e.annotations())); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } @@ -2722,7 +2745,7 @@ private MemberSelectExpressionTreeImpl convertNamedQualifiedType(NameQualifiedTy createSimpleName(e.getName()) ); ((IdentifierTreeImpl) t.identifier()).complete(convertAnnotations(e.annotations())); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } @@ -2743,7 +2766,7 @@ private JavaTree.WildcardTreeImpl convertWildcardType(WildcardType e) { ).complete(questionToken); } t.complete(convertAnnotations(e.annotations())); - t.typeBinding = e.resolveBinding(); + t.setSymbolType(sema.typeOrUnknown(e.resolveBinding())); return t; } diff --git a/java-frontend/src/main/java/org/sonar/java/model/JSema.java b/java-frontend/src/main/java/org/sonar/java/model/JSema.java index 4045f8d1db5..573ac8400cc 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/JSema.java +++ b/java-frontend/src/main/java/org/sonar/java/model/JSema.java @@ -19,10 +19,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.annotation.Nullable; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTUtils; @@ -41,7 +39,6 @@ public final class JSema implements Sema { private final AST ast; - final Set undefinedTypes = new HashSet<>(); final Map declarations = new HashMap<>(); final Map> usages = new HashMap<>(); private final Map types = new HashMap<>(); @@ -55,6 +52,51 @@ public final class JSema implements Sema { this.ast = ast; } + Type typeOrUnknown(@Nullable ITypeBinding binding) { + return binding == null ? Type.UNKNOWN : type(binding); + } + + Symbol.TypeSymbol typeSymbolOrUnknown(@Nullable ITypeBinding binding) { + return binding == null ? Symbol.TypeSymbol.UNKNOWN_TYPE : typeSymbol(binding); + } + + Symbol.MethodSymbol methodSymbolOrUnknown(@Nullable IMethodBinding binding) { + return binding == null ? Symbol.MethodSymbol.UNKNOWN_METHOD : methodSymbol(binding); + } + + Symbol variableSymbolOrUnknown(@Nullable IVariableBinding binding) { + return binding == null ? Symbol.UNKNOWN_SYMBOL : variableSymbol(binding); + } + + Symbol symbolOrUnknown(@Nullable IBinding binding) { + if (binding == null) { + return Symbol.UNKNOWN_SYMBOL; + } + return switch (binding.getKind()) { + case IBinding.TYPE -> typeSymbol((ITypeBinding) binding); + case IBinding.METHOD -> methodSymbol((IMethodBinding) binding); + case IBinding.VARIABLE -> variableSymbol((IVariableBinding) binding); + case IBinding.PACKAGE -> packageSymbol((IPackageBinding) binding); + default -> Symbol.UNKNOWN_SYMBOL; + }; + } + + @Nullable + Symbol importSymbolOrUnknown(@Nullable IBinding binding) { + if (binding == null || (binding.getKind() != IBinding.TYPE && binding.getKind() != IBinding.METHOD && binding.getKind() != IBinding.VARIABLE)) { + return null; + } + return symbolOrUnknown(binding); + } + + Symbol thisSymbolOrUnknown(@Nullable ITypeBinding binding) { + return binding == null ? Symbol.UNKNOWN_SYMBOL : typeSymbol(binding).thisSymbol; + } + + Symbol superSymbolOrUnknown(@Nullable ITypeBinding binding) { + return binding == null ? Symbol.UNKNOWN_SYMBOL : typeSymbol(binding).superSymbol; + } + public JType type(ITypeBinding typeBinding) { JType cached = types.get(typeBinding); if (cached != null) { @@ -117,7 +159,6 @@ public JInitializerBlockSymbol staticInitializerBlockSymbol(JTypeSymbol owner) { return staticInitializerBlockSymbols.computeIfAbsent(owner, k -> new JInitializerBlockSymbol(k, true)); } - public JVariableSymbol variableSymbol(IVariableBinding variableBinding) { JVariableSymbol cached = (JVariableSymbol) symbols.get(variableBinding); if (cached != null) { @@ -187,7 +228,4 @@ public Runnable getEnvironmentCleaner() { return ASTUtils.getEnvironmentCleaner(ast); } - public Set undefinedTypes() { - return Collections.unmodifiableSet(undefinedTypes); - } } diff --git a/java-frontend/src/main/java/org/sonar/java/model/JSymbol.java b/java-frontend/src/main/java/org/sonar/java/model/JSymbol.java index dcd11673412..d63bd1380e7 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/JSymbol.java +++ b/java-frontend/src/main/java/org/sonar/java/model/JSymbol.java @@ -230,7 +230,7 @@ private Symbol ownerOfRecordComponentConstant(IVariableBinding variableBinding) case CLASS, RECORD, ENUM: - JTypeSymbol typeSymbol = sema.typeSymbol(((ClassTreeImpl) node).typeBinding); + JTypeSymbol typeSymbol = (JTypeSymbol) ((ClassTreeImpl) node).symbol(); if (initializerBlock) { return sema.initializerBlockSymbol(typeSymbol); } @@ -460,7 +460,7 @@ private TypeSymbol variableEnclosingClass(IVariableBinding variableBinding) { ENUM: // variable declaration in a static or instance initializer // or local variable declaration in recovered method - return sema.typeSymbol(((ClassTreeImpl) node).typeBinding); + return ((ClassTreeImpl) node).symbol(); default: // continue exploring parent break; diff --git a/java-frontend/src/main/java/org/sonar/java/model/JavaTree.java b/java-frontend/src/main/java/org/sonar/java/model/JavaTree.java index bf41aee95c2..c59582e94a9 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/JavaTree.java +++ b/java-frontend/src/main/java/org/sonar/java/model/JavaTree.java @@ -27,16 +27,13 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.IBinding; -import org.eclipse.jdt.core.dom.IMethodBinding; -import org.eclipse.jdt.core.dom.ITypeBinding; -import org.eclipse.jdt.core.dom.IVariableBinding; import org.sonar.java.Preconditions; import org.sonar.java.annotations.Beta; import org.sonar.java.ast.parser.QualifiedIdentifierListTreeImpl; import org.sonar.java.model.declaration.AnnotationTreeImpl; import org.sonar.java.model.expression.AssessableExpressionTree; import org.sonar.java.model.expression.TypeArgumentListTreeImpl; +import org.sonar.plugins.java.api.semantic.Sema; import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.AnnotationTree; import org.sonar.plugins.java.api.tree.ArrayTypeTree; @@ -164,7 +161,9 @@ public static class CompilationUnitTreeImpl extends JavaTree implements Compilat @Nullable private final ModuleDeclarationTree moduleDeclaration; private final SyntaxToken eofToken; - public JSema sema; + public Sema sema; + private Set undefinedTypes = Set.of(); + private Runnable environmentCleaner = () -> {}; private final Map> warnings = new EnumMap<>(JProblem.Type.class); @@ -178,6 +177,20 @@ public CompilationUnitTreeImpl(@Nullable PackageDeclarationTree packageDeclarati this.eofToken = eofToken; } + public void setSemanticModel(Sema sema, Set undefinedTypes, Runnable environmentCleaner) { + this.sema = Objects.requireNonNull(sema); + this.undefinedTypes = Set.copyOf(undefinedTypes); + this.environmentCleaner = Objects.requireNonNull(environmentCleaner); + } + + public Set undefinedTypes() { + return undefinedTypes; + } + + public Runnable getEnvironmentCleaner() { + return environmentCleaner; + } + @Override public Kind kind() { return Kind.COMPILATION_UNIT; @@ -326,7 +339,8 @@ public static class ImportTreeImpl extends JavaTree implements ImportTree { @Nullable private final SyntaxToken moduleToken; - public IBinding binding; + @Nullable + private Symbol symbol; public ImportTreeImpl(InternalSyntaxToken importToken, @Nullable InternalSyntaxToken staticToken, @Nullable InternalSyntaxToken moduleToken, @@ -342,17 +356,11 @@ public ImportTreeImpl(InternalSyntaxToken importToken, @Nullable InternalSyntaxT @Nullable public Symbol symbol() { - if (binding != null) { - switch (binding.getKind()) { - case IBinding.TYPE: - return root.sema.typeSymbol((ITypeBinding) binding); - case IBinding.METHOD: - return root.sema.methodSymbol((IMethodBinding) binding); - case IBinding.VARIABLE: - return root.sema.variableSymbol((IVariableBinding) binding); - } - } - return null; + return symbol; + } + + public void setSymbol(@Nullable Symbol symbol) { + this.symbol = symbol; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/KeywordSuper.java b/java-frontend/src/main/java/org/sonar/java/model/KeywordSuper.java index 91ec5318ce1..6bd879ea8cb 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/KeywordSuper.java +++ b/java-frontend/src/main/java/org/sonar/java/model/KeywordSuper.java @@ -16,18 +16,15 @@ */ package org.sonar.java.model; -import org.eclipse.jdt.core.dom.ITypeBinding; import org.sonar.java.model.expression.IdentifierTreeImpl; import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.semantic.Type; -import javax.annotation.Nullable; - final class KeywordSuper extends IdentifierTreeImpl { - KeywordSuper(InternalSyntaxToken token, @Nullable ITypeBinding typeBinding) { + KeywordSuper(InternalSyntaxToken token, Symbol symbol) { super(token); - this.typeBinding = typeBinding; + setSymbol(symbol); } @Override @@ -35,12 +32,4 @@ public Type symbolType() { return symbol().type(); } - @Override - public Symbol symbol() { - if (typeBinding == null) { - return Symbol.UNKNOWN_SYMBOL; - } - return root.sema.typeSymbol(typeBinding).superSymbol; - } - } diff --git a/java-frontend/src/main/java/org/sonar/java/model/KeywordThis.java b/java-frontend/src/main/java/org/sonar/java/model/KeywordThis.java index 8d28995961b..90a35137502 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/KeywordThis.java +++ b/java-frontend/src/main/java/org/sonar/java/model/KeywordThis.java @@ -16,25 +16,14 @@ */ package org.sonar.java.model; -import org.eclipse.jdt.core.dom.ITypeBinding; import org.sonar.java.model.expression.IdentifierTreeImpl; import org.sonar.plugins.java.api.semantic.Symbol; -import javax.annotation.Nullable; - final class KeywordThis extends IdentifierTreeImpl { - KeywordThis(InternalSyntaxToken token, @Nullable ITypeBinding typeBinding) { + KeywordThis(InternalSyntaxToken token, Symbol symbol) { super(token); - this.typeBinding = typeBinding; - } - - @Override - public Symbol symbol() { - if (typeBinding == null) { - return Symbol.UNKNOWN_SYMBOL; - } - return root.sema.typeSymbol(typeBinding).thisSymbol; + setSymbol(symbol); } } diff --git a/java-frontend/src/main/java/org/sonar/java/model/TypeParameterTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/TypeParameterTreeImpl.java index d7814d9242b..bbb9439bcd8 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/TypeParameterTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/TypeParameterTreeImpl.java @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.ITypeBinding; import org.sonar.java.ast.parser.QualifiedIdentifierListTreeImpl; import org.sonar.java.model.expression.IdentifierTreeImpl; import org.sonar.plugins.java.api.semantic.Symbol; @@ -39,8 +39,7 @@ public class TypeParameterTreeImpl extends JavaTree implements TypeParameterTree private final SyntaxToken extendsToken; private final QualifiedIdentifierListTreeImpl bounds; - @Nullable - ITypeBinding typeBinding; + private Symbol symbol = Symbol.UNKNOWN_SYMBOL; public TypeParameterTreeImpl(IdentifierTreeImpl identifier) { this(identifier, null, QualifiedIdentifierListTreeImpl.emptyList()); @@ -89,9 +88,11 @@ public List children() { return Collections.unmodifiableList(list); } + public void setSymbol(Symbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + public Symbol symbol() { - return typeBinding != null - ? root.sema.typeSymbol(typeBinding) - : Symbol.UNKNOWN_SYMBOL; + return symbol; } } diff --git a/java-frontend/src/main/java/org/sonar/java/model/declaration/ClassTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/declaration/ClassTreeImpl.java index aa7ac772899..c85242854f5 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/declaration/ClassTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/declaration/ClassTreeImpl.java @@ -16,10 +16,12 @@ */ package org.sonar.java.model.declaration; -import org.eclipse.jdt.core.dom.ITypeBinding; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; import org.sonar.java.ast.parser.QualifiedIdentifierListTreeImpl; import org.sonar.java.ast.parser.TypeParameterListTreeImpl; -import org.sonarsource.analyzer.commons.collections.ListUtils; import org.sonar.java.model.InternalSyntaxToken; import org.sonar.java.model.JavaTree; import org.sonar.java.model.expression.IdentifierTreeImpl; @@ -35,10 +37,7 @@ import org.sonar.plugins.java.api.tree.TypeParameters; import org.sonar.plugins.java.api.tree.TypeTree; import org.sonar.plugins.java.api.tree.VariableTree; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; +import org.sonarsource.analyzer.commons.collections.ListUtils; public class ClassTreeImpl extends JavaTree implements ClassTree { @@ -68,8 +67,7 @@ public class ClassTreeImpl extends JavaTree implements ClassTree { @Nullable private SyntaxToken permitsKeyword; private ListTree permittedTypes; - @Nullable - public ITypeBinding typeBinding; + private Symbol.TypeSymbol symbol = Symbol.TypeSymbol.UNKNOWN_TYPE; public ClassTreeImpl(Kind kind, @Nullable SyntaxToken openBraceToken, List members, @Nullable SyntaxToken closeBraceToken) { this.kind = kind; @@ -216,11 +214,13 @@ public SyntaxToken closeBraceToken() { return closeBraceToken; } + public void setSymbol(Symbol.TypeSymbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + @Override public Symbol.TypeSymbol symbol() { - return typeBinding != null - ? root.sema.typeSymbol(typeBinding) - : Symbol.TypeSymbol.UNKNOWN_TYPE; + return symbol; } @Nullable diff --git a/java-frontend/src/main/java/org/sonar/java/model/declaration/MethodTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/declaration/MethodTreeImpl.java index 188637e08ba..ee989957a6e 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/declaration/MethodTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/declaration/MethodTreeImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.IMethodBinding; import org.sonar.java.Preconditions; import org.sonar.java.ast.parser.FormalParametersListTreeImpl; import org.sonar.java.ast.parser.QualifiedIdentifierListTreeImpl; @@ -73,8 +72,7 @@ public class MethodTreeImpl extends JavaTree implements MethodTree { @Nullable private CFG cfg; - @Nullable - public IMethodBinding methodBinding; + private Symbol.MethodSymbol symbol = Symbol.MethodSymbol.UNKNOWN_METHOD; /** * Cache for {@link #isOverriding()}. @@ -216,11 +214,13 @@ public ExpressionTree defaultValue() { return defaultValue; } + public void setSymbol(Symbol.MethodSymbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + @Override public Symbol.MethodSymbol symbol() { - return methodBinding != null - ? root.sema.methodSymbol(methodBinding) - : Symbol.MethodSymbol.UNKNOWN_METHOD; + return symbol; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/declaration/VariableTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/declaration/VariableTreeImpl.java index e46d74b113a..c697d55faa0 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/declaration/VariableTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/declaration/VariableTreeImpl.java @@ -17,13 +17,15 @@ package org.sonar.java.model.declaration; import java.util.Arrays; +import java.util.Collections; import java.util.List; -import org.eclipse.jdt.core.dom.IVariableBinding; -import org.sonar.plugins.java.api.semantic.Symbol; -import org.sonarsource.analyzer.commons.collections.ListUtils; +import java.util.Objects; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; import org.sonar.java.model.InternalSyntaxToken; import org.sonar.java.model.JavaTree; import org.sonar.java.model.expression.IdentifierTreeImpl; +import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.ExpressionTree; import org.sonar.plugins.java.api.tree.IdentifierTree; import org.sonar.plugins.java.api.tree.InferedTypeTree; @@ -33,11 +35,7 @@ import org.sonar.plugins.java.api.tree.TreeVisitor; import org.sonar.plugins.java.api.tree.TypeTree; import org.sonar.plugins.java.api.tree.VariableTree; - -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.Objects; +import org.sonarsource.analyzer.commons.collections.ListUtils; public class VariableTreeImpl extends JavaTree implements VariableTree { private ModifiersTree modifiers; @@ -50,7 +48,7 @@ public class VariableTreeImpl extends JavaTree implements VariableTree { @Nullable private SyntaxToken endToken; - public IVariableBinding variableBinding; + private Symbol symbol = Symbol.UNKNOWN_SYMBOL; public VariableTreeImpl( ModifiersTree modifiers, @@ -129,11 +127,13 @@ public SyntaxToken equalToken() { return equalToken; } + public void setSymbol(Symbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + @Override public Symbol symbol() { - return variableBinding != null - ? root.sema.variableSymbol(variableBinding) - : Symbol.UNKNOWN_SYMBOL; + return symbol; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/expression/IdentifierTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/expression/IdentifierTreeImpl.java index 166f6275421..136a9ce792a 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/expression/IdentifierTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/expression/IdentifierTreeImpl.java @@ -19,11 +19,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import org.eclipse.jdt.core.dom.IBinding; -import org.eclipse.jdt.core.dom.IMethodBinding; -import org.eclipse.jdt.core.dom.IPackageBinding; -import org.eclipse.jdt.core.dom.ITypeBinding; -import org.eclipse.jdt.core.dom.IVariableBinding; import org.sonar.java.model.InternalSyntaxToken; import org.sonar.java.model.JLabelSymbol; import org.sonar.java.model.JavaTree; @@ -41,7 +36,7 @@ public class IdentifierTreeImpl extends AssessableExpressionTree implements Iden private final boolean isUnnamedVariable; private List annotations; - public IBinding binding; + private Symbol symbol = Symbol.UNKNOWN_SYMBOL; public JLabelSymbol labelSymbol; public IdentifierTreeImpl(InternalSyntaxToken nameToken) { @@ -79,19 +74,14 @@ public boolean isUnnamedVariable() { return isUnnamedVariable; } + public void setSymbol(Symbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + @Override public Symbol symbol() { - if (binding != null && !isUnnamedVariable) { - switch (binding.getKind()) { - case IBinding.TYPE: - return root.sema.typeSymbol((ITypeBinding) binding); - case IBinding.METHOD: - return root.sema.methodSymbol((IMethodBinding) binding); - case IBinding.VARIABLE: - return root.sema.variableSymbol((IVariableBinding) binding); - case IBinding.PACKAGE: - return root.sema.packageSymbol((IPackageBinding) binding); - } + if (!isUnnamedVariable && symbol != Symbol.UNKNOWN_SYMBOL) { + return symbol; } if (labelSymbol != null) { return labelSymbol; diff --git a/java-frontend/src/main/java/org/sonar/java/model/expression/LambdaExpressionTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/expression/LambdaExpressionTreeImpl.java index d737562cf49..a94da471ddd 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/expression/LambdaExpressionTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/expression/LambdaExpressionTreeImpl.java @@ -17,22 +17,21 @@ package org.sonar.java.model.expression; import java.util.Arrays; -import org.eclipse.jdt.core.dom.IMethodBinding; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; import org.sonar.java.cfg.CFG; -import org.sonar.plugins.java.api.semantic.Symbol; -import org.sonarsource.analyzer.commons.collections.ListUtils; import org.sonar.java.model.InternalSyntaxToken; import org.sonar.plugins.java.api.cfg.ControlFlowGraph; +import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.BlockTree; import org.sonar.plugins.java.api.tree.LambdaExpressionTree; import org.sonar.plugins.java.api.tree.SyntaxToken; import org.sonar.plugins.java.api.tree.Tree; import org.sonar.plugins.java.api.tree.TreeVisitor; import org.sonar.plugins.java.api.tree.VariableTree; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; +import org.sonarsource.analyzer.commons.collections.ListUtils; public class LambdaExpressionTreeImpl extends AssessableExpressionTree implements LambdaExpressionTree { @@ -45,8 +44,7 @@ public class LambdaExpressionTreeImpl extends AssessableExpressionTree implement private final Tree body; private CFG cfg; - @Nullable - public IMethodBinding methodBinding; + private Symbol.MethodSymbol symbol = Symbol.MethodSymbol.UNKNOWN_METHOD; public LambdaExpressionTreeImpl(@Nullable InternalSyntaxToken openParenToken, List parameters, @Nullable InternalSyntaxToken closeParenToken, InternalSyntaxToken arrowToken, Tree body) { @@ -89,11 +87,13 @@ public Tree body() { return body; } + public void setSymbol(Symbol.MethodSymbol symbol) { + this.symbol = Objects.requireNonNull(symbol); + } + @Override public Symbol.MethodSymbol symbol() { - return methodBinding != null - ? root.sema.methodSymbol(methodBinding) - : Symbol.MethodSymbol.UNKNOWN_METHOD; + return symbol; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/expression/MethodInvocationTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/expression/MethodInvocationTreeImpl.java index 6a52cb0d654..c12b863f3ee 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/expression/MethodInvocationTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/expression/MethodInvocationTreeImpl.java @@ -17,10 +17,11 @@ package org.sonar.java.model.expression; import java.util.Arrays; +import java.util.Collections; import java.util.List; -import org.eclipse.jdt.core.dom.IMethodBinding; +import java.util.Objects; +import javax.annotation.Nullable; import org.sonar.java.ast.parser.ArgumentListTreeImpl; -import org.sonarsource.analyzer.commons.collections.ListUtils; import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.Arguments; import org.sonar.plugins.java.api.tree.ExpressionTree; @@ -30,10 +31,7 @@ import org.sonar.plugins.java.api.tree.Tree; import org.sonar.plugins.java.api.tree.TreeVisitor; import org.sonar.plugins.java.api.tree.TypeArguments; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.Objects; +import org.sonarsource.analyzer.commons.collections.ListUtils; public class MethodInvocationTreeImpl extends AssessableExpressionTree implements MethodInvocationTree { @@ -42,8 +40,7 @@ public class MethodInvocationTreeImpl extends AssessableExpressionTree implement @Nullable private TypeArguments typeArguments; - @Nullable - public IMethodBinding methodBinding; + private Symbol.MethodSymbol methodSymbol = Symbol.MethodSymbol.UNKNOWN_METHOD; public MethodInvocationTreeImpl(ExpressionTree methodSelect, @Nullable TypeArguments typeArguments, ArgumentListTreeImpl arguments) { this.methodSelect = Objects.requireNonNull(methodSelect); @@ -89,11 +86,13 @@ public Symbol symbol() { return methodSymbol(); } + public void setMethodSymbol(Symbol.MethodSymbol methodSymbol) { + this.methodSymbol = Objects.requireNonNull(methodSymbol); + } + @Override public Symbol.MethodSymbol methodSymbol() { - return methodBinding != null - ? root.sema.methodSymbol(methodBinding) - : Symbol.MethodSymbol.UNKNOWN_METHOD; + return methodSymbol; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/AbstractPatternTree.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/AbstractPatternTree.java index 183d239479f..5deed353841 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/AbstractPatternTree.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/AbstractPatternTree.java @@ -16,9 +16,8 @@ */ package org.sonar.java.model.pattern; +import java.util.Objects; import java.util.Optional; -import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.ITypeBinding; import org.sonar.java.model.JavaTree; import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.PatternTree; @@ -31,19 +30,16 @@ public abstract class AbstractPatternTree extends JavaTree implements PatternTre private final Tree.Kind kind; - @Nullable - public ITypeBinding typeBinding; + private final Type type; - AbstractPatternTree(Tree.Kind kind, @Nullable ITypeBinding typeBinding) { + AbstractPatternTree(Tree.Kind kind, Type type) { this.kind = kind; - this.typeBinding = typeBinding; + this.type = Objects.requireNonNull(type); } @Override public Type symbolType() { - return typeBinding != null - ? root.sema.type(typeBinding) - : Type.UNKNOWN; + return type; } @Override diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java index 797b890d3f3..76fca0bdc1c 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/DefaultPatternTreeImpl.java @@ -18,8 +18,7 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.ITypeBinding; +import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.DefaultPatternTree; import org.sonar.plugins.java.api.tree.SyntaxToken; import org.sonar.plugins.java.api.tree.Tree; @@ -32,8 +31,8 @@ public class DefaultPatternTreeImpl extends AbstractPatternTree implements Defau private final SyntaxToken defaultToken; - public DefaultPatternTreeImpl(SyntaxToken defaultToken, @Nullable ITypeBinding typeBinding) { - super(Tree.Kind.DEFAULT_PATTERN, typeBinding); + public DefaultPatternTreeImpl(SyntaxToken defaultToken, Type type) { + super(Tree.Kind.DEFAULT_PATTERN, type); this.defaultToken = defaultToken; } diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java index af42ddfcdbf..4910d17f362 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/GuardedPatternTreeImpl.java @@ -18,8 +18,7 @@ import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.ITypeBinding; +import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.ExpressionTree; import org.sonar.plugins.java.api.tree.GuardedPatternTree; import org.sonar.plugins.java.api.tree.PatternTree; @@ -36,8 +35,8 @@ public class GuardedPatternTreeImpl extends AbstractPatternTree implements Guard private final SyntaxToken whenOperator; private final ExpressionTree expression; - public GuardedPatternTreeImpl(PatternTree pattern, SyntaxToken whenOperator, ExpressionTree expression, @Nullable ITypeBinding typeBinding) { - super(Tree.Kind.GUARDED_PATTERN, typeBinding); + public GuardedPatternTreeImpl(PatternTree pattern, SyntaxToken whenOperator, ExpressionTree expression, Type type) { + super(Tree.Kind.GUARDED_PATTERN, type); this.pattern = pattern; this.whenOperator = whenOperator; this.expression = expression; diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java index 665eb9e0d2b..1cddb3834f3 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/NullPatternTreeImpl.java @@ -33,7 +33,7 @@ public class NullPatternTreeImpl extends AbstractPatternTree implements NullPatt private final LiteralTree nullLiteral; public NullPatternTreeImpl(LiteralTree nullLiteral) { - super(Tree.Kind.NULL_PATTERN, null); + super(Tree.Kind.NULL_PATTERN, Type.UNKNOWN); this.nullLiteral = nullLiteral; } diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java index 93e10579aa2..b1cf9152ef9 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/RecordPatternTreeImpl.java @@ -38,7 +38,7 @@ public class RecordPatternTreeImpl extends AbstractPatternTree implements Record private final InternalSyntaxToken closeParenToken; public RecordPatternTreeImpl(TypeTree type, InternalSyntaxToken openParenToken, List patterns, InternalSyntaxToken closeParenToken) { - super(Kind.RECORD_PATTERN, null); + super(Kind.RECORD_PATTERN, Type.UNKNOWN); this.type = type; this.openParenToken = openParenToken; this.patterns = patterns; diff --git a/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java b/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java index afc45f2b891..0552c45a857 100644 --- a/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java +++ b/java-frontend/src/main/java/org/sonar/java/model/pattern/TypePatternTreeImpl.java @@ -18,8 +18,7 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Nullable; -import org.eclipse.jdt.core.dom.ITypeBinding; +import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.Tree; import org.sonar.plugins.java.api.tree.TreeVisitor; import org.sonar.plugins.java.api.tree.TypePatternTree; @@ -32,8 +31,8 @@ public class TypePatternTreeImpl extends AbstractPatternTree implements TypePatt private final VariableTree patternVariable; - public TypePatternTreeImpl(VariableTree patternVariable, @Nullable ITypeBinding typeBinding) { - super(Tree.Kind.TYPE_PATTERN, typeBinding); + public TypePatternTreeImpl(VariableTree patternVariable, Type type) { + super(Tree.Kind.TYPE_PATTERN, type); this.patternVariable = patternVariable; } diff --git a/java-frontend/src/test/java/org/sonar/java/SonarComponentsTest.java b/java-frontend/src/test/java/org/sonar/java/SonarComponentsTest.java index 2574563e9bd..dbd2713a525 100644 --- a/java-frontend/src/test/java/org/sonar/java/SonarComponentsTest.java +++ b/java-frontend/src/test/java/org/sonar/java/SonarComponentsTest.java @@ -1184,7 +1184,7 @@ void log_only_50_undefined_types() { // artificially populated the semantic errors with 26 unknown types and 52 errors sonarComponents.collectUndefinedTypes(DEFAULT_PATH, - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); // triggers log sonarComponents.logUndefinedTypes(); @@ -1215,7 +1215,7 @@ void remove_info_and_warning_from_log_related_to_undefined_types() { loggingLogTester.setLevel(Level.ERROR); String source = generateSource(26); sonarComponents.collectUndefinedTypes(DEFAULT_PATH, - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); sonarComponents.logUndefinedTypes(); assertThat(loggingLogTester.logs(Level.WARN)).isEmpty(); @@ -1229,7 +1229,7 @@ void log_all_undefined_types_if_less_than_threshold() { // artificially populated the semantic errors with 1 unknown types and 2 errors sonarComponents.collectUndefinedTypes(DEFAULT_PATH, - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); // triggers log sonarComponents.logUndefinedTypes(); @@ -1285,9 +1285,9 @@ void log_problems_with_list_of_paths_of_files_affected() { // artificially populated the semantic errors with 1 unknown types and 2 errors sonarComponents.collectUndefinedTypes(mainFile.toString(), - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); sonarComponents.collectUndefinedTypes(testFile.toString(), - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); sonarComponents.logUndefinedTypes(); List debugMessage = loggingLogTester.logs(Level.DEBUG); @@ -1320,7 +1320,7 @@ private void logUndefinedTypesWithOneMainAndOneTest() { // artificially populated the semantic errors with 1 unknown types and 2 errors sonarComponents.collectUndefinedTypes(DEFAULT_PATH, - ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).sema.undefinedTypes()); + ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(source)).undefinedTypes()); // Call these methods to initiate Main and Test ClassPath sonarComponents.getJavaClasspath(); diff --git a/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java b/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java index 9c7d66bc68e..7566a61a793 100644 --- a/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java +++ b/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java @@ -62,6 +62,7 @@ import org.sonar.plugins.java.api.JavaFileScannerContext; import org.sonar.plugins.java.api.ModuleScannerContext; import org.sonar.plugins.java.api.internal.EndOfAnalysis; +import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.CompilationUnitTree; import org.sonar.scanner.plugin.api.impl.config.MapSettings; @@ -469,7 +470,7 @@ void test_modifyCompilationUnit_modify_ast() { assertThat(clazz.simpleName().name()).isEqualTo("C"); assertThat(clazz.simpleName().symbol().isUnknown()).isFalse(); IdentifierTreeImpl identifierTree = (IdentifierTreeImpl) clazz.simpleName(); - identifierTree.binding = null; + identifierTree.setSymbol(Symbol.UNKNOWN_SYMBOL); }); } diff --git a/java-frontend/src/test/java/org/sonar/java/model/AstSemanticValuesTest.java b/java-frontend/src/test/java/org/sonar/java/model/AstSemanticValuesTest.java new file mode 100644 index 00000000000..7cd43b2415c --- /dev/null +++ b/java-frontend/src/test/java/org/sonar/java/model/AstSemanticValuesTest.java @@ -0,0 +1,156 @@ +/* + * SonarQube Java + * Copyright (C) SonarSource Sàrl + * mailto:info AT sonarsource DOT com + * + * You can redistribute and/or modify this program under the terms of + * the Sonar Source-Available License Version 1, as published by SonarSource Sàrl. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the Sonar Source-Available License for more details. + * + * 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; + +import com.google.common.reflect.ClassPath; +import java.io.IOException; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.sonar.java.ast.parser.ArgumentListTreeImpl; +import org.sonar.java.ast.parser.FormalParametersListTreeImpl; +import org.sonar.java.model.declaration.ClassTreeImpl; +import org.sonar.java.model.declaration.MethodTreeImpl; +import org.sonar.java.model.declaration.VariableTreeImpl; +import org.sonar.java.model.expression.IdentifierTreeImpl; +import org.sonar.java.model.expression.LambdaExpressionTreeImpl; +import org.sonar.java.model.expression.MethodInvocationTreeImpl; +import org.sonar.java.model.pattern.DefaultPatternTreeImpl; +import org.sonar.java.model.pattern.GuardedPatternTreeImpl; +import org.sonar.java.model.pattern.TypePatternTreeImpl; +import org.sonar.plugins.java.api.semantic.Symbol; +import org.sonar.plugins.java.api.semantic.Type; +import org.sonar.plugins.java.api.tree.Tree; + +import static java.nio.charset.StandardCharsets.ISO_8859_1; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +class AstSemanticValuesTest { + + private final InternalSyntaxToken token = new InternalSyntaxToken(1, 0, "name", List.of(), false); + + @Test + void stores_api_types_without_a_semantic_context_or_parents() { + IdentifierTreeImpl identifier = new IdentifierTreeImpl(token); + assertThat(identifier.symbolType()).isSameAs(Type.UNKNOWN); + Type type = mock(Type.class); + identifier.setSymbolType(type); + assertThat(identifier.symbolType()).isSameAs(type); + + VariableTreeImpl variable = new VariableTreeImpl(identifier); + TypePatternTreeImpl pattern = new TypePatternTreeImpl(variable, type); + assertThat(pattern.symbolType()).isSameAs(type); + assertThat(new GuardedPatternTreeImpl(pattern, token, identifier, type).symbolType()).isSameAs(type); + assertThat(new DefaultPatternTreeImpl(token, type).symbolType()).isSameAs(type); + } + + @Test + void stores_api_declaration_symbols_without_a_semantic_context_or_parents() { + Symbol.TypeSymbol typeSymbol = mock(Symbol.TypeSymbol.class); + Symbol.MethodSymbol methodSymbol = mock(Symbol.MethodSymbol.class); + Symbol.VariableSymbol variableSymbol = mock(Symbol.VariableSymbol.class); + IdentifierTreeImpl identifier = new IdentifierTreeImpl(token); + + ClassTreeImpl declaration = new ClassTreeImpl(Tree.Kind.CLASS, token, List.of(), token); + assertThat(declaration.symbol()).isSameAs(Symbol.TypeSymbol.UNKNOWN_TYPE); + declaration.setSymbol(typeSymbol); + assertThat(declaration.symbol()).isSameAs(typeSymbol); + + MethodTreeImpl method = new MethodTreeImpl(new FormalParametersListTreeImpl(token, token), null, null); + assertThat(method.symbol()).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); + method.setSymbol(methodSymbol); + assertThat(method.symbol()).isSameAs(methodSymbol); + + VariableTreeImpl variable = new VariableTreeImpl(identifier); + assertThat(variable.symbol()).isSameAs(Symbol.UNKNOWN_SYMBOL); + variable.setSymbol(variableSymbol); + assertThat(variable.symbol()).isSameAs(variableSymbol); + + TypeParameterTreeImpl parameter = new TypeParameterTreeImpl(identifier); + assertThat(parameter.symbol()).isSameAs(Symbol.UNKNOWN_SYMBOL); + parameter.setSymbol(typeSymbol); + assertThat(parameter.symbol()).isSameAs(typeSymbol); + } + + @Test + void stores_api_expression_symbols_without_a_semantic_context_or_parents() { + Symbol.MethodSymbol methodSymbol = mock(Symbol.MethodSymbol.class); + Symbol.VariableSymbol variableSymbol = mock(Symbol.VariableSymbol.class); + IdentifierTreeImpl identifier = new IdentifierTreeImpl(token); + assertThat(identifier.symbol()).isSameAs(Symbol.UNKNOWN_SYMBOL); + identifier.setSymbol(variableSymbol); + assertThat(identifier.symbol()).isSameAs(variableSymbol); + + MethodInvocationTreeImpl invocation = new MethodInvocationTreeImpl(identifier, null, ArgumentListTreeImpl.emptyList()); + assertThat(invocation.methodSymbol()).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); + invocation.setMethodSymbol(methodSymbol); + assertThat(invocation.methodSymbol()).isSameAs(methodSymbol); + + LambdaExpressionTreeImpl lambda = new LambdaExpressionTreeImpl(null, List.of(), null, token, identifier); + assertThat(lambda.symbol()).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); + lambda.setSymbol(methodSymbol); + assertThat(lambda.symbol()).isSameAs(methodSymbol); + } + + @Test + void preserves_nullable_import_symbols_and_unnamed_identifiers() { + JavaTree.ImportTreeImpl importTree = new JavaTree.ImportTreeImpl(token, null, null, new IdentifierTreeImpl(token), token); + assertThat(importTree.symbol()).isNull(); + Symbol symbol = mock(Symbol.class); + importTree.setSymbol(symbol); + assertThat(importTree.symbol()).isSameAs(symbol); + importTree.setSymbol(null); + assertThat(importTree.symbol()).isNull(); + + IdentifierTreeImpl unnamed = new IdentifierTreeImpl(token, true); + unnamed.setSymbol(symbol); + assertThat(unnamed.symbol()).isSameAs(Symbol.UNKNOWN_SYMBOL); + } + + @Test + void preserves_keyword_symbols_and_super_type_without_ecj() { + Symbol symbol = mock(Symbol.class); + Type type = mock(Type.class); + when(symbol.type()).thenReturn(type); + KeywordThis keywordThis = new KeywordThis(token, symbol); + keywordThis.setSymbolType(type); + assertThat(keywordThis.symbol()).isSameAs(symbol); + assertThat(keywordThis.symbolType()).isSameAs(type); + KeywordSuper keywordSuper = new KeywordSuper(token, symbol); + assertThat(keywordSuper.symbol()).isSameAs(symbol); + assertThat(keywordSuper.symbolType()).isSameAs(type); + } + + @Test + void ast_bytecode_does_not_depend_on_ecj_or_its_semantic_context() throws IOException { + List> trees = ClassPath.from(JavaTree.class.getClassLoader()).getAllClasses().stream() + .filter(info -> info.getName().startsWith("org.sonar.java.")) + .map(ClassPath.ClassInfo::load) + .filter(JavaTree.class::isAssignableFrom) + .filter(type -> type.getProtectionDomain().getCodeSource().getLocation().equals(JavaTree.class.getProtectionDomain().getCodeSource().getLocation())) + .toList(); + assertThat(trees).contains(JavaTree.class, ClassTreeImpl.class, IdentifierTreeImpl.class, TypePatternTreeImpl.class); + for (Class tree : trees) { + try (var bytecode = tree.getResourceAsStream("/" + tree.getName().replace('.', '/') + ".class")) { + assertThat(new String(bytecode.readAllBytes(), ISO_8859_1)) + .as(tree.getName()) + .doesNotContain("org/eclipse/jdt/", "org.eclipse.jdt.", "org/sonar/java/model/JSema"); + } + } + } +} diff --git a/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java index 24fa6f9dd28..23d7f0f21b4 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JMethodSymbolTest.java @@ -52,6 +52,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import static org.sonar.java.model.JParserTestUtils.methodBinding; +import static org.sonar.java.model.JParserTestUtils.sema; +import static org.sonar.java.model.JParserTestUtils.symbolOf; +import static org.sonar.java.model.JParserTestUtils.typeOf; import static org.sonar.java.model.JUtilsTest.firstClass; import static org.sonar.java.model.JUtilsTest.firstMethod; import static org.sonar.java.model.JUtilsTest.nthMethod; @@ -63,15 +67,15 @@ void test() { JavaTree.CompilationUnitTreeImpl cu = test("class C { C m(C p) throws Exception { return null; } }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.parameterTypes()) - .containsOnly(cu.sema.type(Objects.requireNonNull(c.typeBinding))); + .containsOnly(((JType) typeOf(c))); assertThat(symbol.declarationParameters()) .containsExactly(m.parameters().get(0).symbol()); assertThat(symbol.returnType()) - .isSameAs(cu.sema.typeSymbol(Objects.requireNonNull(c.typeBinding))); + .isSameAs(((JTypeSymbol) typeOf(c).symbol())); assertThat(symbol.thrownTypes()) - .containsOnly(cu.sema.type(Objects.requireNonNull(cu.sema.resolveType("java.lang.Exception")))); + .containsOnly(sema(cu).type(Objects.requireNonNull(sema(cu).resolveType("java.lang.Exception")))); } @Test @@ -80,7 +84,7 @@ void test_with_generics() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); Symbol.MethodSymbol declarationSymbol = m.symbol(); - JType declarationParameterType = cu.sema.type(Objects.requireNonNull((m.methodBinding.getParameterTypes()[0]))); + JType declarationParameterType = sema(cu).type(Objects.requireNonNull((methodBinding(m).getParameterTypes()[0]))); assertThat(declarationSymbol.parameterTypes()) .containsOnly(declarationParameterType); Symbol declarationParameterSymbol = m.parameters().get(0).symbol(); @@ -193,7 +197,7 @@ void testSingleInheritance() { + "class Clazz implements A { public void a() {} }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(1); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).containsOnly(retrieveMethodSymbol("A", "a", cu)); } @@ -208,7 +212,7 @@ class C extends B { public void a() {} } """); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(3); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).containsExactly( retrieveMethodSymbol("B", "a", cu), @@ -221,9 +225,9 @@ void testObjectExtensionFromClass() { JavaTree.CompilationUnitTreeImpl cu = test("class Clazz { public boolean equals(Object other) { return false; } }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); - assertThat(symbol.overriddenSymbols()).containsExactly(objectEqualsMethod(cu.sema)); + assertThat(symbol.overriddenSymbols()).containsExactly(objectEqualsMethod(sema(cu))); } @Test @@ -231,9 +235,9 @@ void testObjectExtensionFromInterface() { JavaTree.CompilationUnitTreeImpl cu = test("interface Interface { boolean equals(Object other) { return false; } }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); - assertThat(symbol.overriddenSymbols()).containsExactly(objectEqualsMethod(cu.sema)); + assertThat(symbol.overriddenSymbols()).containsExactly(objectEqualsMethod(sema(cu))); } private static JMethodSymbol objectEqualsMethod(JSema sema) { @@ -253,7 +257,7 @@ class C implements A, B { public void a() { } } """); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(2); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).containsExactly( retrieveMethodSymbol("A", "a", cu), @@ -267,7 +271,7 @@ void testUnknownInheritance() { + "class C implements KnownInterface, UnknownInterface { public void a() { } }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(1); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).containsExactly( retrieveMethodSymbol("KnownInterface", "a", cu)); @@ -279,7 +283,7 @@ void testUnknownExtends() { + "class B extends Unknown { public void a() { } }"); ClassTreeImpl a = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) a.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).isEmpty(); } @@ -291,7 +295,7 @@ void testBindingReturnNullSuperClass() { MethodTreeImpl m = (MethodTreeImpl) a.members().get(0); // We create a real JMethodSymbol because it is not possible to mock JMethodSymbol (it is final), and not easy // to mock the arguments either, because the constructor is using an external helper method. - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); ITypeBinding iTypeBinding = mock(ITypeBinding.class); // In some rare situation, the "getSuperclass" can return null. It is not easy to write code reproducing the issue, we test it by "hand". @@ -315,10 +319,10 @@ class Clazz implements A, C { public boolean equals(Object other) { return false """); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(3); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - JMethodSymbol symbol = cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)); + JMethodSymbol symbol = ((JMethodSymbol) symbolOf(m)); assertThat(symbol.overriddenSymbols()).containsExactly( - objectEqualsMethod(cu.sema), + objectEqualsMethod(sema(cu)), retrieveMethodSymbol("A", "equals", cu), retrieveMethodSymbol("B", "equals", cu)); } @@ -349,13 +353,13 @@ void signature() { MethodTreeImpl method = (MethodTreeImpl) c.members().get(1); ReturnStatementTreeImpl s = (ReturnStatementTreeImpl) Objects.requireNonNull(method.block()).body().get(0); MethodInvocationTreeImpl methodInvocation = Objects.requireNonNull((MethodInvocationTreeImpl) s.expression()); - assertThat(cu.sema.methodSymbol(Objects.requireNonNull(constructor.methodBinding)).signature()) + assertThat(((JMethodSymbol) symbolOf(constructor)).signature()) .isEqualTo(constructor.symbol().signature()) .isEqualTo("org.example.C#()V"); - assertThat(cu.sema.methodSymbol(Objects.requireNonNull(method.methodBinding)).signature()) + assertThat(((JMethodSymbol) symbolOf(method)).signature()) .isEqualTo(method.symbol().signature()) .isEqualTo("org.example.C#m(Ljava/lang/Object;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); - assertThat(cu.sema.methodSymbol(Objects.requireNonNull(methodInvocation.methodBinding)).signature()) + assertThat(((JMethodSymbol) symbolOf(methodInvocation)).signature()) .isEqualTo(method.symbol().signature()) .isEqualTo("org.example.C#m(Ljava/lang/Object;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); } @@ -424,9 +428,9 @@ void support_unexpected_IMethodBinding_null_return_type() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); // simulate broken semantic with getReturnType() == null - IMethodBinding brokenMethodBinding = spy(m.methodBinding); + IMethodBinding brokenMethodBinding = spy(methodBinding(m)); when(brokenMethodBinding.getReturnType()).thenReturn(null); - JMethodSymbol methodSymbol = new JMethodSymbol(cu.sema, brokenMethodBinding); + JMethodSymbol methodSymbol = new JMethodSymbol(sema(cu), brokenMethodBinding); assertThat(methodSymbol.returnType().isUnknown()).isTrue(); assertThat(methodSymbol.isNativeMethod()).isFalse(); assertThat(methodSymbol.metadata()).isSameAs(Symbols.EMPTY_METADATA); @@ -460,12 +464,12 @@ private static JMethodSymbol getJMethodSymbolFromClassText(String classText, boo ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); if(brokenSemantic){ - IMethodBinding brokenMethodBinding = spy(m.methodBinding); + IMethodBinding brokenMethodBinding = spy(methodBinding(m)); when(brokenMethodBinding.getReturnType()).thenReturn(null); when(brokenMethodBinding.isRecovered()).thenReturn(true); - return new JMethodSymbol(cu.sema, brokenMethodBinding); + return new JMethodSymbol(sema(cu), brokenMethodBinding); } - return new JMethodSymbol(cu.sema, m.methodBinding); + return new JMethodSymbol(sema(cu), methodBinding(m)); } private static CompilationUnitTreeImpl test(String source) { diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserReleasingJarsTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserReleasingJarsTest.java index e9fb5846280..d6c2207db62 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JParserReleasingJarsTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JParserReleasingJarsTest.java @@ -103,7 +103,7 @@ void jParser_should_release_jar_after_use() throws Exception { assertThat(((Symbol.MethodSymbol) foo).signature()).isEqualTo("org.foo.A#foo(Z)I"); // force clean - Runnable iNameEnvironment = cu.sema.getEnvironmentCleaner(); + Runnable iNameEnvironment = cu.getEnvironmentCleaner(); iNameEnvironment.run(); // can be safely deleted @@ -114,8 +114,8 @@ void jParser_should_release_jar_after_use() throws Exception { @Test void environment_cleaner_should_support_equals_and_hashcode() { JavaTree.CompilationUnitTreeImpl cu = (JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse("class A {}"); - Runnable env1 = cu.sema.getEnvironmentCleaner(); - Runnable env2 = cu.sema.getEnvironmentCleaner(); + Runnable env1 = cu.getEnvironmentCleaner(); + Runnable env2 = cu.getEnvironmentCleaner(); assertThat(env1.equals(env1)).isTrue(); assertThat(env1.equals(env2)).isTrue(); @@ -129,9 +129,9 @@ void environment_cleaner_should_support_equals_and_hashcode() { @Test void environment_from_different_cu_are_not_equals() { JavaTree.CompilationUnitTreeImpl cu1 = (JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse("class A {}"); - Runnable env1 = cu1.sema.getEnvironmentCleaner(); + Runnable env1 = cu1.getEnvironmentCleaner(); JavaTree.CompilationUnitTreeImpl cu2 = (JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse("class A {}"); - Runnable env2 = cu2.sema.getEnvironmentCleaner(); + Runnable env2 = cu2.getEnvironmentCleaner(); assertThat(env1.equals(env2)).isFalse(); assertThat(env1.hashCode()).isNotEqualTo(env2.hashCode()); diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java index 5190459774c..d8d11d8c2db 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JParserSemanticTest.java @@ -26,7 +26,6 @@ import org.eclipse.jdt.core.dom.ASTParser; import org.eclipse.jdt.core.dom.Block; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jdt.core.dom.IBinding; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.MethodDeclaration; import org.eclipse.jdt.core.dom.SwitchStatement; @@ -97,6 +96,8 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.sonar.java.model.JParserTestUtils.symbolOf; +import static org.sonar.java.model.JParserTestUtils.typeOf; import static org.sonar.java.model.assertions.TreeAssert.assertThat; import static org.sonar.java.model.assertions.TypeAssert.assertThat; @@ -110,17 +111,16 @@ void should_not_throw_RecognitionException_in_case_of_non_syntax_errors() { @Test void expression_null_literal() { AbstractTypedTree e = (AbstractTypedTree) expression("null"); - assertThat(e.typeBinding).isNotNull(); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN); } @Test void expression_literal() { InternalPrefixUnaryExpression e = (InternalPrefixUnaryExpression) expression("-2147483648"); // Integer.MIN_VALUE - assertThat(e.typeBinding).isNotNull(); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN); AbstractTypedTree t = (AbstractTypedTree) e.expression(); - assertThat(t.typeBinding) - .isNotNull() - .isSameAs(e.typeBinding); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(e)); } /** @@ -130,8 +130,8 @@ void expression_literal() { void extended_operands() { BinaryExpressionTreeImpl e = (BinaryExpressionTreeImpl) expression("1 - 2 - 3"); BinaryExpressionTreeImpl leftOperand = (BinaryExpressionTreeImpl) e.leftOperand(); - assertThat(e.typeBinding).isNotNull(); - assertThat(leftOperand.typeBinding).isSameAs(e.typeBinding); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(leftOperand)).isSameAs(typeOf(e)); } /** @@ -144,8 +144,8 @@ void expression_simple_name() { MethodTreeImpl m = (MethodTreeImpl) c.members().get(1); ReturnStatementTree s = (ReturnStatementTree) m.block().body().get(0); IdentifierTreeImpl i = (IdentifierTreeImpl) s.expression(); - assertThat(i.binding).isNotNull(); - assertThat(cu.sema.usages.get(i.binding)).containsOnly(i); + assertThat(symbolOf(i)).isNotNull(); + assertThat(symbolOf(i).usages()).containsOnly(i); } /** @@ -161,32 +161,32 @@ void expression_qualified_name() { MemberSelectExpressionTreeImpl javaLangSystemOut = (MemberSelectExpressionTreeImpl) s.expression(); MemberSelectExpressionTreeImpl javaLangSystem = (MemberSelectExpressionTreeImpl) javaLangSystemOut.expression(); - assertThat(javaLangSystem.typeBinding).isNotNull(); - assertThat(cu.sema.type(javaLangSystem.typeBinding).is("java.lang.System")) + assertThat(typeOf(javaLangSystem)).isNotSameAs(Type.UNKNOWN); + assertThat(((JType) typeOf(javaLangSystem)).is("java.lang.System")) .isEqualTo(javaLangSystem.symbolType().is("java.lang.System")) .isTrue(); MemberSelectExpressionTreeImpl javaLang = (MemberSelectExpressionTreeImpl) javaLangSystem.expression(); - assertThat(javaLang.typeBinding).isNull(); + assertThat(typeOf(javaLang)).isSameAs(Type.UNKNOWN); IdentifierTreeImpl java = (IdentifierTreeImpl) javaLang.expression(); - assertThat(java.typeBinding).isNull(); - assertThat(java.binding).isNotNull(); - assertThat(java.binding.getKind()).isSameAs(IBinding.PACKAGE); + assertThat(typeOf(java)).isSameAs(Type.UNKNOWN); + assertThat(symbolOf(java)).isNotNull(); + assertThat(symbolOf(java).isPackageSymbol()).isTrue(); assertThat(java.symbol().isPackageSymbol()).isTrue(); IdentifierTreeImpl lang = (IdentifierTreeImpl) javaLang.identifier(); - assertThat(lang.typeBinding).isNull(); - assertThat(lang.binding).isNotNull(); - assertThat(lang.binding.getKind()).isSameAs(IBinding.PACKAGE); + assertThat(typeOf(lang)).isSameAs(Type.UNKNOWN); + assertThat(symbolOf(lang)).isNotNull(); + assertThat(symbolOf(lang).isPackageSymbol()).isTrue(); assertThat(lang.symbol().isPackageSymbol()).isTrue(); IdentifierTreeImpl system = (IdentifierTreeImpl) javaLangSystem.identifier(); - assertThat(system.binding) + assertThat(symbolOf(system)) .isNotNull() - .isEqualTo(system.typeBinding); - assertThat(system.binding.getKind()).isSameAs(IBinding.TYPE); - assertThat(cu.sema.type(system.typeBinding).is("java.lang.System")) + .isSameAs(typeOf(system).symbol()); + assertThat(symbolOf(system).isTypeSymbol()).isTrue(); + assertThat(((JType) typeOf(system)).is("java.lang.System")) .isEqualTo(system.symbolType().is("java.lang.System")) .isTrue(); } @@ -201,12 +201,11 @@ void expression_this() { MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); KeywordThis keywordThis = Objects.requireNonNull((KeywordThis) s.expression()); - assertThat(keywordThis.typeBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((ClassTreeImpl) keywordThis.symbolType().symbol().declaration()).typeBinding) - .isSameAs(c.typeBinding); + assertThat(typeOf(keywordThis)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) keywordThis.symbolType().symbol().declaration()))) + .isSameAs(typeOf(c)); assertThat(keywordThis.symbol()) - .isSameAs(cu.sema.typeSymbol(c.typeBinding).thisSymbol); + .isSameAs(((JTypeSymbol) typeOf(c).symbol()).thisSymbol); assertThat(keywordThis.symbol().isVariableSymbol()) .isTrue(); } @@ -222,17 +221,15 @@ void expression_this_qualified() { MethodTreeImpl m = (MethodTreeImpl) c2.members().get(0); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MemberSelectExpressionTreeImpl e = Objects.requireNonNull((MemberSelectExpressionTreeImpl) s.expression()); - assertThat(e.typeBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((ClassTreeImpl) e.symbolType().symbol().declaration()).typeBinding) - .isSameAs(c1.typeBinding); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) e.symbolType().symbol().declaration()))) + .isSameAs(typeOf(c1)); KeywordThis keywordThis = (KeywordThis) e.identifier(); - assertThat(keywordThis.typeBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((ClassTreeImpl) keywordThis.symbolType().symbol().declaration()).typeBinding) - .isSameAs(c1.typeBinding); + assertThat(typeOf(keywordThis)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) keywordThis.symbolType().symbol().declaration()))) + .isSameAs(typeOf(c1)); assertThat(keywordThis.symbol()) - .isSameAs(cu.sema.typeSymbol(c1.typeBinding).thisSymbol); + .isSameAs(((JTypeSymbol) typeOf(c1).symbol()).thisSymbol); assertThat(keywordThis.symbol().isVariableSymbol()) .isTrue(); } @@ -248,16 +245,15 @@ void expression_field_access() { MethodTreeImpl m = (MethodTreeImpl) c.members().get(1); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MemberSelectExpressionTreeImpl expression = Objects.requireNonNull((MemberSelectExpressionTreeImpl) s.expression()); - assertThat(expression.typeBinding) - .isNotNull(); + assertThat(typeOf(expression)).isNotSameAs(Type.UNKNOWN); IdentifierTreeImpl identifier = (IdentifierTreeImpl) expression.identifier(); - assertThat(identifier.typeBinding) - .isSameAs(expression.typeBinding); - assertThat(identifier.binding) + assertThat(typeOf(identifier)) + .isSameAs(typeOf(expression)); + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()).variableBinding) - .isSameAs(field.variableBinding); - assertThat(cu.sema.usages.get(identifier.binding)) + .isSameAs(symbolOf(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(field)); + assertThat(symbolOf(identifier).usages()) .containsExactlyElementsOf(identifier.symbol().usages()) .containsOnly(identifier); } @@ -279,14 +275,14 @@ void expression_super_field_access() { assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(superClass.symbol().declaration()); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(c.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(c).symbol()).superSymbol); IdentifierTreeImpl identifier = (IdentifierTreeImpl) expression.identifier(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()).variableBinding) - .isSameAs(superField.variableBinding); - assertThat(cu.sema.usages.get(identifier.binding)) + .isSameAs(symbolOf(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(superField)); + assertThat(symbolOf(identifier).usages()) .containsExactlyElementsOf(identifier.symbol().usages()) .containsOnly(identifier); } @@ -306,23 +302,23 @@ void expression_super_field_access_qualified() { MemberSelectExpressionTreeImpl expression = Objects.requireNonNull((MemberSelectExpressionTreeImpl) s.expression()); MemberSelectExpressionTreeImpl qualifiedSuper = (MemberSelectExpressionTreeImpl) expression.expression(); - assertThat(qualifiedSuper.typeBinding) - .isSameAs(Objects.requireNonNull((ClassTreeImpl) qualifiedSuper.symbolType().symbol().declaration()).typeBinding) - .isSameAs(superClass.typeBinding); + assertThat(typeOf(qualifiedSuper)) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) qualifiedSuper.symbolType().symbol().declaration()))) + .isSameAs(typeOf(superClass)); KeywordSuper keywordSuper = (KeywordSuper) qualifiedSuper.identifier(); assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(Objects.requireNonNull((ClassTreeImpl) keywordSuper.symbolType().symbol().declaration())) .isSameAs(superClass); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(t.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(t).symbol()).superSymbol); IdentifierTreeImpl identifier = (IdentifierTreeImpl) expression.identifier(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()).variableBinding) - .isSameAs(superField.variableBinding); - assertThat(cu.sema.usages.get(identifier.binding)) + .isSameAs(symbolOf(Objects.requireNonNull((VariableTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(superField)); + assertThat(symbolOf(identifier).usages()) .containsExactlyElementsOf(identifier.symbol().usages()) .containsOnly(identifier); } @@ -337,15 +333,12 @@ void expression_type_literal() { MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MemberSelectExpressionTreeImpl e = Objects.requireNonNull((MemberSelectExpressionTreeImpl) s.expression()); - assertThat(e.typeBinding) - .isNotNull(); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN); IdentifierTreeImpl i = (IdentifierTreeImpl) e.identifier(); - assertThat(i.typeBinding) - .isNull(); + assertThat(typeOf(i)).isSameAs(Type.UNKNOWN); assertThat(i.symbolType().isUnknown()) .isTrue(); - assertThat(i.binding) - .isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); assertThat(i.symbol().isUnknown()) .isTrue(); } @@ -361,16 +354,15 @@ void expression_class_instance_creation() { MethodTreeImpl constructor = (MethodTreeImpl) c.members().get(1); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); NewClassTreeImpl e = Objects.requireNonNull((NewClassTreeImpl) s.expression()); - assertThat(e.typeBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((ClassTreeImpl) e.symbolType().symbol().declaration()).typeBinding) - .isSameAs(c.typeBinding); + assertThat(typeOf(e)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) e.symbolType().symbol().declaration()))) + .isSameAs(typeOf(c)); IdentifierTreeImpl i = (IdentifierTreeImpl) e.getConstructorIdentifier(); - assertThat(i.binding) + assertThat(symbolOf(i)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(constructor.methodBinding); - assertThat(cu.sema.usages.get(constructor.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(constructor)); + assertThat(symbolOf(constructor).usages()) .containsExactlyElementsOf(constructor.symbol().usages()) .containsOnly(i); } @@ -387,17 +379,17 @@ void expression_anonymous_class_instance_creation() { ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); NewClassTreeImpl e = (NewClassTreeImpl) s.expression(); ClassTreeImpl b = (ClassTreeImpl) e.classBody(); - assertThat(b.typeBinding).isNotNull(); - assertThat(cu.sema.declarations.get(b.typeBinding)) + assertThat(typeOf(b)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(b).symbol().declaration()) .isSameAs(b.symbol().declaration()) .isSameAs(b); IdentifierTreeImpl identifier = (IdentifierTreeImpl) e.getConstructorIdentifier(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()).methodBinding) - .isSameAs(constructor.methodBinding); - assertThat(cu.sema.usages.get(constructor.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(constructor)); + assertThat(symbolOf(constructor).usages()) .containsExactlyElementsOf(constructor.symbol().usages()) .containsOnly(identifier); } @@ -414,11 +406,11 @@ void expression_creation_reference() { ReturnStatementTreeImpl s = (ReturnStatementTreeImpl) m.block().body().get(0); MethodReferenceTreeImpl creationReference = (MethodReferenceTreeImpl) s.expression(); IdentifierTreeImpl keywordNew = (IdentifierTreeImpl) creationReference.method(); - assertThat(keywordNew.binding) + assertThat(symbolOf(keywordNew)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()).methodBinding) - .isSameAs(constructor.methodBinding); - assertThat(cu.sema.usages.get(constructor.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()))) + .isSameAs(symbolOf(constructor)); + assertThat(symbolOf(constructor).usages()) .containsExactlyElementsOf(constructor.symbol().usages()) .containsOnly(keywordNew); } @@ -434,11 +426,11 @@ void expression_method_reference() { ReturnStatementTreeImpl s = (ReturnStatementTreeImpl) method.block().body().get(0); MethodReferenceTreeImpl creationReference = (MethodReferenceTreeImpl) s.expression(); IdentifierTreeImpl identifier = (IdentifierTreeImpl) creationReference.method(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()).methodBinding) - .isSameAs(method.methodBinding); - assertThat(cu.sema.usages.get(method.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()))) + .isSameAs(symbolOf(method)); + assertThat(symbolOf(method).usages()) .containsExactlyElementsOf(method.symbol().usages()) .containsOnly(identifier); } @@ -454,11 +446,11 @@ void expression_type_method_reference() { ReturnStatementTreeImpl s = (ReturnStatementTreeImpl) method.block().body().get(0); MethodReferenceTreeImpl creationReference = (MethodReferenceTreeImpl) s.expression(); IdentifierTreeImpl identifier = (IdentifierTreeImpl) creationReference.method(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()).methodBinding) - .isSameAs(method.methodBinding); - assertThat(cu.sema.usages.get(method.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()))) + .isSameAs(symbolOf(method)); + assertThat(symbolOf(method).usages()) .containsExactlyElementsOf(method.symbol().usages()) .containsOnly(identifier); } @@ -487,14 +479,14 @@ class S { assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(superClass.symbol().declaration()); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(c.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(c).symbol()).superSymbol); IdentifierTreeImpl identifier = (IdentifierTreeImpl) creationReference.method(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()).methodBinding) - .isSameAs(superClassMethod.methodBinding); - assertThat(cu.sema.usages.get(superClassMethod.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()))) + .isSameAs(symbolOf(superClassMethod)); + assertThat(symbolOf(superClassMethod).usages()) .containsExactlyElementsOf(superClassMethod.symbol().usages()) .containsOnly(identifier); } @@ -525,14 +517,14 @@ class S { assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(superClass.symbol().declaration()); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(c.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(c).symbol()).superSymbol); IdentifierTreeImpl identifier = (IdentifierTreeImpl) creationReference.method(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()).methodBinding) - .isSameAs(superClassMethod.methodBinding); - assertThat(cu.sema.usages.get(superClassMethod.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) creationReference.method().symbol().declaration()))) + .isSameAs(symbolOf(superClassMethod)); + assertThat(symbolOf(superClassMethod).usages()) .containsExactlyElementsOf(superClassMethod.symbol().usages()) .containsOnly(identifier); } @@ -614,7 +606,7 @@ void expression_pattern_instanceof() { .is("java.lang.String") .is(i.symbolType()); - assertThat(i.binding).isNotNull(); + assertThat(symbolOf(i)).isNotNull(); assertThat(i.symbol().declaration()).isEqualTo(v); } @@ -629,15 +621,15 @@ void expression_method_invocation() { ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(method.block()).body().get(0); MethodInvocationTreeImpl methodInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(methodInvocation.methodBinding) + assertThat(symbolOf(methodInvocation)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) methodInvocation.methodSymbol().declaration()).methodBinding) - .isSameAs(method.methodBinding); + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) methodInvocation.methodSymbol().declaration()))) + .isSameAs(symbolOf(method)); IdentifierTreeImpl i = (IdentifierTreeImpl) methodInvocation.methodSelect(); - assertThat(i.binding) - .isSameAs(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(methodInvocation.methodBinding); - assertThat(cu.sema.usages.get(i.binding)) + assertThat(symbolOf(i)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(methodInvocation)); + assertThat(symbolOf(i).usages()) .containsExactlyElementsOf(methodInvocation.methodSymbol().usages()) .containsOnly(i); } @@ -652,13 +644,10 @@ void expression_method_invocation_recovery() { MethodTreeImpl method = (MethodTreeImpl) c.members().get(0); ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(method.block()).body().get(0); MethodInvocationTreeImpl methodInvocation = Objects.requireNonNull((MethodInvocationTreeImpl) s.expression()); - assertThat(methodInvocation.methodBinding) - .isNull(); + assertThat(symbolOf(methodInvocation)).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); IdentifierTreeImpl i = (IdentifierTreeImpl) methodInvocation.methodSelect(); - assertThat(i.binding) - .isNull(); - assertThat(cu.sema.usages.get(Objects.requireNonNull(method.methodBinding))) - .isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); + assertThat(symbolOf(method).usages()).isEmpty(); } /** @@ -674,23 +663,23 @@ void expression_super_method_invocation() { ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MethodInvocationTreeImpl superMethodInvocation = (MethodInvocationTreeImpl) Objects.requireNonNull(s.expression()); - assertThat(superMethodInvocation.methodBinding) + assertThat(symbolOf(superMethodInvocation)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) superMethodInvocation.methodSymbol().declaration()).methodBinding) - .isSameAs(superClassMethod.methodBinding); + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) superMethodInvocation.methodSymbol().declaration()))) + .isSameAs(symbolOf(superClassMethod)); MemberSelectExpressionTreeImpl e2 = (MemberSelectExpressionTreeImpl) superMethodInvocation.methodSelect(); KeywordSuper keywordSuper = (KeywordSuper) e2.expression(); assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(superClass.symbol().declaration()); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(c.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(c).symbol()).superSymbol); IdentifierTreeImpl i = (IdentifierTreeImpl) e2.identifier(); - assertThat(i.binding) - .isSameAs(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(superMethodInvocation.methodBinding); - assertThat(cu.sema.usages.get(i.binding)) + assertThat(symbolOf(i)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(superMethodInvocation)); + assertThat(symbolOf(i).usages()) .containsExactlyElementsOf(superMethodInvocation.methodSymbol().usages()) .containsOnly(i); } @@ -708,14 +697,11 @@ void expression_super_method_invocation_recovery() { ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MethodInvocationTreeImpl superMethodInvocation = (MethodInvocationTreeImpl) Objects.requireNonNull(s.expression()); - assertThat(superMethodInvocation.methodBinding) - .isNull(); + assertThat(symbolOf(superMethodInvocation)).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); MemberSelectExpressionTreeImpl e = (MemberSelectExpressionTreeImpl) superMethodInvocation.methodSelect(); IdentifierTreeImpl i = (IdentifierTreeImpl) e.identifier(); - assertThat(i.binding) - .isNull(); - assertThat(cu.sema.usages.get(Objects.requireNonNull(superClassMethod.methodBinding))) - .isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); + assertThat(symbolOf(superClassMethod).usages()).isEmpty(); } /** @@ -732,34 +718,32 @@ void expression_super_method_invocation_qualified() { ReturnStatementTree s = (ReturnStatementTree) Objects.requireNonNull(m.block()).body().get(0); MethodInvocationTreeImpl superMethodInvocation = (MethodInvocationTreeImpl) Objects.requireNonNull(s.expression()); - assertThat(superMethodInvocation.methodBinding) + assertThat(symbolOf(superMethodInvocation)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) superMethodInvocation.methodSymbol().declaration()).methodBinding) - .isSameAs(superClassMethod.methodBinding); + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) superMethodInvocation.methodSymbol().declaration()))) + .isSameAs(symbolOf(superClassMethod)); MemberSelectExpressionTreeImpl qualifiedMethodName = (MemberSelectExpressionTreeImpl) superMethodInvocation.methodSelect(); assertThat(qualifiedMethodName.symbolType().isUnknown()) .isTrue(); - assertThat(qualifiedMethodName.typeBinding) - .isNull(); + assertThat(typeOf(qualifiedMethodName)).isSameAs(Type.UNKNOWN); MemberSelectExpressionTreeImpl qualifiedSuper = (MemberSelectExpressionTreeImpl) qualifiedMethodName.expression(); - assertThat(qualifiedSuper.typeBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((ClassTreeImpl) qualifiedSuper.symbolType().symbol().declaration()).typeBinding) - .isSameAs(superClass.typeBinding); + assertThat(typeOf(qualifiedSuper)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull((ClassTreeImpl) qualifiedSuper.symbolType().symbol().declaration()))) + .isSameAs(typeOf(superClass)); KeywordSuper keywordSuper = (KeywordSuper) qualifiedSuper.identifier(); assertThat(keywordSuper.symbolType().symbol().declaration()) .isSameAs(superClass); assertThat(keywordSuper.symbol()) - .isSameAs(cu.sema.typeSymbol(t.typeBinding).superSymbol); + .isSameAs(((JTypeSymbol) typeOf(t).symbol()).superSymbol); IdentifierTreeImpl identifier = (IdentifierTreeImpl) qualifiedMethodName.identifier(); - assertThat(identifier.binding) - .isSameAs(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()).methodBinding) - .isSameAs(superMethodInvocation.methodBinding); - assertThat(cu.sema.usages.get(identifier.binding)) + assertThat(symbolOf(identifier)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(superMethodInvocation)); + assertThat(symbolOf(identifier).usages()) .containsExactlyElementsOf(superMethodInvocation.methodSymbol().usages()) .containsOnly(identifier); } @@ -783,7 +767,7 @@ default void forEach(java.util.function.Consumer action) { MemberSelectExpressionTreeImpl iterableSuper = (MemberSelectExpressionTreeImpl) iterableSuperForeach.expression(); IdentifierTreeImpl superKeyword = (IdentifierTreeImpl) iterableSuper.identifier(); - assertThat(superKeyword.typeBinding).isNotNull(); + assertThat(typeOf(superKeyword)).isNotSameAs(Type.UNKNOWN); assertThat(superKeyword.symbolType().fullyQualifiedName()).isEqualTo("java.lang.Iterable"); } @@ -804,7 +788,7 @@ class A { var lambda = (LambdaExpressionTree) f.initializer(); var p = (VariableTreeImpl) lambda.parameters().get(0); - Symbol newSymbol = cu.sema.variableSymbol(p.variableBinding); + Symbol newSymbol = ((JVariableSymbol) symbolOf(p)); assertThat(newSymbol.declaration().firstToken().range().start().line()).isEqualTo(3); Symbol newOwner = newSymbol.owner(); assertTrue(newOwner instanceof JMethodSymbol methodSymbol && methodSymbol.isLambda()); @@ -835,7 +819,7 @@ void foo() { VariableTreeImpl p = (VariableTreeImpl) lambda.parameters().get(0); // owner of lambda parameter is the field or variable to which it is assigned - Symbol newSymbol = cu.sema.variableSymbol(p.variableBinding); + Symbol newSymbol = ((JVariableSymbol) symbolOf(p)); Symbol newOwner = newSymbol.owner(); assertTrue(newOwner instanceof JMethodSymbol methodSymbol && methodSymbol.isLambda()); } @@ -864,8 +848,8 @@ void m() { ReturnStatementTreeImpl r = (ReturnStatementTreeImpl) body.body().get(0); LambdaExpressionTreeImpl l2 = (LambdaExpressionTreeImpl) r.expression(); - assertThat(l2.typeBinding).isNotNull(); - assertThat(cu.sema.type(l2.typeBinding).is("java.util.function.Supplier")).isTrue(); + assertThat(typeOf(l2)).isNotSameAs(Type.UNKNOWN); + assertThat(((JType) typeOf(l2)).is("java.util.function.Supplier")).isTrue(); } /** @@ -890,16 +874,16 @@ void foo(Class[] arr1, Class[] arr2, boolean IdentifierTreeImpl c1 = (IdentifierTreeImpl) cond.trueExpression(); IdentifierTreeImpl c2 = (IdentifierTreeImpl) cond.falseExpression(); - assertThat(cond.typeBinding).isNotNull(); - JType tcond = cu.sema.type(cond.typeBinding); + assertThat(typeOf(cond)).isNotSameAs(Type.UNKNOWN); + JType tcond = ((JType) typeOf(cond)); assertThat(tcond.is("java.lang.Class[]")).isTrue(); - assertThat(c1.typeBinding).isNotNull(); - JType tc1 = cu.sema.type(c1.typeBinding); + assertThat(typeOf(c1)).isNotSameAs(Type.UNKNOWN); + JType tc1 = ((JType) typeOf(c1)); assertThat(tc1.is("java.lang.Class[]")).isTrue(); - assertThat(c2.typeBinding).isNotNull(); - JType tc2 = cu.sema.type(c2.typeBinding); + assertThat(typeOf(c2)).isNotSameAs(Type.UNKNOWN); + JType tc2 = ((JType) typeOf(c2)); assertThat(tc2.is("java.lang.Class[]")).isTrue(); assertThat(tc2) @@ -919,19 +903,18 @@ void statement_constructor_invocation() { ExpressionStatementTree s = (ExpressionStatementTree) m.block().body().get(0); MethodInvocationTreeImpl constructorInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(constructorInvocation.methodBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) constructorInvocation.methodSymbol().declaration()).methodBinding) - .isSameAs(constructor2.methodBinding); - assertThat(constructorInvocation.typeBinding) + assertThat(symbolOf(constructorInvocation)) .isNotNull() - .isSameAs(Objects.requireNonNull(((ClassTreeImpl) constructorInvocation.symbolType().symbol().declaration())).typeBinding) - .isSameAs(c.typeBinding); + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) constructorInvocation.methodSymbol().declaration()))) + .isSameAs(symbolOf(constructor2)); + assertThat(typeOf(constructorInvocation)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull(((ClassTreeImpl) constructorInvocation.symbolType().symbol().declaration())))) + .isSameAs(typeOf(c)); IdentifierTreeImpl i = (IdentifierTreeImpl) constructorInvocation.methodSelect(); - assertThat(i.binding) - .isSameAs(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(constructorInvocation.methodBinding); - assertThat(cu.sema.usages.get(i.binding)) + assertThat(symbolOf(i)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(constructorInvocation)); + assertThat(symbolOf(i).usages()) .containsExactlyElementsOf(constructorInvocation.methodSymbol().usages()) .containsOnly(i); } @@ -947,16 +930,12 @@ void statement_constructor_invocation_recovery() { ExpressionStatementTree s = (ExpressionStatementTree) Objects.requireNonNull(m.block()).body().get(0); MethodInvocationTreeImpl constructorInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(constructorInvocation.methodBinding) - .isNull(); - assertThat(constructorInvocation.typeBinding) - .isNotNull() - .isSameAs(c.typeBinding); + assertThat(symbolOf(constructorInvocation)).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); + assertThat(typeOf(constructorInvocation)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(c)); IdentifierTreeImpl i = (IdentifierTreeImpl) constructorInvocation.methodSelect(); - assertThat(i.binding) - .isNull(); - assertThat(cu.sema.usages.get(Objects.requireNonNull(m.methodBinding))) - .isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); + assertThat(symbolOf(m).usages()).isEmpty(); } /** @@ -972,19 +951,18 @@ void statement_super_constructor_invocation() { ExpressionStatementTree s = (ExpressionStatementTree) m.block().body().get(0); MethodInvocationTreeImpl superConstructorInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(superConstructorInvocation.methodBinding) - .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) superConstructorInvocation.methodSymbol().declaration()).methodBinding) - .isSameAs(superClassConstructor.methodBinding); - assertThat(superConstructorInvocation.typeBinding) + assertThat(symbolOf(superConstructorInvocation)) .isNotNull() - .isSameAs(Objects.requireNonNull(((ClassTreeImpl) superConstructorInvocation.symbolType().symbol().declaration())).typeBinding) - .isSameAs(superClass.typeBinding); + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) superConstructorInvocation.methodSymbol().declaration()))) + .isSameAs(symbolOf(superClassConstructor)); + assertThat(typeOf(superConstructorInvocation)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(Objects.requireNonNull(((ClassTreeImpl) superConstructorInvocation.symbolType().symbol().declaration())))) + .isSameAs(typeOf(superClass)); IdentifierTreeImpl i = (IdentifierTreeImpl) superConstructorInvocation.methodSelect(); - assertThat(i.binding) - .isSameAs(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(superConstructorInvocation.methodBinding); - assertThat(cu.sema.usages.get(i.binding)) + assertThat(symbolOf(i)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(superConstructorInvocation)); + assertThat(symbolOf(i).usages()) .containsExactlyElementsOf(superClassConstructor.symbol().usages()) .containsOnly(i); } @@ -1002,16 +980,12 @@ void statement_super_constructor_invocation_recovery() { ExpressionStatementTree s = (ExpressionStatementTree) Objects.requireNonNull(m.block()).body().get(0); MethodInvocationTreeImpl superConstructorInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(superConstructorInvocation.methodBinding) - .isNull(); - assertThat(superConstructorInvocation.typeBinding) - .isNotNull() - .isSameAs(superClass.typeBinding); + assertThat(symbolOf(superConstructorInvocation)).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); + assertThat(typeOf(superConstructorInvocation)).isNotSameAs(Type.UNKNOWN) + .isSameAs(typeOf(superClass)); IdentifierTreeImpl i = (IdentifierTreeImpl) superConstructorInvocation.methodSelect(); - assertThat(i.binding) - .isNull(); - assertThat(cu.sema.usages.get(Objects.requireNonNull(superClassConstructor.methodBinding))) - .isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); + assertThat(symbolOf(superClassConstructor).usages()).isEmpty(); } @Test @@ -1020,14 +994,14 @@ void statement_variable_declaration() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); VariableTreeImpl s = (VariableTreeImpl) m.block().body().get(0); - assertThat(s.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(s.variableBinding)).isSameAs(s); + assertThat(symbolOf(s)).isNotNull(); + assertThat(symbolOf(s).declaration()).isSameAs(s); assertThat(s.symbol().isUnknown()).isFalse(); assertThat(s.symbol().name()).isEqualTo("v"); // simulate a variable binding problem - s.variableBinding = null; + s.setSymbol(Symbol.UNKNOWN_SYMBOL); assertThat(s.symbol().isUnknown()).isTrue(); } @@ -1039,8 +1013,8 @@ void statement_for() { MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); ForStatementTreeImpl s = (ForStatementTreeImpl) m.block().body().get(0); VariableTreeImpl v = (VariableTreeImpl) s.initializer().get(0); - assertThat(v.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(v.variableBinding)).isSameAs(v); + assertThat(symbolOf(v)).isNotNull(); + assertThat(symbolOf(v).declaration()).isSameAs(v); } /** @@ -1052,11 +1026,10 @@ void declaration_import() { JavaTree.ImportTreeImpl i = (JavaTree.ImportTreeImpl) cu.imports().get(0); MemberSelectExpressionTreeImpl qualifiedName = (MemberSelectExpressionTreeImpl) i.qualifiedIdentifier(); IdentifierTreeImpl identifier = (IdentifierTreeImpl) qualifiedName.identifier(); - assertThat(identifier.binding) - .isNull(); - assertThat(i.binding) + assertThat(symbolOf(identifier)).isSameAs(Symbol.UNKNOWN_SYMBOL); + assertThat(symbolOf(i)) .isNotNull(); - assertThat(cu.sema.typeSymbol((ITypeBinding) i.binding).usages()) + assertThat(symbolOf(i).usages()) .isEmpty(); } @@ -1064,17 +1037,16 @@ void declaration_import() { void declaration_type() { JavaTree.CompilationUnitTreeImpl cu = test("class C { }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); - assertThat(c.typeBinding).isNotNull(); - assertThat(cu.sema.declarations.get(c.typeBinding)).isSameAs(c); + assertThat(typeOf(c)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(c).symbol().declaration()).isSameAs(c); TypeParameterTreeImpl typeParameter = (TypeParameterTreeImpl) c.typeParameters().get(0); - assertThat(typeParameter.typeBinding) - .isNotNull(); + assertThat(typeOf(typeParameter)).isNotSameAs(Type.UNKNOWN); assertThat(typeParameter.symbol().isUnknown()).isFalse(); assertThat(typeParameter.symbol().name()).isEqualTo("T"); // simulate a type binding problem - typeParameter.typeBinding = null; + typeParameter.setSymbol(Symbol.UNKNOWN_SYMBOL); assertThat(typeParameter.symbol().isUnknown()).isTrue(); } @@ -1154,14 +1126,13 @@ void declaration_type_parameterized() { AbstractTypedTree fieldType = (AbstractTypedTree) ((VariableTreeImpl) c.members().get(0)).type(); IdentifierTreeImpl i = (IdentifierTreeImpl) ((ParameterizedTypeTree) fieldType).type(); - assertThat(cu.sema.usages.get(c.typeBinding)) + assertThat(typeOf(c).symbol().usages()) .containsOnly(i); - assertThat(fieldType.typeBinding) - .isNotNull(); - assertThat(cu.sema.typeSymbol(fieldType.typeBinding).declaration()) + assertThat(typeOf(fieldType)).isNotSameAs(Type.UNKNOWN); + assertThat(((JTypeSymbol) typeOf(fieldType).symbol()).declaration()) .isSameAs(fieldType.symbolType().symbol().declaration()) .isSameAs(c); - assertThat(cu.sema.typeSymbol(fieldType.typeBinding).usages()) + assertThat(((JTypeSymbol) typeOf(fieldType).symbol()).usages()) .containsExactlyElementsOf(fieldType.symbolType().symbol().usages()) .containsOnly(i); } @@ -1175,17 +1146,17 @@ void declaration_enum_constant() { ClassTree e = (ClassTree) cu.types().get(0); VariableTreeImpl c = (VariableTreeImpl) e.members().get(0); MethodTreeImpl constructor = (MethodTreeImpl) e.members().get(1); - assertThat(c.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(c.variableBinding)) + assertThat(symbolOf(c)).isNotNull(); + assertThat(symbolOf(c).declaration()) .isSameAs(c.symbol().declaration()) .isSameAs(c); NewClassTreeImpl initializer = Objects.requireNonNull((NewClassTreeImpl) c.initializer()); IdentifierTreeImpl i = (IdentifierTreeImpl) initializer.getConstructorIdentifier(); - assertThat(i.binding) + assertThat(symbolOf(i)) .isNotNull() - .isSameAs(((MethodTreeImpl) i.symbol().declaration()).methodBinding) - .isSameAs(constructor.methodBinding); - assertThat(cu.sema.usages.get(constructor.methodBinding)) + .isSameAs(symbolOf(((MethodTreeImpl) i.symbol().declaration()))) + .isSameAs(symbolOf(constructor)); + assertThat(symbolOf(constructor).usages()) .containsOnly(i); } @@ -1199,7 +1170,7 @@ void declaration_enum_constant_recovered_constructor() { VariableTreeImpl c = (VariableTreeImpl) e.members().get(0); NewClassTreeImpl initializer = Objects.requireNonNull((NewClassTreeImpl) c.initializer()); IdentifierTreeImpl i = (IdentifierTreeImpl) initializer.getConstructorIdentifier(); - assertThat(i.binding).isNull(); + assertThat(symbolOf(i)).isSameAs(Symbol.UNKNOWN_SYMBOL); assertThat(i.symbol().isUnknown()).isTrue(); } @@ -1212,24 +1183,24 @@ void declaration_enum_constant_anonymous() { ClassTree e = (ClassTree) cu.types().get(0); MethodTreeImpl constructor = (MethodTreeImpl) e.members().get(1); VariableTreeImpl c = (VariableTreeImpl) e.members().get(0); - assertThat(c.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(c.variableBinding)) + assertThat(symbolOf(c)).isNotNull(); + assertThat(symbolOf(c).declaration()) .isSameAs(c.symbol().declaration()) .isSameAs(c); NewClassTreeImpl initializer = (NewClassTreeImpl) c.initializer(); ClassTreeImpl enumConstantBody = (ClassTreeImpl) initializer.classBody(); - assertThat(enumConstantBody.typeBinding).isNotNull(); - assertThat(cu.sema.declarations.get(enumConstantBody.typeBinding)) + assertThat(typeOf(enumConstantBody)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(enumConstantBody).symbol().declaration()) .isSameAs(enumConstantBody.symbol().declaration()) .isSameAs(enumConstantBody); IdentifierTreeImpl identifier = (IdentifierTreeImpl) initializer.getConstructorIdentifier(); - assertThat(identifier.binding) + assertThat(symbolOf(identifier)) .isNotNull() - .isSameAs(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()).methodBinding) - .isSameAs(constructor.methodBinding); - assertThat(cu.sema.usages.get(constructor.methodBinding)) + .isSameAs(symbolOf(Objects.requireNonNull((MethodTreeImpl) identifier.symbol().declaration()))) + .isSameAs(symbolOf(constructor)); + assertThat(symbolOf(constructor).usages()) .containsExactlyElementsOf(constructor.symbol().usages()) .containsOnly(identifier); } @@ -1239,8 +1210,8 @@ void declaration_method() { JavaTree.CompilationUnitTreeImpl cu = test("class C { void m() {} }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - assertThat(m.methodBinding).isNotNull(); - assertThat(cu.sema.declarations.get(m.methodBinding)).isSameAs(m); + assertThat(symbolOf(m)).isNotNull(); + assertThat(symbolOf(m).declaration()).isSameAs(m); } /** @@ -1256,14 +1227,14 @@ void declaration_method_parameterized() { MethodInvocationTreeImpl methodInvocation = (MethodInvocationTreeImpl) s.expression(); IdentifierTreeImpl i = (IdentifierTreeImpl) methodInvocation.methodSelect(); - assertThat(cu.sema.usages.get(m.methodBinding)) + assertThat(symbolOf(m).usages()) .containsOnly(i); - assertThat(methodInvocation.methodBinding) + assertThat(symbolOf(methodInvocation)) .isNotNull(); - assertThat(cu.sema.methodSymbol(methodInvocation.methodBinding).declaration()) + assertThat(((JMethodSymbol) symbolOf(methodInvocation)).declaration()) .isSameAs(methodInvocation.methodSymbol().declaration()) .isSameAs(m); - assertThat(cu.sema.methodSymbol(methodInvocation.methodBinding).usages()) + assertThat(((JMethodSymbol) symbolOf(methodInvocation)).usages()) .containsExactlyElementsOf(methodInvocation.methodSymbol().usages()) .containsOnly(i); } @@ -1281,7 +1252,7 @@ private java.util.Collection> samples() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - assertThat(m.methodBinding).isNull(); + assertThat(symbolOf(m)).isSameAs(Symbol.MethodSymbol.UNKNOWN_METHOD); MethodSymbol recovered = m.symbol(); assertThat(recovered.isUnknown()).isTrue(); @@ -1351,8 +1322,8 @@ void declaration_parameter() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); VariableTreeImpl p = (VariableTreeImpl) m.parameters().get(0); - assertThat(p.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(p.variableBinding)).isSameAs(p); + assertThat(symbolOf(p)).isNotNull(); + assertThat(symbolOf(p).declaration()).isSameAs(p); } @Test @@ -1360,8 +1331,8 @@ void declaration_field() { JavaTree.CompilationUnitTreeImpl cu = test("class C { int f; }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); VariableTreeImpl f = (VariableTreeImpl) c.members().get(0); - assertThat(f.variableBinding).isNotNull(); - assertThat(cu.sema.declarations.get(f.variableBinding)).isSameAs(f); + assertThat(symbolOf(f)).isNotNull(); + assertThat(symbolOf(f).declaration()).isSameAs(f); } @Test @@ -1373,10 +1344,10 @@ void declaration_lambda_parameter() { MethodInvocationTreeImpl i = (MethodInvocationTreeImpl) s.expression(); LambdaExpressionTree e = (LambdaExpressionTree) i.arguments().get(0); VariableTreeImpl v = (VariableTreeImpl) e.parameters().get(0); - assertThat(v.variableBinding).isNotNull(); + assertThat(symbolOf(v)).isNotNull(); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(cu.sema.declarations.get(v.variableBinding)).isSameAs(v); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(symbolOf(v).declaration()).isSameAs(v); } @Test @@ -1384,8 +1355,8 @@ void declaration_annotation_member() { JavaTree.CompilationUnitTreeImpl cu = test("@interface A { String m(); }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); - assertThat(m.methodBinding).isNotNull(); - assertThat(cu.sema.declarations.get(m.methodBinding)).isSameAs(m); + assertThat(symbolOf(m)).isNotNull(); + assertThat(symbolOf(m).declaration()).isSameAs(m); } @ParameterizedTest(name="[{index}] Type bindings of variable v should not be null in \"{0}\"") @@ -1401,7 +1372,7 @@ void test_abstract_type_tree_is_not_null(String source) { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); VariableTreeImpl v = (VariableTreeImpl) c.members().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); } @Test @@ -1410,11 +1381,11 @@ void type_array() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); VariableTreeImpl v = (VariableTreeImpl) c.members().get(0); JavaTree.ArrayTypeTreeImpl t = (JavaTree.ArrayTypeTreeImpl) v.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(t.typeBinding.getDimensions()).isEqualTo(2); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(t)).is("int[][]"); t = (JavaTree.ArrayTypeTreeImpl) t.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(t.typeBinding.getDimensions()).isEqualTo(1); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(t)).is("int[]"); } @Test @@ -1424,7 +1395,7 @@ void type_wildcard() { VariableTreeImpl v = (VariableTreeImpl) c.members().get(0); ParameterizedTypeTree p = (ParameterizedTypeTree) v.type(); AbstractTypedTree t = ((AbstractTypedTree) p.typeArguments().get(0)); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); } /** @@ -1466,11 +1437,11 @@ void type_try_with_resource() { TryStatementTree s = (TryStatementTree) m.block().body().get(0); VariableTreeImpl v = (VariableTreeImpl) s.resourceList().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); JType t2 = (JType) v.symbol().type(); assertThat(t2).isNotNull(); assertThat(t2.isUnknown()).isTrue(); - assertThat(t2.typeBinding).isNotNull(); + assertThat(t2).isNotSameAs(Type.UNKNOWN); } { // C not recognized as closeable @@ -1480,7 +1451,7 @@ void type_try_with_resource() { TryStatementTree s = (TryStatementTree) m.block().body().get(0); VariableTreeImpl v = (VariableTreeImpl) s.resourceList().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); Type type = v.symbol().type(); assertThat(type).isNotNull(); assertThat(type.isUnknown()).isTrue(); @@ -1495,7 +1466,7 @@ void type_union() { TryStatementTree s = (TryStatementTree) m.block().body().get(0); VariableTreeImpl v = (VariableTreeImpl) s.catches().get(0).parameter(); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); Type symbolType = t.symbolType(); assertThat(symbolType).isNotNull(); assertThat(symbolType.isUnknown()).isFalse(); @@ -1513,7 +1484,7 @@ void type_intersection_in_cast_expression() { MethodTree m = (MethodTree) c.members().get(0); VariableTreeImpl v = (VariableTreeImpl) m.block().body().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); Type symbolType = t.symbolType(); assertThat(symbolType).isNotNull(); assertThat(symbolType.fullyQualifiedName()).isEqualTo("java.lang.AutoCloseable & java.lang.Cloneable & java.lang.Comparable"); @@ -1554,7 +1525,7 @@ void type_var() { MethodTree m = (MethodTree) c.members().get(0); VariableTreeImpl v = (VariableTreeImpl) m.block().body().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); } @Test @@ -1563,11 +1534,11 @@ void type_extra_dimensions() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); VariableTreeImpl v = (VariableTreeImpl) c.members().get(0); JavaTree.ArrayTypeTreeImpl t = (JavaTree.ArrayTypeTreeImpl) v.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(t.typeBinding.getDimensions()).isEqualTo(2); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(t)).is("I[][]"); t = (JavaTree.ArrayTypeTreeImpl) t.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(t.typeBinding.getDimensions()).isEqualTo(1); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(t)).is("I[]"); } @Test @@ -1577,8 +1548,8 @@ void type_vararg() { MethodTree m = (MethodTree) c.members().get(0); VariableTreeImpl v = (VariableTreeImpl) m.parameters().get(0); AbstractTypedTree t = (AbstractTypedTree) v.type(); - assertThat(t.typeBinding).isNotNull(); - assertThat(t.typeBinding.getDimensions()).isEqualTo(2); + assertThat(typeOf(t)).isNotSameAs(Type.UNKNOWN); + assertThat(typeOf(t)).is("int[][]"); } @Test @@ -1586,7 +1557,7 @@ void symbol_unknown() { JavaTree.CompilationUnitTreeImpl cu = test("class A implements UnknownInterface { }"); ClassTree c = (ClassTree) cu.types().get(0); IdentifierTreeImpl i = (IdentifierTreeImpl) c.superInterfaces().get(0); - Symbol s = cu.sema.typeSymbol(Objects.requireNonNull((ITypeBinding) i.binding)); + Symbol s = symbolOf(i); assertThat(s.isUnknown()) .isEqualTo(i.symbol().isUnknown()) .isTrue(); @@ -1607,10 +1578,10 @@ void annotation_on_type() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); VariableTreeImpl parameter = (VariableTreeImpl) m.parameters().get(0); - assertThat(cu.sema.variableSymbol(parameter.variableBinding).metadata().annotations().size()) + assertThat(((JVariableSymbol) symbolOf(parameter)).metadata().annotations().size()) .isEqualTo(parameter.symbol().metadata().annotations().size()) .isEqualTo(1); - assertThat(JUtils.parameterAnnotations(cu.sema.methodSymbol(Objects.requireNonNull(m.methodBinding)), 0).annotations().size()) + assertThat(JUtils.parameterAnnotations(((JMethodSymbol) symbolOf(m)), 0).annotations().size()) .isEqualTo(JUtils.parameterAnnotations(m.symbol(), 0).annotations().size()) .isEqualTo(1); } @@ -1652,8 +1623,6 @@ void statement_break() { .isInstanceOf(Symbol.LabelSymbol.class) .isInstanceOf(Symbol.class) .isSameAs(l.labelSymbol); - assertThat(i.binding) - .isNull(); assertThat(i.symbol()) .isInstanceOf(Symbol.LabelSymbol.class) @@ -1683,8 +1652,6 @@ void statement_continue() { assertThat(l.labelSymbol) .isNotNull() .isSameAs(i.labelSymbol); - assertThat(i.binding) - .isNull(); assertThat(l.labelSymbol.declaration) .isSameAs(i.labelSymbol.declaration) .isSameAs(l); @@ -1705,8 +1672,6 @@ void nested() { assertThat(l1.labelSymbol) .isNotNull() .isSameAs(i1.labelSymbol); - assertThat(i1.binding) - .isNull(); assertThat(l1.labelSymbol.declaration) .isSameAs(i1.labelSymbol.declaration) .isSameAs(l1); @@ -1723,8 +1688,6 @@ void nested() { assertThat(l2.labelSymbol) .isNotNull() .isSameAs(i2.labelSymbol); - assertThat(i2.binding) - .isNull(); assertThat(l2.labelSymbol.declaration) .isSameAs(i2.labelSymbol.declaration) .isSameAs(l2); diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java b/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java index 57d8dfeb19b..97b682df182 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JParserTest.java @@ -92,8 +92,8 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -150,7 +150,7 @@ void err() { void unknown_types_are_collected() { // import org.foo missing, type Bar unknown CompilationUnitTree cut = test("import org.foo.Bar;\n class Foo {\n void foo(Bar b) {}\n }\n"); - assertThat(((CompilationUnitTreeImpl) cut).sema.undefinedTypes.stream().map(Object::toString)) + assertThat(((CompilationUnitTreeImpl) cut).undefinedTypes().stream().map(Object::toString)) .containsExactlyInAnyOrder("The import org.foo cannot be resolved", "Bar cannot be resolved to a type"); } @@ -158,7 +158,7 @@ void unknown_types_are_collected() { void warnings_are_collected() { // import org.foo missing, type Bar unknown CompilationUnitTree cut = test("import java.util.List;\n import java.util.ArrayList;\n class Foo {\n void foo(Bar b) {}\n }\n"); - assertThat(((CompilationUnitTreeImpl) cut).sema.undefinedTypes.stream().map(Object::toString)) + assertThat(((CompilationUnitTreeImpl) cut).undefinedTypes().stream().map(Object::toString)) .containsExactlyInAnyOrder("Bar cannot be resolved to a type"); } @@ -470,7 +470,6 @@ record Box(int value) {} assertThat(variableTree.simpleName().isUnnamedVariable()).isTrue(); } - @Test void unnamed_pattern() { CompilationUnitTree t = test(""" diff --git a/java-frontend/src/test/java/org/sonar/java/model/JParserTestUtils.java b/java-frontend/src/test/java/org/sonar/java/model/JParserTestUtils.java index 5224a7e09ec..663cd164410 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JParserTestUtils.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JParserTestUtils.java @@ -26,9 +26,22 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import org.eclipse.jdt.core.dom.IMethodBinding; +import org.eclipse.jdt.core.dom.ITypeBinding; import org.sonar.java.test.classpath.TestClasspathUtils; import org.sonar.plugins.java.api.JavaVersion; +import org.sonar.plugins.java.api.semantic.Symbol; +import org.sonar.plugins.java.api.semantic.Type; +import org.sonar.plugins.java.api.tree.ClassTree; import org.sonar.plugins.java.api.tree.CompilationUnitTree; +import org.sonar.plugins.java.api.tree.ExpressionTree; +import org.sonar.plugins.java.api.tree.IdentifierTree; +import org.sonar.plugins.java.api.tree.LambdaExpressionTree; +import org.sonar.plugins.java.api.tree.MethodInvocationTree; +import org.sonar.plugins.java.api.tree.MethodTree; +import org.sonar.plugins.java.api.tree.Tree; +import org.sonar.plugins.java.api.tree.TypeTree; +import org.sonar.plugins.java.api.tree.VariableTree; import static org.assertj.core.api.Assertions.assertThat; @@ -38,6 +51,44 @@ private JParserTestUtils() { // Utility class } + public static Type typeOf(Tree tree) { + return switch (tree) { + case TypeTree type -> type.symbolType(); + case ExpressionTree expression -> expression.symbolType(); + default -> symbolOf(tree).type(); + }; + } + + public static Symbol symbolOf(Tree tree) { + return switch (tree) { + case ClassTree declaration -> declaration.symbol(); + case MethodTree declaration -> declaration.symbol(); + case VariableTree declaration -> declaration.symbol(); + case IdentifierTree identifier -> identifier.symbol(); + case MethodInvocationTree invocation -> invocation.methodSymbol(); + case LambdaExpressionTree lambda -> lambda.symbol(); + case TypeParameterTreeImpl parameter -> parameter.symbol(); + case JavaTree.ImportTreeImpl importTree -> importTree.symbol(); + default -> throw new IllegalArgumentException(tree.kind().name()); + }; + } + + public static JSema sema(CompilationUnitTree tree) { + return (JSema) ((JavaTree.CompilationUnitTreeImpl) tree).sema; + } + + public static ITypeBinding typeBinding(ClassTree tree) { + return ((JType) tree.symbol().type()).typeBinding; + } + + public static IMethodBinding methodBinding(MethodTree tree) { + return tree.symbol() instanceof JMethodSymbol symbol ? symbol.methodBinding() : null; + } + + public static IMethodBinding methodBinding(MethodInvocationTree tree) { + return tree.methodSymbol() instanceof JMethodSymbol symbol ? symbol.methodBinding() : null; + } + public static final List DEFAULT_CLASSPATH = Arrays.asList(new File("target/test-classes"), new File("target/classes")); public static final Path CHECKS_TEST_DIR = Paths.get("..", "java-checks-test-sources", "default"); diff --git a/java-frontend/src/test/java/org/sonar/java/model/JSymbolMetadataTest.java b/java-frontend/src/test/java/org/sonar/java/model/JSymbolMetadataTest.java index 60a2f838c2f..7198d5176f4 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JSymbolMetadataTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JSymbolMetadataTest.java @@ -44,6 +44,7 @@ import org.sonar.plugins.java.api.tree.Tree; import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.java.model.JParserTestUtils.typeOf; import static org.sonar.plugins.java.api.semantic.SymbolMetadata.NullabilityLevel.CLASS; import static org.sonar.plugins.java.api.semantic.SymbolMetadata.NullabilityLevel.METHOD; import static org.sonar.plugins.java.api.semantic.SymbolMetadata.NullabilityLevel.PACKAGE; @@ -68,7 +69,7 @@ class JSymbolMetadataTest { void should_convert_annotation_values() { JavaTree.CompilationUnitTreeImpl cu = test("import java.lang.annotation.*; @Target({ElementType.TYPE, ElementType.METHOD}) @interface A { }"); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); - Object[] value = (Object[]) cu.sema.typeSymbol(c.typeBinding).metadata().annotations().get(0).values().get(0).value(); + Object[] value = (Object[]) ((JTypeSymbol) typeOf(c).symbol()).metadata().annotations().get(0).values().get(0).value(); assertThat(value).hasSize(2); assertThat(((JVariableSymbol) value[0]).isEnum()).isTrue(); assertThat(((JVariableSymbol) value[1]).isEnum()).isTrue(); diff --git a/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java index bb37c9cfca1..ccdd4d1e5a5 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JSymbolTest.java @@ -51,6 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.sonar.java.model.JParserTestUtils.sema; +import static org.sonar.java.model.JParserTestUtils.symbolOf; +import static org.sonar.java.model.JParserTestUtils.typeBinding; +import static org.sonar.java.model.JParserTestUtils.typeOf; import static org.sonar.java.model.assertions.SymbolAssert.assertThat; class JSymbolTest { @@ -62,13 +66,13 @@ void name() { MethodTreeImpl constructor = (MethodTreeImpl) c.members().get(0); MethodTreeImpl method = (MethodTreeImpl) c.members().get(1); - assertThat(cu.sema.typeSymbol(c.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c).symbol())) .hasSameNameAs(c.symbol()) .hasName("C"); - assertThat(cu.sema.methodSymbol(constructor.methodBinding)) + assertThat(((JMethodSymbol) symbolOf(constructor))) .hasSameNameAs(constructor.symbol()) .hasName(""); - assertThat(cu.sema.methodSymbol(method.methodBinding)) + assertThat(((JMethodSymbol) symbolOf(method))) .hasSameNameAs(method.symbol()) .hasName("m"); } @@ -84,39 +88,39 @@ void owner() { ClassTreeImpl c3 = (ClassTreeImpl) m.block().body().get(0); VariableTreeImpl u = (VariableTreeImpl) c3.members().get(0); - assertThat(cu.sema.typeSymbol(c1.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c1).symbol())) .as("of top-level class") - .hasOwner(cu.sema.packageSymbol(c1.typeBinding.getPackage())); + .hasOwner(sema(cu).packageSymbol(typeBinding(c1).getPackage())); - assertThat(cu.sema.typeSymbol(c2.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c2).symbol())) .as("of nested class") - .hasOwner(cu.sema.typeSymbol(c1.typeBinding)); + .hasOwner(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.typeSymbol(c3.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c3).symbol())) .as("of local class") - .hasOwner(cu.sema.methodSymbol(m.methodBinding)); + .hasOwner(((JMethodSymbol) symbolOf(m))); - assertThat(cu.sema.methodSymbol(m.methodBinding)) + assertThat(((JMethodSymbol) symbolOf(m))) .as("of method") - .hasOwner(cu.sema.typeSymbol(c1.typeBinding)); + .hasOwner(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.variableSymbol(f.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(f))) .as("of field") - .hasOwner(cu.sema.typeSymbol(c1.typeBinding)); + .hasOwner(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.variableSymbol(p.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(p))) .as("of method parameter") - .hasOwner(cu.sema.methodSymbol(m.methodBinding)); + .hasOwner(((JMethodSymbol) symbolOf(m))); - assertThat(cu.sema.typeSymbol(p.variableBinding.getType())) + assertThat(((JTypeSymbol) symbolOf(p).type().symbol())) .as("of type int") .hasOwner(Symbol.ROOT_PACKAGE) .hasSameHashCodeAs(p.type().symbolType().symbol().hashCode()); - assertThat(cu.sema.packageSymbol(null)) + assertThat(sema(cu).packageSymbol(null)) .isEqualTo(Symbol.ROOT_PACKAGE); - JType uType = cu.sema.type(u.variableBinding.getType()); + JType uType = ((JType) symbolOf(u).type()); Symbol.TypeSymbol uTypeSymbol = uType.symbol(); assertThat(uType.isUnknown()).isTrue(); assertThat(uTypeSymbol.isUnknown()).isTrue(); @@ -161,13 +165,13 @@ void owner_local_record() { ClassTreeImpl r = (ClassTreeImpl) m.block().body().get(0); VariableTreeImpl p = (VariableTreeImpl) r.recordComponents().get(0); - assertThat(cu.sema.variableSymbol(p.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(p))) .as("of record component") - .hasOwner(cu.sema.typeSymbol(r.typeBinding)); + .hasOwner(((JTypeSymbol) typeOf(r).symbol())); - assertThat(cu.sema.methodSymbol(m.methodBinding)) + assertThat(((JMethodSymbol) symbolOf(m))) .as("of method") - .hasOwner(cu.sema.typeSymbol(c1.typeBinding)); + .hasOwner(((JTypeSymbol) typeOf(c1).symbol())); } @Test @@ -210,8 +214,8 @@ void primitive_type_hash_code() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); VariableTreeImpl uField = (VariableTreeImpl) c.members().get(0); VariableTreeImpl vField = (VariableTreeImpl) c.members().get(1); - assertThat(cu.sema.typeSymbol(uField.variableBinding.getType())) - .hasSameHashCodeAs(cu.sema.typeSymbol(vField.variableBinding.getType())); + assertThat(((JTypeSymbol) symbolOf(uField).type().symbol())) + .hasSameHashCodeAs(((JTypeSymbol) symbolOf(vField).type().symbol())); } @Test @@ -224,29 +228,29 @@ void enclosingClass() { VariableTreeImpl p = (VariableTreeImpl) m.parameters().get(0); ClassTreeImpl c3 = (ClassTreeImpl) m.block().body().get(0); - assertThat(cu.sema.typeSymbol(c1.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c1).symbol())) .as("of top-level class") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.typeSymbol(c2.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c2).symbol())) .as("of nested class") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.typeSymbol(c3.typeBinding)) + assertThat(((JTypeSymbol) typeOf(c3).symbol())) .as("of local class") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.methodSymbol(m.methodBinding)) + assertThat(((JMethodSymbol) symbolOf(m))) .as("of method") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.variableSymbol(f.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(f))) .as("of field") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.variableSymbol(p.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(p))) .as("of method parameter") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); } @Test @@ -257,13 +261,13 @@ void record_enclosingClass() { ClassTreeImpl c2 = (ClassTreeImpl) c1.members().get(0); VariableTreeImpl p = (VariableTreeImpl) c2.recordComponents().get(0); - assertThat(cu.sema.variableSymbol(f.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(f))) .as("of field") - .hasEnclosingClass(cu.sema.typeSymbol(c1.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c1).symbol())); - assertThat(cu.sema.variableSymbol(p.variableBinding)) + assertThat(((JVariableSymbol) symbolOf(p))) .as("of method parameter") - .hasEnclosingClass(cu.sema.typeSymbol(c2.typeBinding)); + .hasEnclosingClass(((JTypeSymbol) typeOf(c2).symbol())); } @Test @@ -290,16 +294,16 @@ private void variable_in_class_initializer(boolean isStatic) { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); BlockTreeImpl b = (BlockTreeImpl) c.members().get(1); VariableTreeImpl v = (VariableTreeImpl) b.body().get(0); - Symbol.TypeSymbol t = cu.sema.typeSymbol(c.typeBinding); + Symbol.TypeSymbol t = ((JTypeSymbol) typeOf(c).symbol()); - JVariableSymbol variableSymbol = cu.sema.variableSymbol(v.variableBinding); + JVariableSymbol variableSymbol = ((JVariableSymbol) symbolOf(v)); assertThat(variableSymbol).isSameAs(v.symbol()); JInitializerBlockSymbol initializerBlock = (JInitializerBlockSymbol) variableSymbol.owner(); if (isStatic) { - assertThat(initializerBlock).isSameAs(cu.sema.staticInitializerBlockSymbol((JTypeSymbol) c.symbol())); + assertThat(initializerBlock).isSameAs(sema(cu).staticInitializerBlockSymbol((JTypeSymbol) c.symbol())); } else { - assertThat(initializerBlock).isSameAs(cu.sema.initializerBlockSymbol((JTypeSymbol) c.symbol())); + assertThat(initializerBlock).isSameAs(sema(cu).initializerBlockSymbol((JTypeSymbol) c.symbol())); } assertThat(variableSymbol).hasEnclosingClass(t); @@ -357,17 +361,17 @@ void type() { VariableTreeImpl field = (VariableTreeImpl) c.members().get(0); MethodTreeImpl method = (MethodTreeImpl) c.members().get(1); - assertThat(cu.sema.typeSymbol(c.typeBinding).owner()) + assertThat(((JTypeSymbol) typeOf(c).symbol()).owner()) .isOfSameTypeAs(c.symbol().owner()) .isOfUnknownType(); - assertThat(cu.sema.typeSymbol(c.typeBinding)) - .isOfType(cu.sema.type(c.typeBinding)); + assertThat(((JTypeSymbol) typeOf(c).symbol())) + .isOfType(((JType) typeOf(c))); - assertThat(cu.sema.variableSymbol(field.variableBinding)) - .isOfType(cu.sema.type(field.variableBinding.getType())); + assertThat(((JVariableSymbol) symbolOf(field))) + .isOfType(((JType) symbolOf(field).type())); - assertThat(cu.sema.methodSymbol(method.methodBinding)).isOfUnknownType(); + assertThat(((JMethodSymbol) symbolOf(method))).isOfUnknownType(); } @Test @@ -397,8 +401,8 @@ void var_type_as_local_variable() { assertThat(variable.symbol()) .isOfType("java.util.ArrayList"); - assertThat(cu.sema.variableSymbol(variable.variableBinding)) - .isOfType(cu.sema.type(variable.variableBinding.getType())); + assertThat(((JVariableSymbol) symbolOf(variable))) + .isOfType(((JType) symbolOf(variable).type())); } @Test @@ -460,30 +464,30 @@ void parse() { @Test void isPackageSymbol() { - JTypeSymbol c1Symbol = cu.sema.typeSymbol(c1.typeBinding); + JTypeSymbol c1Symbol = ((JTypeSymbol) typeOf(c1).symbol()); assertThat(c1Symbol.isPackageSymbol()).isFalse(); assertThat(c1Symbol.owner().isPackageSymbol()).isTrue(); } @Test void isTypeSymbol() { - assertThat(cu.sema.typeSymbol(c1.typeBinding).isTypeSymbol()).isTrue(); - assertThat(cu.sema.methodSymbol(foo.methodBinding).isTypeSymbol()).isFalse(); - assertThat(cu.sema.variableSymbol(f.variableBinding).isTypeSymbol()).isFalse(); + assertThat(((JTypeSymbol) typeOf(c1).symbol()).isTypeSymbol()).isTrue(); + assertThat(((JMethodSymbol) symbolOf(foo)).isTypeSymbol()).isFalse(); + assertThat(((JVariableSymbol) symbolOf(f)).isTypeSymbol()).isFalse(); } @Test void isMethodSymbol() { - assertThat(cu.sema.typeSymbol(c1.typeBinding).isMethodSymbol()).isFalse(); - assertThat(cu.sema.methodSymbol(foo.methodBinding).isMethodSymbol()).isTrue(); - assertThat(cu.sema.variableSymbol(f.variableBinding).isMethodSymbol()).isFalse(); + assertThat(((JTypeSymbol) typeOf(c1).symbol()).isMethodSymbol()).isFalse(); + assertThat(((JMethodSymbol) symbolOf(foo)).isMethodSymbol()).isTrue(); + assertThat(((JVariableSymbol) symbolOf(f)).isMethodSymbol()).isFalse(); } @Test void isVariableSymbol() { - assertThat(cu.sema.typeSymbol(c1.typeBinding).isVariableSymbol()).isFalse(); - assertThat(cu.sema.methodSymbol(foo.methodBinding).isVariableSymbol()).isFalse(); - assertThat(cu.sema.variableSymbol(f.variableBinding).isVariableSymbol()).isTrue(); + assertThat(((JTypeSymbol) typeOf(c1).symbol()).isVariableSymbol()).isFalse(); + assertThat(((JMethodSymbol) symbolOf(foo)).isVariableSymbol()).isFalse(); + assertThat(((JVariableSymbol) symbolOf(f)).isVariableSymbol()).isTrue(); } } @@ -598,8 +602,8 @@ void isInterface() { "interface I1 { } " + "class C1 { }"); - assertThat(cu.sema.typeSymbol(((ClassTreeImpl) cu.types().get(0)).typeBinding).isInterface()).isTrue(); - assertThat(cu.sema.typeSymbol(((ClassTreeImpl) cu.types().get(1)).typeBinding).isInterface()).isFalse(); + assertThat(((JTypeSymbol) typeOf(((ClassTreeImpl) cu.types().get(0))).symbol()).isInterface()).isTrue(); + assertThat(((JTypeSymbol) typeOf(((ClassTreeImpl) cu.types().get(1))).symbol()).isInterface()).isFalse(); } @Test @@ -607,20 +611,20 @@ void isEnum() { JavaTree.CompilationUnitTreeImpl cu = test("class C1 { int a; void foo() { }} enum E1 { ACONST; }"); ClassTreeImpl c1 = (ClassTreeImpl) cu.types().get(0); - JTypeSymbol c1Symbol = cu.sema.typeSymbol(c1.typeBinding); + JTypeSymbol c1Symbol = ((JTypeSymbol) typeOf(c1).symbol()); assertThat(c1Symbol.isEnum()).isFalse(); - JVariableSymbol a = cu.sema.variableSymbol(((VariableTreeImpl) c1.members().get(0)).variableBinding); + JVariableSymbol a = ((JVariableSymbol) symbolOf(((VariableTreeImpl) c1.members().get(0)))); assertThat(a.isEnum()).isFalse(); - JMethodSymbol foo = cu.sema.methodSymbol(((MethodTreeImpl) c1.members().get(1)).methodBinding); + JMethodSymbol foo = ((JMethodSymbol) symbolOf(((MethodTreeImpl) c1.members().get(1)))); assertThat(foo.isEnum()).isFalse(); ClassTreeImpl e1 = (ClassTreeImpl) cu.types().get(1); - JTypeSymbol e1Symbol = cu.sema.typeSymbol(e1.typeBinding); + JTypeSymbol e1Symbol = ((JTypeSymbol) typeOf(e1).symbol()); assertThat(e1Symbol.isEnum()).isTrue(); - JVariableSymbol aconst = cu.sema.variableSymbol(((EnumConstantTreeImpl) e1.members().get(0)).variableBinding); + JVariableSymbol aconst = ((JVariableSymbol) symbolOf(((EnumConstantTreeImpl) e1.members().get(0)))); assertThat(aconst.isEnum()).isTrue(); } @@ -634,12 +638,12 @@ private JMethodSymbol bar(JavaTree.CompilationUnitTreeImpl cu) { private JMethodSymbol method(JavaTree.CompilationUnitTreeImpl cu, int memberIndex) { ClassTreeImpl c1 = (ClassTreeImpl) cu.types().get(0); - return cu.sema.methodSymbol(((MethodTreeImpl) c1.members().get(memberIndex)).methodBinding); + return ((JMethodSymbol) symbolOf(((MethodTreeImpl) c1.members().get(memberIndex)))); } private JVariableSymbol variable(JavaTree.CompilationUnitTreeImpl cu, int memberIndex) { ClassTreeImpl c1 = (ClassTreeImpl) cu.types().get(0); - return cu.sema.variableSymbol(((VariableTreeImpl) c1.members().get(memberIndex)).variableBinding); + return ((JVariableSymbol) symbolOf(((VariableTreeImpl) c1.members().get(memberIndex)))); } } diff --git a/java-frontend/src/test/java/org/sonar/java/model/JTypeSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JTypeSymbolTest.java index b45c8478bda..2b797758a4b 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JTypeSymbolTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JTypeSymbolTest.java @@ -28,36 +28,40 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import static org.sonar.java.model.JParserTestUtils.sema; +import static org.sonar.java.model.JParserTestUtils.symbolOf; +import static org.sonar.java.model.JParserTestUtils.typeBinding; +import static org.sonar.java.model.JParserTestUtils.typeOf; class JTypeSymbolTest { @Test void superClass() { JavaTree.CompilationUnitTreeImpl cu = test("interface I { } class C implements I { } class C2 extends C { }"); - ITypeBinding javaLangObject = Objects.requireNonNull(cu.sema.resolveType("java.lang.Object")); - ITypeBinding i = Objects.requireNonNull(((ClassTreeImpl) cu.types().get(0)).typeBinding); - ITypeBinding c = Objects.requireNonNull(((ClassTreeImpl) cu.types().get(1)).typeBinding); - ITypeBinding c2 = Objects.requireNonNull(((ClassTreeImpl) cu.types().get(2)).typeBinding); + ITypeBinding javaLangObject = Objects.requireNonNull(sema(cu).resolveType("java.lang.Object")); + ITypeBinding i = Objects.requireNonNull(typeBinding(((ClassTreeImpl) cu.types().get(0)))); + ITypeBinding c = Objects.requireNonNull(typeBinding(((ClassTreeImpl) cu.types().get(1)))); + ITypeBinding c2 = Objects.requireNonNull(typeBinding(((ClassTreeImpl) cu.types().get(2)))); assertAll( // for java.lang.Object () -> - assertThat(cu.sema.typeSymbol(javaLangObject).superClass()) + assertThat(sema(cu).typeSymbol(javaLangObject).superClass()) .isNull(), // for interfaces () -> - assertThat(cu.sema.typeSymbol(i).superClass()) - .isSameAs(cu.sema.type(javaLangObject)), + assertThat(sema(cu).typeSymbol(i).superClass()) + .isSameAs(sema(cu).type(javaLangObject)), // for classes () -> - assertThat(cu.sema.typeSymbol(c).superClass()) - .isSameAs(cu.sema.type(javaLangObject)), + assertThat(sema(cu).typeSymbol(c).superClass()) + .isSameAs(sema(cu).type(javaLangObject)), () -> - assertThat(cu.sema.typeSymbol(c2).superClass()) - .isSameAs(cu.sema.type(c)), + assertThat(sema(cu).typeSymbol(c2).superClass()) + .isSameAs(sema(cu).type(c)), // for arrays () -> - assertThat(cu.sema.typeSymbol(javaLangObject.createArrayType(1)).superClass()) - .isSameAs(cu.sema.type(javaLangObject)) + assertThat(sema(cu).typeSymbol(javaLangObject.createArrayType(1)).superClass()) + .isSameAs(sema(cu).type(javaLangObject)) ); } @@ -66,21 +70,21 @@ void testSuperClassWhenSemanticCanNotResolveObjectType() { var cu = test("interface I{}"); var i = (ClassTreeImpl) cu.types().get(0); - JSema sematicThatCanNotResolveObjectType = spy(cu.sema); + JSema sematicThatCanNotResolveObjectType = spy(sema(cu)); when(sematicThatCanNotResolveObjectType.resolveType("java.lang.Object")).thenReturn(null); - var typeSymbol = new JTypeSymbol(sematicThatCanNotResolveObjectType, i.typeBinding); + var typeSymbol = new JTypeSymbol(sematicThatCanNotResolveObjectType, typeBinding(i)); assertThat(typeSymbol.superClass()).isSameAs(Type.UNKNOWN); } @Test void interfaces() { JavaTree.CompilationUnitTreeImpl cu = test("interface I { } class C implements I { }"); - ITypeBinding i = Objects.requireNonNull(((ClassTreeImpl) cu.types().get(0)).typeBinding); - ITypeBinding c = Objects.requireNonNull(((ClassTreeImpl) cu.types().get(1)).typeBinding); - assertThat(cu.sema.typeSymbol(i).interfaces()) + ITypeBinding i = Objects.requireNonNull(typeBinding(((ClassTreeImpl) cu.types().get(0)))); + ITypeBinding c = Objects.requireNonNull(typeBinding(((ClassTreeImpl) cu.types().get(1)))); + assertThat(sema(cu).typeSymbol(i).interfaces()) .isEmpty(); - assertThat(cu.sema.typeSymbol(c).interfaces()) - .containsOnly(cu.sema.type(i)); + assertThat(sema(cu).typeSymbol(c).interfaces()) + .containsOnly(sema(cu).type(i)); } @Test @@ -90,37 +94,36 @@ void memberSymbols() { VariableTreeImpl f = (VariableTreeImpl) c.members().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(1); ClassTreeImpl n = (ClassTreeImpl) c.members().get(2); - assertThat(cu.sema.typeSymbol(c.typeBinding).memberSymbols()) + assertThat(((JTypeSymbol) typeOf(c).symbol()).memberSymbols()) .containsOnly( - cu.sema.variableSymbol(f.variableBinding), - cu.sema.methodSymbol(m.methodBinding), - cu.sema.typeSymbol(n.typeBinding) + ((JVariableSymbol) symbolOf(f)), + ((JMethodSymbol) symbolOf(m)), + ((JTypeSymbol) typeOf(n).symbol()) ); } @Test void superTypesTest(){ JavaTree.CompilationUnitTreeImpl cu = test("interface I { } class C implements I { } class C2 extends C { }"); - ITypeBinding javaLangObject = Objects.requireNonNull(cu.sema.resolveType("java.lang.Object")); - assertThat(cu.sema.typeSymbol(javaLangObject).superTypes()).isEmpty(); + ITypeBinding javaLangObject = Objects.requireNonNull(sema(cu).resolveType("java.lang.Object")); + assertThat(sema(cu).typeSymbol(javaLangObject).superTypes()).isEmpty(); ClassTreeImpl interfaceI = (ClassTreeImpl) cu.types().get(0); - JTypeSymbol interfaceITypeSymbol = cu.sema.typeSymbol(interfaceI.typeBinding); + JTypeSymbol interfaceITypeSymbol = ((JTypeSymbol) typeOf(interfaceI).symbol()); assertThat(interfaceITypeSymbol.superTypes()).isEmpty(); assertThat(interfaceITypeSymbol.superTypes()).isEmpty(); // repeat call to cover cache ClassTreeImpl classC = (ClassTreeImpl) cu.types().get(1); - JTypeSymbol classCTypeSymbol = cu.sema.typeSymbol(classC.typeBinding); - assertThat(classCTypeSymbol.superTypes()).containsExactly(interfaceITypeSymbol.type(), cu.sema.type(javaLangObject)); - + JTypeSymbol classCTypeSymbol = ((JTypeSymbol) typeOf(classC).symbol()); + assertThat(classCTypeSymbol.superTypes()).containsExactly(interfaceITypeSymbol.type(), sema(cu).type(javaLangObject)); ClassTreeImpl classC2 = (ClassTreeImpl) cu.types().get(2); - JTypeSymbol classC2TypeSymbol = cu.sema.typeSymbol(classC2.typeBinding); - assertThat(classC2TypeSymbol.superTypes()).containsExactly(classCTypeSymbol.type() ,interfaceITypeSymbol.type(), cu.sema.type(javaLangObject)); + JTypeSymbol classC2TypeSymbol = ((JTypeSymbol) typeOf(classC2).symbol()); + assertThat(classC2TypeSymbol.superTypes()).containsExactly(classCTypeSymbol.type() ,interfaceITypeSymbol.type(), sema(cu).type(javaLangObject)); - ITypeBinding brokenTypeBinding = spy(classC2.typeBinding); + ITypeBinding brokenTypeBinding = spy(typeBinding(classC2)); when(brokenTypeBinding.isRecovered()).thenReturn(true); - JTypeSymbol brokenTypeSymbol = new JTypeSymbol(cu.sema, brokenTypeBinding); + JTypeSymbol brokenTypeSymbol = new JTypeSymbol(sema(cu), brokenTypeBinding); assertThat(brokenTypeSymbol.superTypes()).isEmpty(); } @@ -129,8 +132,8 @@ void outermostClassTest() { JavaTree.CompilationUnitTreeImpl cu = test("class C { class N {} }"); ClassTreeImpl outerClass = (ClassTreeImpl) cu.types().get(0); ClassTreeImpl innerClass = (ClassTreeImpl) outerClass.members().get(0); - JTypeSymbol innerClassSymbol = cu.sema.typeSymbol(innerClass.typeBinding); - JTypeSymbol outerClassSymbol = cu.sema.typeSymbol(outerClass.typeBinding); + JTypeSymbol innerClassSymbol = ((JTypeSymbol) typeOf(innerClass).symbol()); + JTypeSymbol outerClassSymbol = ((JTypeSymbol) typeOf(outerClass).symbol()); assertThat(innerClassSymbol.outermostClass()).isSameAs(outerClassSymbol); assertThat(innerClassSymbol.outermostClass()).isSameAs(outerClassSymbol); } @@ -155,11 +158,11 @@ private static JTypeSymbol getJTypeSymbolFromClassText(String classText, boolean JavaTree.CompilationUnitTreeImpl cu = test(classText); ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); if(isUnknown){ - ITypeBinding brokenTypeBinding = spy(c.typeBinding); + ITypeBinding brokenTypeBinding = spy(typeBinding(c)); when(brokenTypeBinding.isRecovered()).thenReturn(true); - return new JTypeSymbol(cu.sema, brokenTypeBinding); + return new JTypeSymbol(sema(cu), brokenTypeBinding); } - return new JTypeSymbol(cu.sema, c.typeBinding); + return new JTypeSymbol(sema(cu), typeBinding(c)); } private static JavaTree.CompilationUnitTreeImpl test(String source) { diff --git a/java-frontend/src/test/java/org/sonar/java/model/JTypeTest.java b/java-frontend/src/test/java/org/sonar/java/model/JTypeTest.java index 1d8e96d60fb..751873fd1c9 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JTypeTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JTypeTest.java @@ -42,6 +42,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import static org.sonar.java.model.JParserTestUtils.typeOf; import static org.sonar.java.model.assertions.TypeAssert.assertThat; class JTypeTest { @@ -95,7 +96,7 @@ void isParametrizedType() { ExpressionStatementTreeImpl s = (ExpressionStatementTreeImpl) Objects.requireNonNull(m.block()).body().get(0); AbstractTypedTree e = Objects.requireNonNull((AbstractTypedTree) s.expression()); - assertThat(cu.sema.type(e.typeBinding).isParameterized()) + assertThat(((JType) typeOf(e)).isParameterized()) .isEqualTo(e.symbolType().isParameterized()) .isTrue(); } @@ -108,11 +109,11 @@ void typeArguments() { ExpressionStatementTreeImpl s = (ExpressionStatementTreeImpl) Objects.requireNonNull(m.block()).body().get(0); AbstractTypedTree e = Objects.requireNonNull((AbstractTypedTree) s.expression()); - assertThat(cu.sema.type(e.typeBinding).typeArguments()) + assertThat(((JType) typeOf(e)).typeArguments()) .hasToString(e.symbolType().typeArguments().toString()) .hasToString("[Integer, String]"); - assertThat(cu.sema.type(c.typeBinding).typeArguments()) + assertThat(((JType) typeOf(c)).typeArguments()) .isEqualTo(c.symbol().type().typeArguments()) .isEmpty(); } @@ -235,11 +236,11 @@ void name_of_parameterized_type() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); AbstractTypedTree e = Objects.requireNonNull((AbstractTypedTree) m.returnType()); - JType parameterizedType = cu.sema.type(Objects.requireNonNull(e.typeBinding)); + JType parameterizedType = ((JType) typeOf(e)); assertThat(parameterizedType) .hasSameNameAs(e.symbolType()) - .hasSameNameAs(cu.sema.typeSymbol(e.typeBinding).type()) + .hasSameNameAs(((JTypeSymbol) typeOf(e).symbol()).type()) .is("java.util.List") .hasName("List"); } @@ -250,10 +251,10 @@ void name_of_type_variable() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl m = (MethodTreeImpl) c.members().get(0); AbstractTypedTree e = Objects.requireNonNull((AbstractTypedTree) m.returnType()); - JType typeVariable = cu.sema.type(Objects.requireNonNull(e.typeBinding)); + JType typeVariable = ((JType) typeOf(e)); assertThat(typeVariable) .hasSameNameAs(e.symbolType()) - .hasSameNameAs(cu.sema.typeSymbol(e.typeBinding).type()) + .hasSameNameAs(((JTypeSymbol) typeOf(e).symbol()).type()) .hasName("T") .is(e.symbolType().fullyQualifiedName()) .is("T"); @@ -308,10 +309,10 @@ void null_type() { AbstractTypedTree primitive = (AbstractTypedTree) m.parameters().get(0).type(); AbstractTypedTree array = (AbstractTypedTree) m.parameters().get(1).type(); - JType nullType = cu.sema.type(Objects.requireNonNull(e.typeBinding)); - JType classType = cu.sema.type(Objects.requireNonNull(c.typeBinding)); - JType primitiveType = cu.sema.type(Objects.requireNonNull(primitive.typeBinding)); - JType arrayType = cu.sema.type(Objects.requireNonNull(array.typeBinding)); + JType nullType = ((JType) typeOf(e)); + JType classType = ((JType) typeOf(c)); + JType primitiveType = ((JType) typeOf(primitive)); + JType arrayType = ((JType) typeOf(array)); assertThat(nullType) .hasSameNameAs(e.symbolType()) @@ -348,9 +349,9 @@ void wildcard() { JavaTree.WildcardTreeImpl w1 = (JavaTree.WildcardTreeImpl) p.typeArguments().get(0); JavaTree.WildcardTreeImpl w2 = (JavaTree.WildcardTreeImpl) p.typeArguments().get(1); JavaTree.WildcardTreeImpl w3 = (JavaTree.WildcardTreeImpl) p.typeArguments().get(2); - JType wildcardType1 = cu.sema.type(Objects.requireNonNull(w1.typeBinding)); - JType wildcardType2 = cu.sema.type(Objects.requireNonNull(w2.typeBinding)); - JType wildcardType3 = cu.sema.type(Objects.requireNonNull(w3.typeBinding)); + JType wildcardType1 = ((JType) typeOf(w1)); + JType wildcardType2 = ((JType) typeOf(w2)); + JType wildcardType3 = ((JType) typeOf(w3)); assertThat(wildcardType1) .isEqualTo(wildcardType2) diff --git a/java-frontend/src/test/java/org/sonar/java/model/JUtilsTest.java b/java-frontend/src/test/java/org/sonar/java/model/JUtilsTest.java index f586fda47a3..ce220e00d0c 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JUtilsTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JUtilsTest.java @@ -37,10 +37,14 @@ import org.sonar.plugins.java.api.tree.TypeParameterTree; import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.java.model.JParserTestUtils.methodBinding; +import static org.sonar.java.model.JParserTestUtils.sema; +import static org.sonar.java.model.JParserTestUtils.symbolOf; +import static org.sonar.java.model.JParserTestUtils.typeOf; class JUtilsTest { - static final JSema SEMA = test("").sema; + static final JSema SEMA = sema(test("")); private static final Type OBJECT_TYPE = SEMA.type(SEMA.resolveType("java.lang.Object")); @Nested @@ -140,14 +144,14 @@ class IsNullType { void nullType() { ReturnStatementTreeImpl s = (ReturnStatementTreeImpl) m1.block().body().get(0); AbstractTypedTree e = (AbstractTypedTree) s.expression(); - assertThat(cu.sema.type(e.typeBinding).isNullType()) + assertThat(((JType) typeOf(e)).isNullType()) .isEqualTo(e.symbolType().isNullType()) .isTrue(); } @Test void a_non_null_type_is_not_null_type() { - assertThat(cu.sema.type(m1.methodBinding.getReturnType()).isNullType()) + assertThat(sema(cu).type(methodBinding(m1).getReturnType()).isNullType()) .isEqualTo(m1.returnType().symbolType().isNullType()) .isFalse(); } @@ -155,7 +159,7 @@ void a_non_null_type_is_not_null_type() { @Test void unresolved_type_is_not_null_type() { MethodTreeImpl m2 = nthMethod(c, 1); - assertThat(cu.sema.type(m2.methodBinding.getReturnType()).isNullType()) + assertThat(sema(cu).type(methodBinding(m2).getReturnType()).isNullType()) .isEqualTo(m2.returnType().symbolType().isNullType()) .isFalse(); } @@ -178,14 +182,14 @@ class C { @Test void intersection_type() { TypeCastExpressionTreeImpl e = (TypeCastExpressionTreeImpl) f.initializer(); - assertThat(JUtils.isIntersectionType(cu.sema.type(e.typeBinding))) + assertThat(JUtils.isIntersectionType(((JType) typeOf(e)))) .isEqualTo(JUtils.isIntersectionType(e.symbolType())) .isTrue(); } @Test void non_intersection_type() { - assertThat(JUtils.isIntersectionType(cu.sema.type(f.variableBinding.getType()))) + assertThat(JUtils.isIntersectionType(((JType) symbolOf(f).type()))) .isEqualTo(JUtils.isIntersectionType(f.symbol().type())) .isFalse(); } @@ -193,7 +197,7 @@ void non_intersection_type() { @Test void unresolved_type_is_not_an_intersection_type() { VariableTreeImpl u = nthField(c, 1); - assertThat(JUtils.isIntersectionType(cu.sema.type(u.variableBinding.getType()))) + assertThat(JUtils.isIntersectionType(((JType) symbolOf(u).type()))) .isEqualTo(JUtils.isIntersectionType(u.symbol().type())) .isFalse(); } @@ -207,7 +211,7 @@ class IsTypeVar { @Test void type_var() { VariableTreeImpl t = firstField(c); - assertThat(cu.sema.type(t.variableBinding.getType()).isTypeVar()) + assertThat(((JType) symbolOf(t).type()).isTypeVar()) .isEqualTo(t.symbol().type().isTypeVar()) .isTrue(); } @@ -220,7 +224,7 @@ void simple_type_is_not_a_type_var() { @Test void unresolved_type_is_not_a_type_var() { VariableTreeImpl u = nthField(c, 1); - assertThat(cu.sema.type(u.variableBinding.getType()).isTypeVar()) + assertThat(((JType) symbolOf(u).type()).isTypeVar()) .isEqualTo(u.symbol().type().isTypeVar()) .isFalse(); } @@ -384,22 +388,22 @@ void constantValue() { JavaTree.CompilationUnitTreeImpl specificCu = test("interface I { short SHORT = 42; char CHAR = 42; byte BYTE = 42; boolean BOOLEAN = false; }"); ClassTreeImpl specificC = firstClass(specificCu); - Symbol.VariableSymbol shortConstant = specificCu.sema.variableSymbol(firstField(specificC).variableBinding); + Symbol.VariableSymbol shortConstant = ((JVariableSymbol) symbolOf(firstField(specificC))); assertThat(shortConstant.constantValue().orElseThrow(AssertionError::new)) .isInstanceOf(Integer.class) .isEqualTo(42); - Symbol.VariableSymbol charConstant = specificCu.sema.variableSymbol(nthField(specificC, 1).variableBinding); + Symbol.VariableSymbol charConstant = ((JVariableSymbol) symbolOf(nthField(specificC, 1))); assertThat(charConstant.constantValue().orElseThrow(AssertionError::new)) .isInstanceOf(Integer.class) .isEqualTo(42); - Symbol.VariableSymbol byteConstant = specificCu.sema.variableSymbol(nthField(specificC, 2).variableBinding); + Symbol.VariableSymbol byteConstant = ((JVariableSymbol) symbolOf(nthField(specificC, 2))); assertThat(byteConstant.constantValue().orElseThrow(AssertionError::new)) .isInstanceOf(Integer.class) .isEqualTo(42); - Symbol.VariableSymbol booleanConstant = specificCu.sema.variableSymbol(nthField(specificC, 3).variableBinding); + Symbol.VariableSymbol booleanConstant = ((JVariableSymbol) symbolOf(nthField(specificC, 3))); assertThat(booleanConstant.constantValue().orElseThrow(AssertionError::new)) .isInstanceOf(Boolean.class) .isEqualTo(Boolean.FALSE); @@ -705,13 +709,13 @@ void isParametrizedMethod() { ExpressionStatementTreeImpl s = (ExpressionStatementTreeImpl) m.block().body().get(0); MethodInvocationTreeImpl methodInvocation = (MethodInvocationTreeImpl) s.expression(); - assertThat(cu.sema.methodSymbol(m.methodBinding).isParametrizedMethod()) + assertThat(((JMethodSymbol) symbolOf(m)).isParametrizedMethod()) .isEqualTo(m.symbol().isParametrizedMethod()) - .isEqualTo(m.methodBinding.isGenericMethod()) + .isEqualTo(methodBinding(m).isGenericMethod()) .isTrue(); - assertThat(cu.sema.methodSymbol(methodInvocation.methodBinding).isParametrizedMethod()) + assertThat(((JMethodSymbol) symbolOf(methodInvocation)).isParametrizedMethod()) .isEqualTo(methodInvocation.methodSymbol().isParametrizedMethod()) - .isEqualTo(methodInvocation.methodBinding.isParameterizedMethod()) + .isEqualTo(methodBinding(methodInvocation).isParameterizedMethod()) .isTrue(); } diff --git a/java-frontend/src/test/java/org/sonar/java/model/JVariableSymbolTest.java b/java-frontend/src/test/java/org/sonar/java/model/JVariableSymbolTest.java index a3f2c17bdfe..a7c347d0f27 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/JVariableSymbolTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/JVariableSymbolTest.java @@ -26,6 +26,7 @@ import org.sonar.plugins.java.api.tree.VariableTree; import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.java.model.JParserTestUtils.symbolOf; class JVariableSymbolTest { @@ -35,10 +36,10 @@ void isLocalVariable() { ClassTreeImpl c = (ClassTreeImpl) cu.types().get(0); MethodTreeImpl method = (MethodTreeImpl) c.members().get(0); VariableTreeImpl localVariable = (VariableTreeImpl) method.block().body().get(0); - JVariableSymbol variableSymbol = cu.sema.variableSymbol(localVariable.variableBinding); + JVariableSymbol variableSymbol = ((JVariableSymbol) symbolOf(localVariable)); assertThat(variableSymbol.isLocalVariable()).isTrue(); VariableTreeImpl classVariable = (VariableTreeImpl) c.members().get(1); - variableSymbol = cu.sema.variableSymbol(classVariable.variableBinding); + variableSymbol = ((JVariableSymbol) symbolOf(classVariable)); assertThat(variableSymbol.isLocalVariable()).isFalse(); } @@ -61,11 +62,11 @@ void isParameter() { MethodTreeImpl method = (MethodTreeImpl) c.members().get(0); VariableTreeImpl localVariable = (VariableTreeImpl) method.block().body().get(0); - JVariableSymbol variableSymbol = cu.sema.variableSymbol(localVariable.variableBinding); + JVariableSymbol variableSymbol = ((JVariableSymbol) symbolOf(localVariable)); assertThat(variableSymbol.isParameter()).isFalse(); VariableTreeImpl parameter = (VariableTreeImpl) method.parameters().get(0); - variableSymbol = cu.sema.variableSymbol(parameter.variableBinding); + variableSymbol = ((JVariableSymbol) symbolOf(parameter)); assertThat(variableSymbol.isParameter()).isTrue(); } diff --git a/java-frontend/src/test/java/org/sonar/java/model/KeywordSuperTest.java b/java-frontend/src/test/java/org/sonar/java/model/KeywordSuperTest.java index 5b56b3cfe22..6bf693bcbc1 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/KeywordSuperTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/KeywordSuperTest.java @@ -17,6 +17,8 @@ package org.sonar.java.model; import org.junit.jupiter.api.Test; +import org.sonar.plugins.java.api.semantic.Symbol; +import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.ClassTree; import org.sonar.plugins.java.api.tree.MemberSelectExpressionTree; import org.sonar.plugins.java.api.tree.MethodInvocationTree; @@ -43,8 +45,8 @@ void test_symbol_and_symbolType() { assertThat(keywordSuper.symbolType().name()).isEqualTo("Object"); // simulate a binding problem - keywordSuper.binding = null; - keywordSuper.typeBinding = null; + keywordSuper.setSymbol(Symbol.UNKNOWN_SYMBOL); + keywordSuper.setSymbolType(Type.UNKNOWN); assertThat(keywordSuper.symbol().isUnknown()).isTrue(); assertThat(keywordSuper.symbolType().isUnknown()).isTrue(); diff --git a/java-frontend/src/test/java/org/sonar/java/model/KeywordThisTest.java b/java-frontend/src/test/java/org/sonar/java/model/KeywordThisTest.java index eddc5a8beab..51fabff0c09 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/KeywordThisTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/KeywordThisTest.java @@ -17,6 +17,8 @@ package org.sonar.java.model; import org.junit.jupiter.api.Test; +import org.sonar.plugins.java.api.semantic.Symbol; +import org.sonar.plugins.java.api.semantic.Type; import org.sonar.plugins.java.api.tree.ClassTree; import org.sonar.plugins.java.api.tree.MemberSelectExpressionTree; import org.sonar.plugins.java.api.tree.MethodInvocationTree; @@ -43,8 +45,8 @@ void test_symbol_and_symbolType() { assertThat(keywordThis.symbolType().name()).isEqualTo("A"); // simulate a binding problem - keywordThis.binding = null; - keywordThis.typeBinding = null; + keywordThis.setSymbol(Symbol.UNKNOWN_SYMBOL); + keywordThis.setSymbolType(Type.UNKNOWN); assertThat(keywordThis.symbol().isUnknown()).isTrue(); assertThat(keywordThis.symbolType().isUnknown()).isTrue(); diff --git a/java-frontend/src/test/java/org/sonar/java/model/SymbolsTest.java b/java-frontend/src/test/java/org/sonar/java/model/SymbolsTest.java index 9a242880e5e..dea945d72ca 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/SymbolsTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/SymbolsTest.java @@ -36,6 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import static org.sonar.java.model.JParserTestUtils.sema; class SymbolsTest { @@ -203,7 +204,7 @@ private static void assertCommonProperties(Symbol unknownSymbol) { @Test void testIsAnnotation() { - JSema sema = ((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse("")).sema; + JSema sema = sema(((JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse(""))); Type objectType = sema.type(sema.resolveType("java.lang.Object")); JavaTree.CompilationUnitTreeImpl cu = (JavaTree.CompilationUnitTreeImpl) JParserTestUtils.parse("@interface Anno { Unknown u; }"); ClassTreeImpl anno = (ClassTreeImpl) cu.types().get(0); diff --git a/java-frontend/src/test/java/org/sonar/java/model/declaration/ClassTreeImplTest.java b/java-frontend/src/test/java/org/sonar/java/model/declaration/ClassTreeImplTest.java index 22c2165bebc..b458a3edaad 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/declaration/ClassTreeImplTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/declaration/ClassTreeImplTest.java @@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test; import org.sonar.java.model.JParserTestUtils; import org.sonar.java.model.JavaTree; +import org.sonar.plugins.java.api.semantic.Symbol; import org.sonar.plugins.java.api.tree.BaseTreeVisitor; import org.sonar.plugins.java.api.tree.ClassTree; import org.sonar.plugins.java.api.tree.CompilationUnitTree; @@ -37,7 +38,7 @@ class ClassTreeImplTest { void get_symbol_return_unknown_when_type_binding_is_null() { var classTree = (ClassTreeImpl) JParserTestUtils.parse("class A {}").types().get(0); // simulate source code with type binding problems - classTree.typeBinding = null; + classTree.setSymbol(Symbol.TypeSymbol.UNKNOWN_TYPE); assertThat(classTree.symbol().isUnknown()).isTrue(); } diff --git a/java-frontend/src/test/java/org/sonar/java/testing/JavaFileScannerContextForTestsTest.java b/java-frontend/src/test/java/org/sonar/java/testing/JavaFileScannerContextForTestsTest.java index 40607240d27..1553471008d 100644 --- a/java-frontend/src/test/java/org/sonar/java/testing/JavaFileScannerContextForTestsTest.java +++ b/java-frontend/src/test/java/org/sonar/java/testing/JavaFileScannerContextForTestsTest.java @@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.sonar.java.model.JParserTestUtils.sema; class JavaFileScannerContextForTestsTest { @@ -71,7 +72,7 @@ class B {} SonarComponents sonarComponents = new SonarComponents(null, fileSystem, null, null, null, null); - context = new JavaFileScannerContextForTests(cut, inputFile, cut.sema, sonarComponents, javaVersion, false, false, null); + context = new JavaFileScannerContextForTests(cut, inputFile, sema(cut), sonarComponents, javaVersion, false, false, null); } @BeforeEach