Skip to content

Commit

Permalink
reorganize packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@ftomassetti
ftomassetti committed Oct 30, 2015
1 parent 9099980 commit b36f330
Show file tree
Hide file tree
Showing 100 changed files with 303 additions and 312 deletions.
10 changes: 5 additions & 5 deletions src/main/java/me/tomassetti/symbolsolver/JavaParserFacade.java
View file
Expand Up @@ -8,15 +8,15 @@
import com.github.javaparser.ast.type.*;
import com.github.javaparser.ast.type.PrimitiveType;
import com.github.javaparser.ast.type.ReferenceType;
import me.tomassetti.symbolsolver.model.*;
import me.tomassetti.symbolsolver.resolution.*;
import me.tomassetti.symbolsolver.model.declarations.*;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
import me.tomassetti.symbolsolver.model.javaparser.declarations.*;
import me.tomassetti.symbolsolver.model.typesolvers.JreTypeSolver;
import me.tomassetti.symbolsolver.resolution.javaparser.declarations.*;
import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
import me.tomassetti.symbolsolver.model.typesystem.*;
import me.tomassetti.symbolsolver.model.javaparser.JavaParserFactory;
import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;


import java.util.*;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/tomassetti/symbolsolver/ProjectResolver.java
View file
Expand Up @@ -15,9 +15,9 @@



import me.tomassetti.symbolsolver.model.typesolvers.CombinedTypeSolver;
import me.tomassetti.symbolsolver.model.typesolvers.JavaParserTypeSolver;
import me.tomassetti.symbolsolver.model.typesolvers.JreTypeSolver;
import me.tomassetti.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
import me.tomassetti.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;


import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/SourceFileInfoExtractor.java
View file
Expand Up @@ -12,7 +12,7 @@
import com.github.javaparser.ast.body.VariableDeclarator;
import com.github.javaparser.ast.expr.Expression;
import com.github.javaparser.ast.stmt.Statement;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/model/declarations/ClassDeclaration.java
View file
@@ -1,6 +1,6 @@
package me.tomassetti.symbolsolver.model.declarations;

import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/model/declarations/InterfaceDeclaration.java
View file
@@ -1,6 +1,6 @@
package me.tomassetti.symbolsolver.model.declarations;

import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.TypeSolver;

import java.util.ArrayList;

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/me/tomassetti/symbolsolver/model/declarations/MethodDeclaration.java
View file
@@ -1,8 +1,8 @@
package me.tomassetti.symbolsolver.model.declarations;

import com.github.javaparser.ast.Node;
import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.Context;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;

