diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java index 29b028459f..22c278be1f 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java @@ -15,7 +15,7 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import java.io.File; import java.io.IOException; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFacade.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFacade.java similarity index 99% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFacade.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFacade.java index 35191a9258..4c79dc5d09 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFacade.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFacade.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser; +package me.tomassetti.symbolsolver.javaparsermodel; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.*; @@ -6,6 +6,7 @@ import com.github.javaparser.ast.stmt.ExpressionStmt; import com.github.javaparser.ast.type.*; import javaslang.Tuple2; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.*; import me.tomassetti.symbolsolver.logic.FunctionalInterfaceLogic; import me.tomassetti.symbolsolver.logic.GenericTypeInferenceLogic; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; @@ -18,7 +19,6 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.*; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.*; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import java.util.*; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFactory.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFactory.java similarity index 88% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFactory.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFactory.java index f2cf6ac021..7df9e305a1 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/JavaParserFactory.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFactory.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser; +package me.tomassetti.symbolsolver.javaparsermodel; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; @@ -8,14 +8,14 @@ import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.stmt.*; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.*; import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.resolution.SymbolDeclarator; -import me.tomassetti.symbolsolver.resolution.javaparser.contexts.*; -import me.tomassetti.symbolsolver.resolution.javaparser.declarators.FieldSymbolDeclarator; -import me.tomassetti.symbolsolver.resolution.javaparser.declarators.NoSimbolDeclarator; -import me.tomassetti.symbolsolver.resolution.javaparser.declarators.ParameterSymbolDeclarator; -import me.tomassetti.symbolsolver.resolution.javaparser.declarators.VariableSymbolDeclarator; +import me.tomassetti.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator; +import me.tomassetti.symbolsolver.javaparsermodel.declarators.NoSimbolDeclarator; +import me.tomassetti.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator; +import me.tomassetti.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator; public class JavaParserFactory { diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/LambdaArgumentTypeUsagePlaceholder.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/LambdaArgumentTypeUsagePlaceholder.java similarity index 95% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/LambdaArgumentTypeUsagePlaceholder.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/LambdaArgumentTypeUsagePlaceholder.java index 740f53ed80..aa67b2a4ca 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/LambdaArgumentTypeUsagePlaceholder.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/LambdaArgumentTypeUsagePlaceholder.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser; +package me.tomassetti.symbolsolver.javaparsermodel; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedSymbolException.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedSymbolException.java similarity index 95% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedSymbolException.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedSymbolException.java index 781403074b..33f8cfd40b 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedSymbolException.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedSymbolException.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser; +package me.tomassetti.symbolsolver.javaparsermodel; import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedTypeException.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedTypeException.java similarity index 90% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedTypeException.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedTypeException.java index 7374c36ff2..978869d078 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/UnsolvedTypeException.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/UnsolvedTypeException.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser; +package me.tomassetti.symbolsolver.javaparsermodel; import me.tomassetti.symbolsolver.model.resolution.Context; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/AbstractJavaParserContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java similarity index 95% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/AbstractJavaParserContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java index 44c1d0b33c..d5d592b1a4 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/AbstractJavaParserContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Expression; @@ -10,7 +10,7 @@ import me.tomassetti.symbolsolver.model.resolution.Value; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java similarity index 91% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java index d2ed65369b..6e8f78184b 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.BodyDeclaration; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -13,13 +13,13 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.resolution.Value; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedTypeException; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserInterfaceDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserMethodDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedTypeException; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java similarity index 97% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java index 25851a6f36..bca08b5b7b 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.ImportDeclaration; @@ -10,8 +10,8 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserInterfaceDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ConstructorContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ConstructorContext.java similarity index 93% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ConstructorContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ConstructorContext.java index a6e1a67cc2..c37231ff5d 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ConstructorContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ConstructorContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.ConstructorDeclaration; import com.github.javaparser.ast.body.Parameter; @@ -9,8 +9,8 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.resolution.Value; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java similarity index 87% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java index 2a2a2e9c45..7804c432e7 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.*; import me.tomassetti.symbolsolver.resolution.MethodResolutionLogic; @@ -7,11 +7,11 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.SymbolDeclarator; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserEnumConstantDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserEnumDeclaration; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserMethodDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/FieldAccessContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java similarity index 91% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/FieldAccessContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java index 7f9f76c0d4..921367f07f 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/FieldAccessContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.FieldAccessExpr; @@ -9,8 +9,8 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.resolution.Value; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForStatementContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForStatementContext.java similarity index 92% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForStatementContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForStatementContext.java index 9c397523fe..b4398acb3c 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForStatementContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForStatementContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.expr.Expression; @@ -10,7 +10,7 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForechStatementContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java similarity index 91% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForechStatementContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java index bcb83df0dd..f60a542cae 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ForechStatementContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.stmt.BlockStmt; @@ -8,7 +8,7 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/LambdaExprContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java similarity index 95% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/LambdaExprContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java index 612e9b5f0b..a2d23d6b32 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/LambdaExprContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.Parameter; @@ -15,8 +15,8 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.resolution.Value; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java similarity index 98% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java index d4966dbf5f..a8cb1c6bf5 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.expr.NameExpr; @@ -9,8 +9,8 @@ import me.tomassetti.symbolsolver.model.invokations.MethodUsage; import me.tomassetti.symbolsolver.model.resolution.*; import me.tomassetti.symbolsolver.model.typesystem.*; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import me.tomassetti.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import java.util.HashMap; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodContext.java similarity index 93% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodContext.java index c4daed87bf..62eb149233 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.body.MethodDeclaration; @@ -10,8 +10,8 @@ import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.resolution.Value; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/StatementContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/StatementContext.java similarity index 97% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/StatementContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/StatementContext.java index 66374434db..3138619842 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/StatementContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/StatementContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.expr.LambdaExpr; import com.github.javaparser.ast.stmt.BlockStmt; @@ -13,7 +13,7 @@ import me.tomassetti.symbolsolver.model.resolution.Value; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/SwitchEntryContext.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java similarity index 93% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/SwitchEntryContext.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java index 5ea89a6395..73cdfe5749 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/SwitchEntryContext.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.contexts; +package me.tomassetti.symbolsolver.javaparsermodel.contexts; import com.github.javaparser.ast.stmt.SwitchEntryStmt; import com.github.javaparser.ast.stmt.SwitchStmt; @@ -8,7 +8,7 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserClassDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java similarity index 98% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserClassDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java index ded4d0c2f8..057027d329 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; @@ -19,9 +19,9 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.util.ArrayList; import java.util.Collections; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumConstantDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java similarity index 93% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumConstantDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java index e5445a834a..93a3e59d47 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumConstantDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.body.EnumDeclaration; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java similarity index 97% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java index 386588270a..663a726ef1 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserEnumDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; @@ -17,8 +17,8 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.io.Serializable; import java.util.Collections; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserFieldDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java similarity index 93% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserFieldDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java index 83c8d9fc96..6444c94ab5 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserFieldDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.body.EnumConstantDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; @@ -6,7 +6,7 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; public class JavaParserFieldDeclaration implements FieldDeclaration { diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserInterfaceDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java similarity index 98% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserInterfaceDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java index 6c3792e1fc..2f687fa9f1 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserInterfaceDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; @@ -18,8 +18,8 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.util.ArrayList; import java.util.Collections; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserMethodDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java similarity index 96% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserMethodDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java index 47226770ee..00122c05df 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserMethodDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -10,11 +10,10 @@ import me.tomassetti.symbolsolver.model.resolution.TypeParameter; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; -import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.model.typesystem.WildcardUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; import java.util.*; import java.util.stream.Collectors; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserParameterDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java similarity index 89% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserParameterDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java index ce9e0ea7b6..73cfd07986 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserParameterDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java @@ -1,10 +1,10 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.body.Parameter; import me.tomassetti.symbolsolver.model.declarations.ParameterDeclaration; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; public class JavaParserParameterDeclaration implements ParameterDeclaration { diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserSymbolDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java similarity index 96% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserSymbolDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java index 55927cf862..72f37099da 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserSymbolDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.FieldDeclaration; @@ -12,8 +12,8 @@ import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.PrimitiveTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; public class JavaParserSymbolDeclaration implements ValueDeclaration { diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameter.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java similarity index 97% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameter.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java index 252dcec857..7e670d23b0 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameter.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -15,7 +15,7 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import java.util.Collections; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeVariableDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java similarity index 98% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeVariableDeclaration.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java index 06dc388301..c0a1e09eff 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeVariableDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarations; +package me.tomassetti.symbolsolver.javaparsermodel.declarations; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.TypeParameter; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/AbstractSymbolDeclarator.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java similarity index 88% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/AbstractSymbolDeclarator.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java index 9e74f5edc4..e60bb13cde 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/AbstractSymbolDeclarator.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarators; +package me.tomassetti.symbolsolver.javaparsermodel.declarators; import com.github.javaparser.ast.Node; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/FieldSymbolDeclarator.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java similarity index 86% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/FieldSymbolDeclarator.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java index b167caa5d0..f41229d51a 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/FieldSymbolDeclarator.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java @@ -1,11 +1,11 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarators; +package me.tomassetti.symbolsolver.javaparsermodel.declarators; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration; import java.util.Collections; import java.util.LinkedList; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/NoSimbolDeclarator.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/NoSimbolDeclarator.java similarity index 91% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/NoSimbolDeclarator.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/NoSimbolDeclarator.java index 8909537a48..71ed4b792e 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/NoSimbolDeclarator.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/NoSimbolDeclarator.java @@ -1,4 +1,4 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarators; +package me.tomassetti.symbolsolver.javaparsermodel.declarators; import com.github.javaparser.ast.Node; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/ParameterSymbolDeclarator.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java similarity index 84% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/ParameterSymbolDeclarator.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java index 209f3da591..3c56a62c86 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/ParameterSymbolDeclarator.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java @@ -1,10 +1,10 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarators; +package me.tomassetti.symbolsolver.javaparsermodel.declarators; import com.github.javaparser.ast.body.Parameter; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration; import java.util.Collections; import java.util.LinkedList; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/VariableSymbolDeclarator.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java similarity index 86% rename from java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/VariableSymbolDeclarator.java rename to java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java index 9467d20d36..71ae5c5226 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/declarators/VariableSymbolDeclarator.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java @@ -1,10 +1,10 @@ -package me.tomassetti.symbolsolver.resolution.javaparser.declarators; +package me.tomassetti.symbolsolver.javaparsermodel.declarators; import com.github.javaparser.ast.expr.VariableDeclarationExpr; import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration; import java.util.Collections; import java.util.LinkedList; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/package-info.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/package-info.java new file mode 100644 index 0000000000..755a4a34b6 --- /dev/null +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/package-info.java @@ -0,0 +1,4 @@ +/** + * Implementation of model based on JavaParser. + */ +package me.tomassetti.symbolsolver.javaparsermodel; \ No newline at end of file diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java index 762f52670b..52885e737c 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javassistmodel/JavassistClassDeclaration.java @@ -19,7 +19,7 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import me.tomassetti.symbolsolver.resolution.*; -import me.tomassetti.symbolsolver.resolution.javaparser.LambdaArgumentTypeUsagePlaceholder; +import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder; import me.tomassetti.symbolsolver.javassistmodel.contexts.JavassistMethodContext; import java.util.*; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsageImpl.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsageImpl.java index 10c21f226e..9f2f551f2b 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsageImpl.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsageImpl.java @@ -5,8 +5,8 @@ import me.tomassetti.symbolsolver.model.invokations.MethodUsage; import me.tomassetti.symbolsolver.model.resolution.TypeParameter; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.LambdaArgumentTypeUsagePlaceholder; -import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeVariableDeclaration; +import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration; import java.util.HashSet; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java index 74c74f47ed..5854190836 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java @@ -13,8 +13,8 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.LambdaArgumentTypeUsagePlaceholder; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.lang.reflect.*; import java.util.*; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java index 1ba89412ea..64d686f19b 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java @@ -15,8 +15,8 @@ import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.LambdaArgumentTypeUsagePlaceholder; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.LambdaArgumentTypeUsagePlaceholder; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/SymbolSolver.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/SymbolSolver.java index ab6ce53add..3a66b27363 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/SymbolSolver.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/SymbolSolver.java @@ -14,8 +14,8 @@ import me.tomassetti.symbolsolver.model.resolution.Value; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/package-info.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/package-info.java deleted file mode 100644 index 0527ffea0c..0000000000 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Implementation of model based on JavaParser. - */ -package me.tomassetti.symbolsolver.resolution.javaparser; \ No newline at end of file diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/CombinedTypeSolver.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/CombinedTypeSolver.java index c45a4d3f64..e7ded3e6be 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/CombinedTypeSolver.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/CombinedTypeSolver.java @@ -3,7 +3,7 @@ import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JarTypeSolver.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JarTypeSolver.java index 3dda5c7c27..b921abd6ef 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JarTypeSolver.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JarTypeSolver.java @@ -6,7 +6,7 @@ import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException; +import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException; import me.tomassetti.symbolsolver.javassistmodel.JavassistClassDeclaration; import java.io.IOException; diff --git a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java index 4519424986..6d92750be8 100644 --- a/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java +++ b/java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java @@ -7,7 +7,7 @@ import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import java.io.File; import java.io.IOException; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java new file mode 100644 index 0000000000..43ebb965cf --- /dev/null +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java @@ -0,0 +1,74 @@ +package me.tomassetti.symbolsolver.javaparsermodel.declarations; + +import com.google.common.collect.ImmutableSet; +import me.tomassetti.symbolsolver.SourceFileInfoExtractor; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; +import me.tomassetti.symbolsolver.javassistmodel.JavassistClassDeclaration; +import me.tomassetti.symbolsolver.model.resolution.TypeSolver; +import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver; +import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; +import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; +import org.junit.Before; +import org.junit.Test; + +import java.io.File; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; + +public class JavaParserClassDeclarationTest { + + private TypeSolver typeSolver; + + @Before + public void setup() { + File src = new File("src/test/resources/javaparser_src/proper_source"); + CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver(); + combinedTypeSolver.add(new JreTypeSolver()); + combinedTypeSolver.add(new JavaParserTypeSolver(src)); + combinedTypeSolver.add(new JavaParserTypeSolver(new File("src/test/resources/javaparser_src/generated"))); + typeSolver = combinedTypeSolver; + } + + @Test + public void testIsClass() { + JavaParserClassDeclaration compilationUnit = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals(true, compilationUnit.isClass()); + } + + @Test + public void testGetSuperclass() { + JavaParserClassDeclaration compilationUnit = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals("com.github.javaparser.ast.Node", compilationUnit.getSuperClass().getQualifiedName()); + } + + @Test + public void testGetAllSuperclasses() { + JavaParserClassDeclaration cu = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals(ImmutableSet.of("com.github.javaparser.ast.Node", "java.lang.Object"), cu.getAllSuperClasses().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + } + + @Test + public void testGetAllAncestors() { + JavaParserClassDeclaration cu = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals(ImmutableSet.of("java.lang.Cloneable", "com.github.javaparser.ast.Node", "java.lang.Object"), cu.getAllAncestors().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + } + + @Test + public void testGetInterfaces() { + JavaParserClassDeclaration compilationUnit = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals(ImmutableSet.of(), compilationUnit.getInterfaces().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + + JavaParserClassDeclaration coid = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration"); + assertEquals(ImmutableSet.of("com.github.javaparser.ast.DocumentableNode"), coid.getInterfaces().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + } + + @Test + public void testGetAllInterfaces() { + JavaParserClassDeclaration compilationUnit = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.CompilationUnit"); + assertEquals(ImmutableSet.of(), compilationUnit.getAllInterfaces().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + + JavaParserClassDeclaration coid = (JavaParserClassDeclaration) typeSolver.solveType("com.github.javaparser.ast.body.ClassOrInterfaceDeclaration"); + assertEquals(ImmutableSet.of("com.github.javaparser.ast.DocumentableNode"), coid.getAllInterfaces().stream().map(i -> i.getQualifiedName()).collect(Collectors.toSet())); + } +} diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/ContextTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/ContextTest.java index e1a32dfc28..e66dfdf6aa 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/ContextTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/ContextTest.java @@ -11,7 +11,7 @@ import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.ast.stmt.ExpressionStmt; import com.github.javaparser.ast.type.Type; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.declarations.ClassDeclaration; import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration; @@ -23,10 +23,9 @@ import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import org.junit.Test; import static org.easymock.EasyMock.*; -import me.tomassetti.symbolsolver.model.resolution.Context; + import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.model.resolution.Value; import java.io.IOException; import java.io.InputStream; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/EnumTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/EnumTest.java index 695266ba67..0f4a2434c4 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/EnumTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/EnumTest.java @@ -6,16 +6,13 @@ import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.stmt.SwitchStmt; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import org.junit.Test; -import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; -import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.model.resolution.Value; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/FieldsTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/FieldsTest.java index aa7f345a7b..ac648acd1d 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/FieldsTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/FieldsTest.java @@ -5,7 +5,7 @@ import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.stmt.ReturnStmt; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/GenericsTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/GenericsTest.java index ce130848e6..247cdd0df4 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/GenericsTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/GenericsTest.java @@ -13,10 +13,10 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.google.common.collect.ImmutableList; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory; -import me.tomassetti.symbolsolver.resolution.javaparser.contexts.ClassOrInterfaceDeclarationContext; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/JavaParserFacadeTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/JavaParserFacadeTest.java index d1a946038f..1f0bd72ed2 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/JavaParserFacadeTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/JavaParserFacadeTest.java @@ -4,8 +4,7 @@ import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; -import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/LambdaTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/LambdaTest.java index 772d2cf381..031b9ab36b 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/LambdaTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/LambdaTest.java @@ -8,13 +8,10 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; -import java.util.List; -import java.util.stream.Collectors; - import static org.junit.Assert.assertEquals; public class LambdaTest extends AbstractTest { diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/QualifiedNameTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/QualifiedNameTest.java index 0eb409783e..b48fb9c6f0 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/QualifiedNameTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/QualifiedNameTest.java @@ -5,7 +5,7 @@ import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.expr.NameExpr; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/StatementContextTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/StatementContextTest.java index acc8ca7779..10ed4cf0ce 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/StatementContextTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/StatementContextTest.java @@ -5,7 +5,7 @@ import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.expr.NameExpr; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; @@ -15,10 +15,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; -import me.tomassetti.symbolsolver.model.resolution.Value; public class StatementContextTest extends AbstractTest { diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/VariadicTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/VariadicTest.java index f67b207269..76ca194020 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/VariadicTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/VariadicTest.java @@ -8,7 +8,7 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.model.typesystem.TypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextTest.java index 8abb078699..30de840942 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextTest.java @@ -5,6 +5,8 @@ import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.google.common.collect.ImmutableList; import me.tomassetti.symbolsolver.javaparser.Navigator; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.ClassOrInterfaceDeclarationContext; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.CompilationUnitContext; import me.tomassetti.symbolsolver.model.invokations.MethodUsage; import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextTest.java index aef0305703..ca13aa1986 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextTest.java @@ -3,6 +3,7 @@ import com.github.javaparser.ParseException; import com.github.javaparser.ast.CompilationUnit; import com.google.common.collect.ImmutableList; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.CompilationUnitContext; import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextTest.java index bfe5cb348b..315fb0d977 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextTest.java @@ -3,6 +3,7 @@ import com.github.javaparser.ParseException; import com.github.javaparser.ast.CompilationUnit; import me.tomassetti.symbolsolver.javaparser.Navigator; +import me.tomassetti.symbolsolver.javaparsermodel.contexts.EnumDeclarationContext; import me.tomassetti.symbolsolver.model.resolution.Context; import me.tomassetti.symbolsolver.model.resolution.SymbolReference; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterTest.java index 95e3f2322a..5613b92b64 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterTest.java @@ -1,19 +1,17 @@ package me.tomassetti.symbolsolver.resolution.javaparser.declarations; -import com.github.javaparser.JavaParser; import com.github.javaparser.ParseException; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; -import com.github.javaparser.ast.body.TypeDeclaration; -import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.MethodCallExpr; import me.tomassetti.symbolsolver.javaparser.Navigator; +import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter; import me.tomassetti.symbolsolver.model.resolution.TypeParameter; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.resolution.AbstractTest; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; import static org.junit.Assert.*; diff --git a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/reflectionmodel/SymbolResolutionTest.java b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/reflectionmodel/SymbolResolutionTest.java index 8dffb8c51a..06ed00a827 100644 --- a/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/reflectionmodel/SymbolResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/resolution/reflectionmodel/SymbolResolutionTest.java @@ -8,7 +8,7 @@ import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.stmt.ReturnStmt; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.javaparser.Navigator; import me.tomassetti.symbolsolver.resolution.AbstractTest; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-examples/src/main/java/me/tomassetti/examples/PrintExpressionType.java b/java-symbol-solver-examples/src/main/java/me/tomassetti/examples/PrintExpressionType.java index 1dcb267811..7190a907ef 100644 --- a/java-symbol-solver-examples/src/main/java/me/tomassetti/examples/PrintExpressionType.java +++ b/java-symbol-solver-examples/src/main/java/me/tomassetti/examples/PrintExpressionType.java @@ -8,7 +8,7 @@ import com.github.javaparser.ast.visitor.VoidVisitorAdapter; import me.tomassetti.symbolsolver.model.resolution.TypeSolver; import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage; -import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade; +import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade; import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;