test JavaParserClassDeclaration

javaparser · Nov 22, 2015 · 8e655d3 · 8e655d3
1 parent 68d8797
commit 8e655d3
Show file tree

Hide file tree

Showing 60 changed files with 196 additions and 131 deletions.
diff --git a/...-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java b/...-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
@@ -15,7 +15,7 @@
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...solution/javaparser/JavaParserFacade.java → ...ver/javaparsermodel/JavaParserFacade.java b/...solution/javaparser/JavaParserFacade.java → ...ver/javaparsermodel/JavaParserFacade.java
@@ -1,11 +1,12 @@
-package me.tomassetti.symbolsolver.resolution.javaparser;
+package me.tomassetti.symbolsolver.javaparsermodel;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.type.*;
 import javaslang.Tuple2;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.*;
 import me.tomassetti.symbolsolver.logic.FunctionalInterfaceLogic;
 import me.tomassetti.symbolsolver.logic.GenericTypeInferenceLogic;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
@@ -18,7 +19,6 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.*;
 import me.tomassetti.symbolsolver.resolution.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.*;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 
 import java.util.*;

diff --git a/...olution/javaparser/JavaParserFactory.java → ...er/javaparsermodel/JavaParserFactory.java b/...olution/javaparser/JavaParserFactory.java → ...er/javaparsermodel/JavaParserFactory.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser;
+package me.tomassetti.symbolsolver.javaparsermodel;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -8,14 +8,14 @@
 import com.github.javaparser.ast.expr.MethodCallExpr;
 import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import com.github.javaparser.ast.stmt.*;
+import me.tomassetti.symbolsolver.javaparsermodel.contexts.*;
 import me.tomassetti.symbolsolver.model.resolution.Context;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