Expand Down Expand Up @@ -30,6 +30,7 @@ public interface MethodDeclaration extends Declaration, TypeParametrized {
* @param node
* @return
*/
@Deprecated
MethodUsage getUsage(Node node);

/**
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeDeclaration.java
View file
@@ -1,9 +1,9 @@
package me.tomassetti.symbolsolver.model.declarations;

import com.github.javaparser.ast.Node;
import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.Context;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
Expand Down Expand Up @@ -34,6 +34,7 @@ default Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> pa
* @param node
* @return
*/
@Deprecated
TypeUsage getUsage(Node node);

boolean isAssignableBy(TypeUsage typeUsage, TypeSolver typeSolver);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/model/declarations/TypeParametrized.java
View file
@@ -1,6 +1,6 @@
package me.tomassetti.symbolsolver.model.declarations;

import me.tomassetti.symbolsolver.model.TypeParameter;
import me.tomassetti.symbolsolver.resolution.TypeParameter;


import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/model/declarations/ValueDeclaration.java
View file
@@ -1,6 +1,6 @@
package me.tomassetti.symbolsolver.model.declarations;

import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;


Expand Down
4 changes: 0 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/javaparser/package-info.java
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/javassist/package-info.java
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/reflection/package-info.java
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsage.java
View file
@@ -1,7 +1,7 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/LambdaTypeUsagePlaceholder.java
View file
@@ -1,12 +1,10 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.List;
import java.util.Optional;

/**
* Created by federico on 02/08/15.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/me/tomassetti/symbolsolver/model/typesystem/MethodUsage.java
View file
@@ -1,7 +1,7 @@
package me.tomassetti.symbolsolver.model.typesystem;


import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/NullTypeUsage.java
View file
@@ -1,7 +1,7 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/PrimitiveTypeUsage.java
View file
@@ -1,8 +1,8 @@
package me.tomassetti.symbolsolver.model.typesystem;

import com.google.common.collect.ImmutableList;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java
View file
@@ -1,10 +1,10 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.*;
import me.tomassetti.symbolsolver.resolution.*;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
import me.tomassetti.symbolsolver.model.javaparser.declarations.JavaParserTypeVariableDeclaration;
import me.tomassetti.symbolsolver.model.reflection.ReflectionClassDeclaration;
import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeVariableDeclaration;
import me.tomassetti.symbolsolver.resolution.reflection.ReflectionClassDeclaration;

import java.util.ArrayList;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsage.java
View file
@@ -1,10 +1,9 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.*;
import me.tomassetti.symbolsolver.resolution.*;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;

import java.util.Collections;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -133,6 +132,7 @@ default TypeUsage solveGenericTypes(Context context, TypeSolver typeSolver) {
///

SymbolReference<MethodDeclaration> solveMethod(String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver);

default Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
throw new UnsupportedOperationException(this.getClass().getCanonicalName());
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsageOfTypeParameter.java
View file
@@ -1,9 +1,9 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeParameter;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.Context;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeParameter;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/VoidTypeUsage.java
View file
@@ -1,13 +1,11 @@
package me.tomassetti.symbolsolver.model.typesystem;

import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
import java.util.List;
import java.util.Optional;

public class VoidTypeUsage implements TypeUsage {
public static final TypeUsage INSTANCE = new VoidTypeUsage();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/tomassetti/symbolsolver/model/typesystem/WildcardUsage.java
View file
@@ -1,8 +1,8 @@
package me.tomassetti.symbolsolver.model.typesystem;

import com.github.javaparser.ast.type.WildcardType;
import me.tomassetti.symbolsolver.model.SymbolReference;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.resolution.SymbolReference;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;

import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...omassetti/symbolsolver/model/Context.java → ...etti/symbolsolver/resolution/Context.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
Expand Down
2 changes: 1 addition & 1 deletion ...i/symbolsolver/model/MethodReference.java → ...bolsolver/resolution/MethodReference.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

/**
* Created by federico on 28/07/15.
Expand Down
4 changes: 2 additions & 2 deletions ...olsolver/model/MethodResolutionLogic.java → ...ver/resolution/MethodResolutionLogic.java
View file
@@ -1,8 +1,8 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.MethodAmbiguityException;
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.reflection.ReflectionClassDeclaration;
import me.tomassetti.symbolsolver.resolution.reflection.ReflectionClassDeclaration;
import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
Expand Down
2 changes: 1 addition & 1 deletion .../symbolsolver/model/SymbolDeclarator.java → ...olsolver/resolution/SymbolDeclarator.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
Expand Down
2 changes: 1 addition & 1 deletion ...i/symbolsolver/model/SymbolReference.java → ...bolsolver/resolution/SymbolReference.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.Declaration;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
Expand Down
6 changes: 3 additions & 3 deletions ...etti/symbolsolver/model/SymbolSolver.java → ...symbolsolver/resolution/SymbolSolver.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import com.github.javaparser.ast.Node;
import com.github.javaparser.ast.type.ClassOrInterfaceType;
Expand All @@ -7,8 +7,8 @@
import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
import me.tomassetti.symbolsolver.model.javaparser.JavaParserFactory;
import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;
import me.tomassetti.symbolsolver.model.typesystem.MethodUsage;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
Expand Down
2 changes: 1 addition & 1 deletion ...tti/symbolsolver/model/TypeParameter.java → ...ymbolsolver/resolution/TypeParameter.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;

Expand Down
7 changes: 2 additions & 5 deletions ...ssetti/symbolsolver/model/TypeSolver.java → ...i/symbolsolver/resolution/TypeSolver.java
View file
@@ -1,11 +1,8 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
import me.tomassetti.symbolsolver.model.javaparser.UnsolvedSymbolException;
import me.tomassetti.symbolsolver.resolution.javaparser.UnsolvedSymbolException;

/**
* Created by federico on 28/07/15.
*/
public interface TypeSolver {

public SymbolReference<TypeDeclaration> tryToSolveType(String name);
Expand Down
2 changes: 1 addition & 1 deletion .../tomassetti/symbolsolver/model/Value.java → ...ssetti/symbolsolver/resolution/Value.java
View file
@@ -1,4 +1,4 @@
package me.tomassetti.symbolsolver.model;
package me.tomassetti.symbolsolver.resolution;

import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
Expand Down
18 changes: 9 additions & 9 deletions ...r/model/javaparser/JavaParserFactory.java → ...olution/javaparser/JavaParserFactory.java
View file
@@ -1,17 +1,17 @@
package me.tomassetti.symbolsolver.model.javaparser;
package me.tomassetti.symbolsolver.resolution.javaparser;

import com.github.javaparser.ast.*;
import com.github.javaparser.ast.body.*;
import com.github.javaparser.ast.expr.*;
import com.github.javaparser.ast.stmt.*;
import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.model.SymbolDeclarator;
import me.tomassetti.symbolsolver.model.TypeSolver;
import me.tomassetti.symbolsolver.model.javaparser.contexts.*;
import me.tomassetti.symbolsolver.model.javaparser.declarators.FieldSymbolDeclarator;
import me.tomassetti.symbolsolver.model.javaparser.declarators.NoSimboyDeclarator;
import me.tomassetti.symbolsolver.model.javaparser.declarators.ParameterSymbolDeclarator;
import me.tomassetti.symbolsolver.model.javaparser.declarators.VariableSymbolDeclarator;
import me.tomassetti.symbolsolver.resolution.Context;
import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
import me.tomassetti.symbolsolver.resolution.TypeSolver;
import me.tomassetti.symbolsolver.resolution.javaparser.contexts.*;
import me.tomassetti.symbolsolver.resolution.javaparser.declarators.FieldSymbolDeclarator;
import me.tomassetti.symbolsolver.resolution.javaparser.declarators.NoSimboyDeclarator;
import me.tomassetti.symbolsolver.resolution.javaparser.declarators.ParameterSymbolDeclarator;
import me.tomassetti.symbolsolver.resolution.javaparser.declarators.VariableSymbolDeclarator;

/**
* Created by federico on 28/07/15.
Expand Down
7 changes: 2 additions & 5 deletions ...l/javaparser/UnsolvedSymbolException.java → ...n/javaparser/UnsolvedSymbolException.java
View file
@@ -1,10 +1,7 @@
package me.tomassetti.symbolsolver.model.javaparser;
package me.tomassetti.symbolsolver.resolution.javaparser;

import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.resolution.Context;

/**
* Created by federico on 30/07/15.
*/
public class UnsolvedSymbolException extends RuntimeException {

private String context;
Expand Down
4 changes: 2 additions & 2 deletions ...del/javaparser/UnsolvedTypeException.java → ...ion/javaparser/UnsolvedTypeException.java
View file
@@ -1,6 +1,6 @@
package me.tomassetti.symbolsolver.model.javaparser;
package me.tomassetti.symbolsolver.resolution.javaparser;

import me.tomassetti.symbolsolver.model.Context;
import me.tomassetti.symbolsolver.resolution.Context;

/**
* Created by federico on 30/07/15.
Expand Down

0 comments on commit b36f330

Please sign in to comment.