renaming

javaparser · Oct 31, 2015 · 1613b8d · 1613b8d
1 parent 8829603
commit 1613b8d
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 29 deletions.
diff --git a/src/main/java/me/tomassetti/symbolsolver/JavaParserFacade.java b/src/main/java/me/tomassetti/symbolsolver/JavaParserFacade.java
@@ -356,10 +356,10 @@ public TypeUsage convertToUsage(Type type, Context context) {
             }
             if (typeDeclaration.isTypeVariable()) {
                 if (typeDeclaration instanceof TypeParameter) {
-                    return new TypeUsageOfTypeParameter((TypeParameter)typeDeclaration);
+                    return new TypeParameterUsage((TypeParameter)typeDeclaration);
                 } else {
                     JavaParserTypeVariableDeclaration javaParserTypeVariableDeclaration = (JavaParserTypeVariableDeclaration) typeDeclaration;
-                    return new TypeUsageOfTypeParameter(javaParserTypeVariableDeclaration.asTypeParameter());
+                    return new TypeParameterUsage(javaParserTypeVariableDeclaration.asTypeParameter());
                 }
             } else {
                 return new ReferenceTypeUsage(typeDeclaration, typeParameters, typeSolver);

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/LambdaTypeUsagePlaceholder.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/LambdaTypeUsagePlaceholder.java
@@ -5,11 +5,7 @@
 
 public class LambdaTypeUsagePlaceholder implements TypeUsage {
 
-    private int pos;
-    private SymbolReference<MethodDeclaration> method;
-
     public LambdaTypeUsagePlaceholder(int pos) {
-        this.pos = pos;
     }
 
     @Override
@@ -38,7 +34,7 @@ public boolean isTypeVariable() {
     }
 
     public void setMethod(SymbolReference<MethodDeclaration> method) {
-        this.method = method;
+
     }
 
     @Override

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java
@@ -63,7 +63,7 @@ public ReferenceTypeUsage(TypeDeclaration typeDeclaration, TypeSolver typeSolver
     }
 
     private static List<TypeUsage> deriveParams(TypeDeclaration typeDeclaration) {
-        return typeDeclaration.getTypeParameters().stream().map((tp)->new TypeUsageOfTypeParameter(tp)).collect(Collectors.toList());
+        return typeDeclaration.getTypeParameters().stream().map((tp)->new TypeParameterUsage(tp)).collect(Collectors.toList());
     }
 
     public boolean isEnum() {

diff --git a/.../typesystem/TypeUsageOfTypeParameter.java → .../model/typesystem/TypeParameterUsage.java b/.../typesystem/TypeUsageOfTypeParameter.java → .../model/typesystem/TypeParameterUsage.java
@@ -2,7 +2,7 @@
 
 import me.tomassetti.symbolsolver.resolution.TypeParameter;
 
-public class TypeUsageOfTypeParameter implements TypeUsage {
+public class TypeParameterUsage implements TypeUsage {
 
     private TypeParameter typeParameter;
 
@@ -18,7 +18,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TypeUsageOfTypeParameter that = (TypeUsageOfTypeParameter) o;
+        TypeParameterUsage that = (TypeParameterUsage) o;
 
         if (!typeParameter.equals(that.typeParameter)) return false;
 
@@ -30,7 +30,7 @@ public int hashCode() {
         return typeParameter.hashCode();
     }
 
-    public TypeUsageOfTypeParameter(TypeParameter typeParameter) {
+    public TypeParameterUsage(TypeParameter typeParameter) {
         this.typeParameter = typeParameter;
     }
 

diff --git a/...setti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContext.java b/...setti/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContext.java
@@ -15,7 +15,7 @@
 import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserMethodDeclaration;
 import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.TypeUsageOfTypeParameter;
+import me.tomassetti.symbolsolver.model.typesystem.TypeParameterUsage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -98,7 +98,7 @@ public Optional<Value> solveSymbolAsValue(String name, TypeSolver typeSolver) {
     public Optional<TypeUsage> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)) {
-                return Optional.of(new TypeUsageOfTypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeParameterUsage(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return getParent().solveGenericType(name, typeSolver);

diff --git a/...in/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ConstructorContext.java b/...in/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/ConstructorContext.java
@@ -11,7 +11,7 @@
 import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
 import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.TypeUsageOfTypeParameter;
+import me.tomassetti.symbolsolver.model.typesystem.TypeParameterUsage;
 
 import java.util.List;
 import java.util.Optional;
@@ -44,7 +44,7 @@ public SymbolReference<? extends ValueDeclaration> solveSymbol(String name, Type
     public Optional<TypeUsage> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)){
-                return Optional.of(new TypeUsageOfTypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeParameterUsage(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return super.solveGenericType(name, typeSolver);

diff --git a/...java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java b/...java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java
@@ -4,7 +4,7 @@
 import com.github.javaparser.ast.expr.NameExpr;
 import me.tomassetti.symbolsolver.JavaParserFacade;
 import me.tomassetti.symbolsolver.model.typesystem.ReferenceTypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.TypeUsageOfTypeParameter;
+import me.tomassetti.symbolsolver.model.typesystem.TypeParameterUsage;
 import me.tomassetti.symbolsolver.resolution.*;
 import me.tomassetti.symbolsolver.model.declarations.MethodDeclaration;
 import me.tomassetti.symbolsolver.model.declarations.TypeDeclaration;
@@ -53,7 +53,7 @@ private Optional<MethodUsage> solveMethodAsUsage(ReferenceTypeUsage refType, Str
         }
     }
 
-    private Optional<MethodUsage> solveMethodAsUsage(TypeUsageOfTypeParameter tp, String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
+    private Optional<MethodUsage> solveMethodAsUsage(TypeParameterUsage tp, String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
         for (TypeParameter.Bound bound : tp.asTypeParameter().getBounds(typeSolver)) {
             Optional<MethodUsage> methodUsage = solveMethodAsUsage(bound.getType(), name, parameterTypes, typeSolver, invokationContext);
             if (methodUsage.isPresent()) {
@@ -66,8 +66,8 @@ private Optional<MethodUsage> solveMethodAsUsage(TypeUsageOfTypeParameter tp, St
     private Optional<MethodUsage> solveMethodAsUsage(TypeUsage typeUsage, String name, List<TypeUsage> parameterTypes, TypeSolver typeSolver, Context invokationContext) {
         if (typeUsage instanceof ReferenceTypeUsage) {
             return solveMethodAsUsage((ReferenceTypeUsage)typeUsage, name, parameterTypes, typeSolver, invokationContext);
-        } else if (typeUsage instanceof TypeUsageOfTypeParameter) {
-            return solveMethodAsUsage((TypeUsageOfTypeParameter)typeUsage, name, parameterTypes, typeSolver, invokationContext);
+        } else if (typeUsage instanceof TypeParameterUsage) {
+            return solveMethodAsUsage((TypeParameterUsage)typeUsage, name, parameterTypes, typeSolver, invokationContext);
         } else {
             throw new UnsupportedOperationException();
         }

diff --git a/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodContext.java b/src/main/java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodContext.java
@@ -8,7 +8,7 @@
 import me.tomassetti.symbolsolver.resolution.javaparser.JavaParserFactory;
 import me.tomassetti.symbolsolver.resolution.javaparser.declarations.JavaParserTypeParameter;
 import me.tomassetti.symbolsolver.model.typesystem.TypeUsage;
-import me.tomassetti.symbolsolver.model.typesystem.TypeUsageOfTypeParameter;
+import me.tomassetti.symbolsolver.model.typesystem.TypeParameterUsage;
 
 import java.util.List;
 import java.util.Optional;
@@ -41,7 +41,7 @@ public SymbolReference<? extends ValueDeclaration> solveSymbol(String name, Type
     public Optional<TypeUsage> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)){
-                return Optional.of(new TypeUsageOfTypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeParameterUsage(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return super.solveGenericType(name, typeSolver);

diff --git a/src/main/java/me/tomassetti/symbolsolver/resolution/reflection/ReflectionFactory.java b/src/main/java/me/tomassetti/symbolsolver/resolution/reflection/ReflectionFactory.java
@@ -33,7 +33,7 @@ public static TypeUsage typeUsageFor(Type type, TypeSolver typeSolver) {
             TypeVariable tv = (TypeVariable) type;
             // TODO the false value is arbitrary...
             me.tomassetti.symbolsolver.resolution.TypeParameter typeParameter = new ReflectionTypeParameter(tv, true);
-            return new TypeUsageOfTypeParameter(typeParameter);
+            return new TypeParameterUsage(typeParameter);
         } else if (type instanceof ParameterizedType) {
             ParameterizedType pt = (ParameterizedType) type;
             // TODO deal with type parameters

diff --git a/src/test/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsageTest.java b/src/test/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsageTest.java
@@ -1,7 +1,5 @@
 package me.tomassetti.symbolsolver.model.typesystem;
 
-import com.github.javaparser.ast.type.PrimitiveType;
-import com.github.javaparser.ast.type.ReferenceType;
 import com.google.common.collect.ImmutableList;
 import me.tomassetti.symbolsolver.resolution.TypeParameter;
 import me.tomassetti.symbolsolver.resolution.TypeSolver;
@@ -10,7 +8,6 @@
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
 import org.junit.Before;
 import org.junit.Test;
-import org.omg.CORBA.*;
 
 import java.lang.Object;
 import java.util.Collections;
@@ -37,7 +34,7 @@ public void setup() {
         arrayOfStrings = new ArrayTypeUsage(STRING);
         arrayOfListOfA = new ArrayTypeUsage(new ReferenceTypeUsage(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeUsageOfTypeParameter(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeParameterUsage(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
         arrayOfListOfStrings = new ArrayTypeUsage(new ReferenceTypeUsage(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
                 ImmutableList.of(new ReferenceTypeUsage(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver)), typeSolver));

diff --git a/src/test/java/me/tomassetti/symbolsolver/model/typesystem/NullTypeUsageTest.java b/src/test/java/me/tomassetti/symbolsolver/model/typesystem/NullTypeUsageTest.java
@@ -30,7 +30,7 @@ public void setup() {
         arrayOfBooleans = new ArrayTypeUsage(PrimitiveTypeUsage.BOOLEAN);
         arrayOfListOfA = new ArrayTypeUsage(new ReferenceTypeUsage(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeUsageOfTypeParameter(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeParameterUsage(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
     }
 
     @Test

diff --git a/src/test/java/me/tomassetti/symbolsolver/model/typesystem/PrimitiveTypeUsageTest.java b/src/test/java/me/tomassetti/symbolsolver/model/typesystem/PrimitiveTypeUsageTest.java
@@ -39,7 +39,7 @@ public void setup() {
         arrayOfBooleans = new ArrayTypeUsage(PrimitiveTypeUsage.BOOLEAN);
         arrayOfListOfA = new ArrayTypeUsage(new ReferenceTypeUsage(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeUsageOfTypeParameter(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeParameterUsage(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
 
         booleanBox = new ReferenceTypeUsage(new ReflectionClassDeclaration(Boolean.class, typeSolver), typeSolver);
         characterBox = new ReferenceTypeUsage(new ReflectionClassDeclaration(Character.class, typeSolver), typeSolver);

diff --git a/src/test/java/me/tomassetti/symbolsolver/model/typesystem/VoidTypeUsageTest.java b/src/test/java/me/tomassetti/symbolsolver/model/typesystem/VoidTypeUsageTest.java
@@ -30,7 +30,7 @@ public void setup() {
         arrayOfBooleans = new ArrayTypeUsage(PrimitiveTypeUsage.BOOLEAN);
         arrayOfListOfA = new ArrayTypeUsage(new ReferenceTypeUsage(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeUsageOfTypeParameter(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeParameterUsage(TypeParameter.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
     }
 
     @Test