-import me.tomassetti.symbolsolver.resolution.javaparser.contexts.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarators.FieldSymbolDeclarator;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarators.NoSimbolDeclarator;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarators.ParameterSymbolDeclarator;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarators.VariableSymbolDeclarator;
+import me.tomassetti.symbolsolver.javaparsermodel.declarators.FieldSymbolDeclarator;
+import me.tomassetti.symbolsolver.javaparsermodel.declarators.NoSimbolDeclarator;
+import me.tomassetti.symbolsolver.javaparsermodel.declarators.ParameterSymbolDeclarator;
+import me.tomassetti.symbolsolver.javaparsermodel.declarators.VariableSymbolDeclarator;
 
 public class JavaParserFactory {
 

diff --git a/...r/LambdaArgumentTypeUsagePlaceholder.java → ...l/LambdaArgumentTypeUsagePlaceholder.java b/...r/LambdaArgumentTypeUsagePlaceholder.java → ...l/LambdaArgumentTypeUsagePlaceholder.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser;
+package me.tomassetti.symbolsolver.javaparsermodel;
 
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;

diff --git a/...n/javaparser/UnsolvedSymbolException.java → ...aparsermodel/UnsolvedSymbolException.java b/...n/javaparser/UnsolvedSymbolException.java → ...aparsermodel/UnsolvedSymbolException.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser;
+package me.tomassetti.symbolsolver.javaparsermodel;
 
 import me.tomassetti.symbolsolver.model.resolution.Context;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;

diff --git a/...ion/javaparser/UnsolvedTypeException.java → ...avaparsermodel/UnsolvedTypeException.java b/...ion/javaparser/UnsolvedTypeException.java → ...avaparsermodel/UnsolvedTypeException.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser;
+package me.tomassetti.symbolsolver.javaparsermodel;
 
 import me.tomassetti.symbolsolver.model.resolution.Context;
 

diff --git a/...r/contexts/AbstractJavaParserContext.java → ...l/contexts/AbstractJavaParserContext.java b/...r/contexts/AbstractJavaParserContext.java → ...l/contexts/AbstractJavaParserContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Expression;
@@ -10,7 +10,7 @@
 import me.tomassetti.symbolsolver.model.resolution.Value;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.resolution.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
 
 import java.util.Optional;
 

diff --git a/...s/ClassOrInterfaceDeclarationContext.java → ...s/ClassOrInterfaceDeclarationContext.java b/...s/ClassOrInterfaceDeclarationContext.java → ...s/ClassOrInterfaceDeclarationContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -13,13 +13,13 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.resolution.Value;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedTypeException;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserInterfaceDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserMethodDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedTypeException;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...rser/contexts/CompilationUnitContext.java → ...odel/contexts/CompilationUnitContext.java b/...rser/contexts/CompilationUnitContext.java → ...odel/contexts/CompilationUnitContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.ImportDeclaration;
@@ -10,8 +10,8 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserInterfaceDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration;
 
 import java.util.List;
 

diff --git a/...vaparser/contexts/ConstructorContext.java → ...sermodel/contexts/ConstructorContext.java b/...vaparser/contexts/ConstructorContext.java → ...sermodel/contexts/ConstructorContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.body.ConstructorDeclaration;
 import com.github.javaparser.ast.body.Parameter;
@@ -9,8 +9,8 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.resolution.Value;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...rser/contexts/EnumDeclarationContext.java → ...odel/contexts/EnumDeclarationContext.java b/...rser/contexts/EnumDeclarationContext.java → ...odel/contexts/EnumDeclarationContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.body.*;
 import me.tomassetti.symbolsolver.resolution.MethodResolutionLogic;
@@ -7,11 +7,11 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserClassDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserEnumConstantDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserEnumDeclaration;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserMethodDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserEnumConstantDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserEnumDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserMethodDeclaration;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...vaparser/contexts/FieldAccessContext.java → ...sermodel/contexts/FieldAccessContext.java b/...vaparser/contexts/FieldAccessContext.java → ...sermodel/contexts/FieldAccessContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.FieldAccessExpr;
@@ -9,8 +9,8 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.resolution.Value;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...aparser/contexts/ForStatementContext.java → ...ermodel/contexts/ForStatementContext.java b/...aparser/contexts/ForStatementContext.java → ...ermodel/contexts/ForStatementContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.expr.Expression;
@@ -10,7 +10,7 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration;
 
 import java.util.List;
 

diff --git a/...rser/contexts/ForechStatementContext.java → ...odel/contexts/ForechStatementContext.java b/...rser/contexts/ForechStatementContext.java → ...odel/contexts/ForechStatementContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.stmt.BlockStmt;
@@ -8,7 +8,7 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserSymbolDeclaration;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserSymbolDeclaration;
 
 import java.util.List;
 

diff --git a/...avaparser/contexts/LambdaExprContext.java → ...rsermodel/contexts/LambdaExprContext.java b/...avaparser/contexts/LambdaExprContext.java → ...rsermodel/contexts/LambdaExprContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 
 import com.github.javaparser.ast.body.Parameter;
@@ -15,8 +15,8 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.resolution.Value;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...arser/contexts/MethodCallExprContext.java → ...model/contexts/MethodCallExprContext.java b/...arser/contexts/MethodCallExprContext.java → ...model/contexts/MethodCallExprContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.expr.MethodCallExpr;
 import com.github.javaparser.ast.expr.NameExpr;
@@ -9,8 +9,8 @@
 import me.tomassetti.symbolsolver.model.invokations.MethodUsage;
 import me.tomassetti.symbolsolver.model.resolution.*;
 import me.tomassetti.symbolsolver.model.typesystem.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 import me.tomassetti.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
 
 import java.util.HashMap;

diff --git a/...on/javaparser/contexts/MethodContext.java → ...vaparsermodel/contexts/MethodContext.java b/...on/javaparser/contexts/MethodContext.java → ...vaparsermodel/contexts/MethodContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 
 import com.github.javaparser.ast.body.MethodDeclaration;
@@ -10,8 +10,8 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.resolution.Value;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...javaparser/contexts/StatementContext.java → ...arsermodel/contexts/StatementContext.java b/...javaparser/contexts/StatementContext.java → ...arsermodel/contexts/StatementContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.expr.LambdaExpr;
 import com.github.javaparser.ast.stmt.BlockStmt;
@@ -13,7 +13,7 @@
 import me.tomassetti.symbolsolver.model.resolution.Value;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.resolution.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...vaparser/contexts/SwitchEntryContext.java → ...sermodel/contexts/SwitchEntryContext.java b/...vaparser/contexts/SwitchEntryContext.java → ...sermodel/contexts/SwitchEntryContext.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.contexts;
+package me.tomassetti.symbolsolver.javaparsermodel.contexts;
 
 import com.github.javaparser.ast.stmt.SwitchEntryStmt;
 import com.github.javaparser.ast.stmt.SwitchStmt;
@@ -8,7 +8,7 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 
 import java.util.List;
 

diff --git a/...larations/JavaParserClassDeclaration.java → ...larations/JavaParserClassDeclaration.java b/...larations/JavaParserClassDeclaration.java → ...larations/JavaParserClassDeclaration.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -19,9 +19,9 @@
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.resolution.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...ns/JavaParserEnumConstantDeclaration.java → ...ns/JavaParserEnumConstantDeclaration.java b/...ns/JavaParserEnumConstantDeclaration.java → ...ns/JavaParserEnumConstantDeclaration.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.body.EnumDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;

diff --git a/...clarations/JavaParserEnumDeclaration.java → ...clarations/JavaParserEnumDeclaration.java b/...clarations/JavaParserEnumDeclaration.java → ...clarations/JavaParserEnumDeclaration.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -17,8 +17,8 @@
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 
 import java.io.Serializable;
 import java.util.Collections;

diff --git a/...larations/JavaParserFieldDeclaration.java → ...larations/JavaParserFieldDeclaration.java b/...larations/JavaParserFieldDeclaration.java → ...larations/JavaParserFieldDeclaration.java
@@ -1,12 +1,12 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.body.EnumConstantDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import me.tomassetti.symbolsolver.model.declarations.FieldDeclaration;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
 
 public class JavaParserFieldDeclaration implements FieldDeclaration {
 

diff --git a/...tions/JavaParserInterfaceDeclaration.java → ...tions/JavaParserInterfaceDeclaration.java b/...tions/JavaParserInterfaceDeclaration.java → ...tions/JavaParserInterfaceDeclaration.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -18,8 +18,8 @@
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.resolution.*;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
-import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.UnsolvedSymbolException;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...arations/JavaParserMethodDeclaration.java → ...arations/JavaParserMethodDeclaration.java b/...arations/JavaParserMethodDeclaration.java → ...arations/JavaParserMethodDeclaration.java
@@ -1,4 +1,4 @@
-package me.tomassetti.symbolsolver.resolution.javaparser.declarations;
+package me.tomassetti.symbolsolver.javaparsermodel.declarations;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -10,11 +10,10 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeParameter;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsageImpl;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
 import me.tomassetti.symbolsolver.model.typesystem.WildcardUsage;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFacade;
-import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFacade;
+import me.tomassetti.symbolsolver.javaparsermodel.JavaParserFactory;
 
 import java.util.*;
 import java.util.stream.Collectors;