From 08322b4714f672bed5ec424d3ace0a40da9ccd47 Mon Sep 17 00:00:00 2001 From: Federico Tomassetti Date: Mon, 24 Oct 2016 22:41:57 +0200 Subject: [PATCH] model: reorganize packages --- .../symbolsolver/SourceFileInfoExtractor.java | 4 ++-- .../symbolsolver/core/resolution/Context.java | 4 ++-- .../symbolsolver/core/resolution/ContextHelper.java | 4 ++-- .../javaparsermodel/JavaParserFacade.java | 4 ++-- .../LambdaArgumentTypePlaceholder.java | 2 +- .../contexts/AbstractJavaParserContext.java | 2 +- .../contexts/ClassOrInterfaceDeclarationContext.java | 6 +++--- .../contexts/CompilationUnitContext.java | 2 +- .../javaparsermodel/contexts/ConstructorContext.java | 4 ++-- .../javaparsermodel/contexts/ContextHelper.java | 4 ++-- .../contexts/EnumDeclarationContext.java | 2 +- .../javaparsermodel/contexts/FieldAccessContext.java | 4 ++-- .../contexts/ForStatementContext.java | 2 +- .../contexts/ForechStatementContext.java | 2 +- .../javaparsermodel/contexts/LambdaExprContext.java | 4 ++-- .../contexts/MethodCallExprContext.java | 4 ++-- .../javaparsermodel/contexts/MethodContext.java | 4 ++-- .../javaparsermodel/contexts/StatementContext.java | 2 +- .../javaparsermodel/contexts/SwitchEntryContext.java | 4 ++-- .../declarations/JavaParserClassDeclaration.java | 6 +++--- .../JavaParserEnumConstantDeclaration.java | 4 ++-- .../declarations/JavaParserEnumDeclaration.java | 12 ++++++------ .../declarations/JavaParserFieldDeclaration.java | 4 ++-- .../declarations/JavaParserInterfaceDeclaration.java | 6 +++--- .../declarations/JavaParserMethodDeclaration.java | 4 ++-- .../declarations/JavaParserParameterDeclaration.java | 4 ++-- .../declarations/JavaParserSymbolDeclaration.java | 6 +++--- .../declarations/JavaParserTypeParameter.java | 6 +++--- .../JavaParserTypeVariableDeclaration.java | 6 +++--- .../javassistmodel/JavassistClassDeclaration.java | 8 ++++---- .../javassistmodel/JavassistEnumDeclaration.java | 6 +++--- .../javassistmodel/JavassistFactory.java | 2 +- .../javassistmodel/JavassistFieldDeclaration.java | 2 +- .../JavassistInterfaceDeclaration.java | 8 ++++---- .../javassistmodel/JavassistMethodDeclaration.java | 10 +++++----- .../JavassistParameterDeclaration.java | 2 +- .../symbolsolver/javassistmodel/JavassistUtils.java | 4 ++-- .../contexts/JavassistClassContext.java | 2 +- .../contexts/JavassistMethodContext.java | 2 +- .../{usages => }/typesystem/ReferenceTypeImpl.java | 4 ++-- .../ClassOrInterfaceDeclarationContext.java | 2 +- .../reflectionmodel/ReflectionClassDeclaration.java | 10 +++++----- .../reflectionmodel/ReflectionFactory.java | 4 ++-- .../reflectionmodel/ReflectionFieldDeclaration.java | 2 +- .../ReflectionInterfaceDeclaration.java | 10 +++++----- .../reflectionmodel/ReflectionMethodDeclaration.java | 4 ++-- .../ReflectionMethodResolutionLogic.java | 8 ++++---- .../ReflectionParameterDeclaration.java | 2 +- .../resolution/MethodResolutionLogic.java | 4 ++-- .../symbolsolver/resolution/SymbolSolver.java | 6 +++--- .../com/github/javaparser/symbolsolver/Issue18.java | 2 +- .../declarations/JavaParserClassDeclarationTest.java | 6 +++--- .../logic/FunctionInterfaceLogicTest.java | 4 ++-- .../logic/GenericTypeInferenceLogicTest.java | 8 ++++---- .../model/{usages => }/typesystem/ArrayTypeTest.java | 2 +- .../model/{usages => }/typesystem/NullTypeTest.java | 2 +- .../{usages => }/typesystem/PrimitiveTypeTest.java | 2 +- .../{usages => }/typesystem/ReferenceTypeTest.java | 2 +- .../model/{usages => }/typesystem/VoidTypeTest.java | 2 +- .../{usages => }/typesystem/WildcardUsageTest.java | 10 +++++----- .../ReflectionClassDeclarationTest.java | 6 +++--- .../ReflectionInterfaceDeclarationTest.java | 6 +++--- .../resolution/AnalyseNewJavaParserHelpersTest.java | 2 +- .../symbolsolver/resolution/ContextTest.java | 4 ++-- .../symbolsolver/resolution/EnumResolutionTest.java | 2 +- .../resolution/FieldsResolutionTest.java | 2 +- .../resolution/GenericsResolutionTest.java | 6 +++--- .../resolution/JavaParserFacadeResolutionTest.java | 2 +- .../resolution/LambdaResolutionTest.java | 2 +- .../resolution/MethodsResolutionLogicTest.java | 4 ++-- .../resolution/MethodsResolutionTest.java | 4 ++-- .../resolution/StatementContextResolutionTest.java | 2 +- .../resolution/VariadicResolutionTest.java | 2 +- ...sOrInterfaceDeclarationContextResolutionTest.java | 10 +++++----- .../CompilationUnitContextResolutionTest.java | 6 +++--- .../contexts/FieldAccessContextResolutionTest.java | 2 +- .../MethodCallExprContextResolutionTest.java | 2 +- .../SymbolResolutionResolutionTest.java | 2 +- .../javaparser/examples/PrintExpressionType.java | 2 +- .../symbolsolver/logic/AbstractClassDeclaration.java | 2 +- .../symbolsolver/logic/AbstractTypeDeclaration.java | 4 ++-- .../symbolsolver/logic/FunctionalInterfaceLogic.java | 4 ++-- .../logic/GenericTypeInferenceLogic.java | 4 ++-- .../symbolsolver/logic/TypeParametersLogic.java | 6 +++--- .../model/declarations/ClassDeclaration.java | 2 +- .../model/declarations/InterfaceDeclaration.java | 2 +- .../model/declarations/MethodDeclaration.java | 2 +- .../model/declarations/TypeDeclaration.java | 6 +++--- .../model/declarations/TypeParameterDeclaration.java | 2 +- .../model/declarations/ValueDeclaration.java | 2 +- .../model/{usages => methods}/MethodUsage.java | 6 ++++-- .../symbolsolver/model/resolution/Value.java | 2 +- .../model/{usages => }/typesystem/ArrayType.java | 2 +- .../model/{usages => }/typesystem/NullType.java | 2 +- .../model/{usages => }/typesystem/PrimitiveType.java | 2 +- .../model/{usages => }/typesystem/ReferenceType.java | 7 +++++-- .../model/{usages => }/typesystem/Type.java | 2 +- .../{usages => typesystem}/TypeTransformer.java | 4 +--- .../model/{usages => }/typesystem/TypeVariable.java | 2 +- .../model/{usages => }/typesystem/VoidType.java | 2 +- .../model/{usages => }/typesystem/Wildcard.java | 2 +- .../parametrization}/TypeParameterValueProvider.java | 6 +++--- .../parametrization}/TypeParametersMap.java | 6 +++--- .../parametrization}/TypeParametrized.java | 2 +- 104 files changed, 209 insertions(+), 206 deletions(-) rename java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/ReferenceTypeImpl.java (97%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/ArrayTypeTest.java (99%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/NullTypeTest.java (98%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/PrimitiveTypeTest.java (99%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/ReferenceTypeTest.java (99%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/VoidTypeTest.java (98%) rename java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/WildcardUsageTest.java (98%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => methods}/MethodUsage.java (93%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/ArrayType.java (97%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/NullType.java (95%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/PrimitiveType.java (98%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/ReferenceType.java (97%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/Type.java (98%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => typesystem}/TypeTransformer.java (84%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/TypeVariable.java (97%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/VoidType.java (94%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => }/typesystem/Wildcard.java (98%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => typesystem/parametrization}/TypeParameterValueProvider.java (88%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => typesystem/parametrization}/TypeParametersMap.java (95%) rename java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/{usages => typesystem/parametrization}/TypeParametrized.java (91%) diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java index f02f135bda..6a06c065c0 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java @@ -32,8 +32,8 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.io.File; import java.io.IOException; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/Context.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/Context.java index 185dde14e9..ad2adbd200 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/Context.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/Context.java @@ -22,8 +22,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.List; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/ContextHelper.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/ContextHelper.java index 207d321909..b49f7bbdcc 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/ContextHelper.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/ContextHelper.java @@ -20,8 +20,8 @@ import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration; import com.github.javaparser.symbolsolver.javassistmodel.JavassistMethodDeclaration; import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionMethodDeclaration; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java index 4fdd3a39eb..e3e21aa0a2 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java @@ -35,8 +35,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.*; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.*; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/LambdaArgumentTypePlaceholder.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/LambdaArgumentTypePlaceholder.java index 9e2f1c3878..1bb6dacf8b 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/LambdaArgumentTypePlaceholder.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/LambdaArgumentTypePlaceholder.java @@ -18,7 +18,7 @@ import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; /** * Placeholder used to represent a lambda argument type while it is being diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java index b6ccd14326..ded1a4abba 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java @@ -25,7 +25,7 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java index 91806bb9ca..db994263ca 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java @@ -33,9 +33,9 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java index 94c1aff788..6ced140727 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java @@ -27,7 +27,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java index faee9dc5ec..dfcb0da88e 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java @@ -26,8 +26,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java index 0dca6a521e..aec0bae4fa 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java @@ -22,8 +22,8 @@ import com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java index 94ba504bea..402d866ebc 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java @@ -25,7 +25,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java index f399491d3a..76698ffa0d 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java @@ -27,8 +27,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.PrimitiveType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java index e3d33edf6f..a5c338c640 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java @@ -26,7 +26,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java index 9f7f7071b8..c97dfbabd6 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForechStatementContext.java @@ -24,7 +24,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java index ba7b60eb69..b59416eca7 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java @@ -33,8 +33,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import javaslang.Tuple2; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java index cefbe71c04..ad74c43eb4 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java @@ -28,8 +28,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.*; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.*; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import javaslang.Tuple2; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java index e3d3a6367e..ee68e580a2 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java @@ -26,8 +26,8 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java index 78432cdf90..4fa3863619 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java @@ -28,7 +28,7 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolDeclarator; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java index 9e979174f2..b9dffbe8e2 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java @@ -23,8 +23,8 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java index 06973ad663..6d08cb293c 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java @@ -33,9 +33,9 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; import com.google.common.collect.ImmutableList; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java index b9d198091d..c872e6d53b 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java @@ -19,8 +19,8 @@ import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java index 8e9192a4bf..4f896274a5 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java @@ -30,12 +30,12 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.TypeParametersMap; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ArrayType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap; +import com.github.javaparser.symbolsolver.model.typesystem.ArrayType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java index 4b4d3b3159..e168c6670b 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java @@ -25,8 +25,8 @@ import com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.Optional; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java index 7777c08524..c22b26c893 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java @@ -31,9 +31,9 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; import java.util.*; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java index 316d83c54f..01f725e0ac 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java @@ -25,8 +25,8 @@ import com.github.javaparser.symbolsolver.logic.TypeParametersLogic; import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.*; import java.util.stream.Collectors; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java index 911ae7aa16..c62b33deee 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java @@ -20,8 +20,8 @@ import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ArrayType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ArrayType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; public class JavaParserParameterDeclaration implements ParameterDeclaration { diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java index 62d0021cc4..305c49d749 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java @@ -28,9 +28,9 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ArrayType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.PrimitiveType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ArrayType; +import com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java index caa7ebc063..67f26a2806 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java @@ -28,9 +28,9 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.ArrayList; import java.util.Collections; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java index e87eb3f4df..66cc764a43 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java @@ -26,9 +26,9 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.ArrayList; import java.util.Collections; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java index 4bcf4c1ea8..da7139e07e 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java @@ -23,10 +23,10 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import javassist.CtClass; import javassist.CtField; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java index ed6ddd9e5c..bae0014a01 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java @@ -18,9 +18,9 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javassist.CtClass; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java index f82e054644..5cfe1eda37 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java @@ -18,7 +18,7 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.*; +import com.github.javaparser.symbolsolver.model.typesystem.*; import javassist.CtClass; import javassist.NotFoundException; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java index 4ed45a3b81..56eafdbc21 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java @@ -20,7 +20,7 @@ import com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javassist.CtField; import javassist.NotFoundException; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java index 1ff22378bd..011d033416 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java @@ -21,10 +21,10 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import javassist.CtClass; import javassist.CtField; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java index a053e0a19a..19404c8e19 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java @@ -20,11 +20,11 @@ import com.github.javaparser.symbolsolver.core.resolution.Context; import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Wildcard; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.Wildcard; import javassist.CtMethod; import javassist.NotFoundException; import javassist.bytecode.BadBytecode; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java index c7000d6c55..f2d51c42c7 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java @@ -18,7 +18,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javassist.CtClass; public class JavassistParameterDeclaration implements ParameterDeclaration { diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java index 2ae2809db9..52e3c5a088 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java @@ -19,8 +19,8 @@ import com.github.javaparser.symbolsolver.core.resolution.Context; import com.github.javaparser.symbolsolver.javassistmodel.contexts.JavassistMethodContext; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.SymbolSolver; import javassist.CtClass; import javassist.CtMethod; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistClassContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistClassContext.java index 949bca32d2..d2d5ab4701 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistClassContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistClassContext.java @@ -22,7 +22,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javassist.CtClass; import javassist.bytecode.BadBytecode; import javassist.bytecode.SignatureAttribute; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistMethodContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistMethodContext.java index 429c2628a5..b1cf994b86 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistMethodContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/contexts/JavassistMethodContext.java @@ -22,7 +22,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javassist.CtClass; import javassist.CtMethod; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeImpl.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java similarity index 97% rename from java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeImpl.java rename to java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java index 1bfeeda2b9..7cbdfbb0c4 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeImpl.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.javaparsermodel.LambdaArgumentTypePlaceholder; import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeVariableDeclaration; @@ -22,7 +22,7 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; import java.util.HashSet; import java.util.List; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ClassOrInterfaceDeclarationContext.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ClassOrInterfaceDeclarationContext.java index e530071dc0..0a418b5250 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ClassOrInterfaceDeclarationContext.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ClassOrInterfaceDeclarationContext.java @@ -22,7 +22,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java index 6800c438e7..ed3763e757 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java @@ -25,11 +25,11 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.NullType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.NullType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import java.lang.reflect.*; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java index 5a29a16d14..8f2e0f5e86 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java @@ -20,7 +20,7 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.*; +import com.github.javaparser.symbolsolver.model.typesystem.*; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Modifier; @@ -66,7 +66,7 @@ public static Type typeUsageFor(java.lang.reflect.Type type, TypeSolver typeSolv java.lang.reflect.TypeVariable tv = (java.lang.reflect.TypeVariable) type; boolean declaredOnClass = ((java.lang.reflect.TypeVariable) type).getGenericDeclaration() instanceof java.lang.reflect.Type; TypeParameterDeclaration typeParameter = new ReflectionTypeParameter(tv, declaredOnClass, typeSolver); - return new com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable(typeParameter); + return new com.github.javaparser.symbolsolver.model.typesystem.TypeVariable(typeParameter); } else if (type instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType) type; ReferenceType rawType = typeUsageFor(pt.getRawType(), typeSolver).asReferenceType(); diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java index 836e26a2bc..398bf5fcbf 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java @@ -20,7 +20,7 @@ import com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java index 96b1be1059..169d7c74dd 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java @@ -25,11 +25,11 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.NullType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.NullType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import javaslang.Tuple2; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java index 7747199efb..05470858e1 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java @@ -21,8 +21,8 @@ import com.github.javaparser.symbolsolver.logic.TypeParametersLogic; import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java index 635dcc28d4..1f59ddbc68 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java @@ -21,10 +21,10 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeParametrizable; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic; import java.lang.reflect.Method; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java index 5d4cfff894..52de708eca 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java @@ -18,7 +18,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; public class ReflectionParameterDeclaration implements ParameterDeclaration { private Class type; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java index 60245c943d..75d60a4e82 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java @@ -29,8 +29,8 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.*; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.*; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration; diff --git a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/SymbolSolver.java b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/SymbolSolver.java index 2411c6a549..bb4fd6a8ca 100644 --- a/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/SymbolSolver.java +++ b/java-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/SymbolSolver.java @@ -31,9 +31,9 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/Issue18.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/Issue18.java index 55be53529c..709dee79f0 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/Issue18.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/Issue18.java @@ -24,7 +24,7 @@ import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java index 8f01900310..03b29c224b 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java @@ -24,9 +24,9 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.PrimitiveType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java index fe74b2114c..22096be212 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java @@ -17,8 +17,8 @@ package com.github.javaparser.symbolsolver.logic; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionInterfaceDeclaration; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogicTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogicTest.java index 899fd3d8d0..3b97042a47 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogicTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogicTest.java @@ -18,10 +18,10 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import com.google.common.collect.ImmutableList; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayTypeTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java similarity index 99% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayTypeTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java index 8ec1578b0e..e632a2edb0 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayTypeTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullTypeTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java similarity index 98% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullTypeTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java index ad125ab8a7..ce406c8721 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullTypeTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveTypeTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java similarity index 99% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveTypeTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java index 72b6d045aa..b09d4e954d 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveTypeTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java similarity index 99% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java index 2dc0da7414..63590e603c 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceTypeTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration; import com.github.javaparser.symbolsolver.model.declarations.InterfaceDeclaration; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidTypeTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java similarity index 98% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidTypeTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java index 402c74004f..1d109e019f 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidTypeTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/WildcardUsageTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java similarity index 98% rename from java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/WildcardUsageTest.java rename to java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java index acb577651c..1185e70b14 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/usages/typesystem/WildcardUsageTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; @@ -174,10 +174,10 @@ public void testAsWildcard() { @Test public void testAsDescribe() { assertEquals("?", unbounded.describe()); - assertEquals("? super com.github.javaparser.symbolsolver.model.usages.typesystem.WildcardUsageTest.Foo", superFoo.describe()); - assertEquals("? super com.github.javaparser.symbolsolver.model.usages.typesystem.WildcardUsageTest.Bar", superBar.describe()); - assertEquals("? extends com.github.javaparser.symbolsolver.model.usages.typesystem.WildcardUsageTest.Foo", extendsFoo.describe()); - assertEquals("? extends com.github.javaparser.symbolsolver.model.usages.typesystem.WildcardUsageTest.Bar", extendsBar.describe()); + assertEquals("? super com.github.javaparser.symbolsolver.model.typesystem.WildcardUsageTest.Foo", superFoo.describe()); + assertEquals("? super com.github.javaparser.symbolsolver.model.typesystem.WildcardUsageTest.Bar", superBar.describe()); + assertEquals("? extends com.github.javaparser.symbolsolver.model.typesystem.WildcardUsageTest.Foo", extendsFoo.describe()); + assertEquals("? extends com.github.javaparser.symbolsolver.model.typesystem.WildcardUsageTest.Bar", extendsBar.describe()); } @Test diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java index 121a9b8166..1cc23cebae 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java @@ -18,9 +18,9 @@ import com.github.javaparser.symbolsolver.model.declarations.*; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java index 35bc7169f4..e5076d8c75 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java @@ -20,9 +20,9 @@ import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java index 36633c820c..038ab670f3 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java @@ -24,7 +24,7 @@ import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java index 486e80faff..232099588a 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java @@ -33,8 +33,8 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.*; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java index 8c281cf0b8..062f39a802 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java @@ -26,7 +26,7 @@ import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java index 2d097ce665..77710126dd 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java @@ -29,7 +29,7 @@ import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java index 84527a46f0..b46ca0ea00 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java @@ -36,9 +36,9 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java index 027ada6051..a13ce24e30 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java @@ -22,7 +22,7 @@ import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java index 3583142ffb..c932af7678 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java @@ -24,7 +24,7 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java index d29a7b876d..4168f93bce 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java @@ -18,8 +18,8 @@ import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java index b5b7664076..30a3e43fff 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java @@ -24,8 +24,8 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java index 88997026f7..67ad94be4d 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java @@ -26,7 +26,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java index 5e0600b041..ac42e468d9 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java @@ -24,7 +24,7 @@ import com.github.javaparser.ast.stmt.ReturnStmt; import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java index 6c5e1ad287..32581f3e30 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java @@ -30,11 +30,11 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.NullType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.PrimitiveType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceTypeImpl; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.NullType; +import com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.reflectionmodel.ReflectionClassDeclaration; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.DummyTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java index d6f38fcaa6..51929819f9 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java @@ -26,9 +26,9 @@ import com.github.javaparser.symbolsolver.model.resolution.SymbolReference; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; import com.github.javaparser.symbolsolver.model.resolution.Value; -import com.github.javaparser.symbolsolver.model.usages.typesystem.NullType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.PrimitiveType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.NullType; +import com.github.javaparser.symbolsolver.model.typesystem.PrimitiveType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.DummyTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java index ad10bbbe41..8915be8a23 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java @@ -23,7 +23,7 @@ import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java index f20c6ffec7..db15d7db84 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java @@ -23,7 +23,7 @@ import com.github.javaparser.symbolsolver.core.resolution.Context; import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.contexts.MethodCallExprContext; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; diff --git a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java index 3db679fae0..bfcd051415 100644 --- a/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java +++ b/java-symbol-solver-core/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java @@ -27,7 +27,7 @@ import com.github.javaparser.symbolsolver.javaparser.Navigator; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; import org.junit.Test; diff --git a/java-symbol-solver-examples/src/main/java/com/github/javaparser/examples/PrintExpressionType.java b/java-symbol-solver-examples/src/main/java/com/github/javaparser/examples/PrintExpressionType.java index 7e88ed563f..90fa591bf1 100644 --- a/java-symbol-solver-examples/src/main/java/com/github/javaparser/examples/PrintExpressionType.java +++ b/java-symbol-solver-examples/src/main/java/com/github/javaparser/examples/PrintExpressionType.java @@ -24,7 +24,7 @@ import com.github.javaparser.ast.visitor.VoidVisitorAdapter; import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver; import com.github.javaparser.symbolsolver.resolution.typesolvers.JreTypeSolver; diff --git a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java index 62fd3a7028..2ce1b7c152 100644 --- a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java +++ b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java @@ -18,7 +18,7 @@ import com.github.javaparser.symbolsolver.model.declarations.ClassDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java index 3888a837df..f97df05b38 100644 --- a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java +++ b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java @@ -19,8 +19,8 @@ import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import java.util.HashSet; import java.util.Set; diff --git a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/FunctionalInterfaceLogic.java b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/FunctionalInterfaceLogic.java index ef1d4b6568..a3df02b3d9 100644 --- a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/FunctionalInterfaceLogic.java +++ b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/FunctionalInterfaceLogic.java @@ -16,8 +16,8 @@ package com.github.javaparser.symbolsolver.logic; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.lang.reflect.Method; import java.lang.reflect.Parameter; diff --git a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogic.java b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogic.java index ed7f818335..55dc157dee 100644 --- a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogic.java +++ b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/GenericTypeInferenceLogic.java @@ -17,8 +17,8 @@ package com.github.javaparser.symbolsolver.logic; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import javaslang.Tuple2; import java.util.HashMap; diff --git a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/TypeParametersLogic.java b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/TypeParametersLogic.java index 74ad49a899..8dc80ac7e2 100644 --- a/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/TypeParametersLogic.java +++ b/java-symbol-solver-logic/src/main/java/com/github/javaparser/symbolsolver/logic/TypeParametersLogic.java @@ -18,9 +18,9 @@ import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Wildcard; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Wildcard; import java.util.List; import java.util.Map; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ClassDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ClassDeclaration.java index 91205d2254..280e1c5bdd 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ClassDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ClassDeclaration.java @@ -16,7 +16,7 @@ package com.github.javaparser.symbolsolver.model.declarations; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import java.util.List; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/InterfaceDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/InterfaceDeclaration.java index adf6e4ae68..dfd9d3c0da 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/InterfaceDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/InterfaceDeclaration.java @@ -16,7 +16,7 @@ package com.github.javaparser.symbolsolver.model.declarations; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/MethodDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/MethodDeclaration.java index c98e05c8ab..1a3f26f20a 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/MethodDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/MethodDeclaration.java @@ -16,7 +16,7 @@ package com.github.javaparser.symbolsolver.model.declarations; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; /** * A declaration of a method (either in an interface, a class, an enum or an annotation). diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeDeclaration.java index b897f02ac5..17608bf421 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeDeclaration.java @@ -16,9 +16,9 @@ package com.github.javaparser.symbolsolver.model.declarations; -import com.github.javaparser.symbolsolver.model.usages.MethodUsage; -import com.github.javaparser.symbolsolver.model.usages.typesystem.ReferenceType; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; +import com.github.javaparser.symbolsolver.model.typesystem.ReferenceType; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.ArrayList; import java.util.List; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java index 80c5313613..411bff70d6 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java @@ -17,7 +17,7 @@ package com.github.javaparser.symbolsolver.model.declarations; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; import java.util.List; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ValueDeclaration.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ValueDeclaration.java index acb81f057a..d291f426da 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ValueDeclaration.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/declarations/ValueDeclaration.java @@ -16,7 +16,7 @@ package com.github.javaparser.symbolsolver.model.declarations; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; /** * Declaration of a value. diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/MethodUsage.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/methods/MethodUsage.java similarity index 93% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/MethodUsage.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/methods/MethodUsage.java index efb35b457c..84717b7198 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/MethodUsage.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/methods/MethodUsage.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages; +package com.github.javaparser.symbolsolver.model.methods; import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized; import java.util.*; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/resolution/Value.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/resolution/Value.java index e0a9cd0ceb..848587a93c 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/resolution/Value.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/resolution/Value.java @@ -17,7 +17,7 @@ package com.github.javaparser.symbolsolver.model.resolution; import com.github.javaparser.symbolsolver.model.declarations.ValueDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Type; /** * Any type of value. diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayType.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java similarity index 97% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayType.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java index 4ce00e2316..009d7656a9 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ArrayType.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullType.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/NullType.java similarity index 95% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullType.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/NullType.java index 700973a6e3..a4014981cb 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/NullType.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/NullType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; /** * This is a virtual type used to represent null values. diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveType.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java similarity index 98% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveType.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java index c9321b3a83..0590c1ff95 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/PrimitiveType.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.google.common.collect.ImmutableList; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceType.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java similarity index 97% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceType.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java index 5fc2839088..c348831063 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/ReferenceType.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; +import com.github.javaparser.symbolsolver.model.methods.MethodUsage; import com.github.javaparser.symbolsolver.model.resolution.TypeSolver; -import com.github.javaparser.symbolsolver.model.usages.*; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParameterValueProvider; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametersMap; +import com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParametrized; import javaslang.Tuple2; import java.util.*; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Type.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Type.java similarity index 98% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Type.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Type.java index e19d1a1a29..c02e94cbe6 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Type.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Type.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeTransformer.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeTransformer.java similarity index 84% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeTransformer.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeTransformer.java index 609fb09092..60b5b763ea 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeTransformer.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeTransformer.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages; - -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; +package com.github.javaparser.symbolsolver.model.typesystem; /** * @author Federico Tomassetti diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/TypeVariable.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java similarity index 97% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/TypeVariable.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java index d3d75e66f4..bb4cea2193 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/TypeVariable.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidType.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/VoidType.java similarity index 94% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidType.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/VoidType.java index bf33b5adc6..2c26e96b26 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/VoidType.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/VoidType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; /** * The special type void. diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Wildcard.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Wildcard.java similarity index 98% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Wildcard.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Wildcard.java index a5cd8a3d8a..89ec08265a 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/typesystem/Wildcard.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/Wildcard.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages.typesystem; +package com.github.javaparser.symbolsolver.model.typesystem; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParameterValueProvider.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParameterValueProvider.java similarity index 88% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParameterValueProvider.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParameterValueProvider.java index fabfc96085..d09a583d3a 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParameterValueProvider.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParameterValueProvider.java @@ -1,8 +1,8 @@ -package com.github.javaparser.symbolsolver.model.usages; +package com.github.javaparser.symbolsolver.model.typesystem.parametrization; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Wildcard; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.Wildcard; import java.util.Optional; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametersMap.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java similarity index 95% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametersMap.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java index a4c7ddbc9b..ee44d7e476 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametersMap.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages; +package com.github.javaparser.symbolsolver.model.typesystem.parametrization; import com.github.javaparser.symbolsolver.model.declarations.TypeParameterDeclaration; -import com.github.javaparser.symbolsolver.model.usages.typesystem.Type; -import com.github.javaparser.symbolsolver.model.usages.typesystem.TypeVariable; +import com.github.javaparser.symbolsolver.model.typesystem.Type; +import com.github.javaparser.symbolsolver.model.typesystem.TypeVariable; import java.util.HashMap; import java.util.Map; diff --git a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametrized.java b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametrized.java similarity index 91% rename from java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametrized.java rename to java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametrized.java index 878908977d..ed0736d150 100644 --- a/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/usages/TypeParametrized.java +++ b/java-symbol-solver-model/src/main/java/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametrized.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.github.javaparser.symbolsolver.model.usages; +package com.github.javaparser.symbolsolver.model.typesystem.parametrization; /** * Something which can have values for TypeParameters.