rename to typevariable and add comment

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/JavaParserFacade.java

@@ -21,7 +21,7 @@
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.usages.typesystem.*;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
 import me.tomassetti.symbolsolver.resolution.SymbolSolver;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
@@ -566,10 +566,10 @@ public Type convertToUsage(com.github.javaparser.ast.type.Type type, Context con
             }
             if (typeDeclaration.isTypeVariable()) {
                 if (typeDeclaration instanceof TypeParameterDeclaration) {
-                    return new TypeParameter((TypeParameterDeclaration) typeDeclaration);
+                    return new TypeVariable((TypeParameterDeclaration) typeDeclaration);
                 } else {
                     JavaParserTypeVariableDeclaration javaParserTypeVariableDeclaration = (JavaParserTypeVariableDeclaration) typeDeclaration;
-                    return new TypeParameter(javaParserTypeVariableDeclaration.asTypeParameter());
+                    return new TypeVariable(javaParserTypeVariableDeclaration.asTypeParameter());
                 }
             } else {
                 return new ReferenceTypeImpl(typeDeclaration, typeParameters, typeSolver);

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java

@@ -19,7 +19,7 @@
 import me.tomassetti.symbolsolver.model.resolution.Value;
 import me.tomassetti.symbolsolver.model.usages.typesystem.ReferenceType;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.resolution.MethodResolutionLogic;
 import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
 import me.tomassetti.symbolsolver.resolution.SymbolSolver;
@@ -95,7 +95,7 @@ public Optional<Value> solveSymbolAsValue(String name, TypeSolver typeSolver) {
     public Optional<Type> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)) {
-                return Optional.of(new TypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeVariable(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return getParent().solveGenericType(name, typeSolver);

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/ConstructorContext.java

@@ -3,7 +3,7 @@
 import com.github.javaparser.ast.body.ConstructorDeclaration;
 import com.github.javaparser.ast.body.Parameter;
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
 import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
@@ -40,7 +40,7 @@ public SymbolReference<? extends ValueDeclaration> solveSymbol(String name, Type
     public Optional<Type> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)) {
-                return Optional.of(new TypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeVariable(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return super.solveGenericType(name, typeSolver);

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java

@@ -13,7 +13,7 @@
 import me.tomassetti.symbolsolver.model.usages.MethodUsage;
 import me.tomassetti.symbolsolver.model.resolution.*;
 import me.tomassetti.symbolsolver.model.usages.typesystem.*;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
 import me.tomassetti.symbolsolver.resolution.MethodResolutionLogic;
 
@@ -127,7 +127,7 @@ public String toString() {
         return "MethodCallExprContext{wrapped=" + wrappedNode+ "}";
     }
 
-    private Optional<MethodUsage> solveMethodAsUsage(TypeParameter tp, String name, List<Type> argumentsTypes, TypeSolver typeSolver, Context invokationContext) {
+    private Optional<MethodUsage> solveMethodAsUsage(TypeVariable tp, String name, List<Type> argumentsTypes, TypeSolver typeSolver, Context invokationContext) {
         for (TypeParameterDeclaration.Bound bound : tp.asTypeParameter().getBounds(typeSolver)) {
             Optional<MethodUsage> methodUsage = solveMethodAsUsage(bound.getType(), name, argumentsTypes, typeSolver, invokationContext);
             if (methodUsage.isPresent()) {
@@ -140,8 +140,8 @@ private Optional<MethodUsage> solveMethodAsUsage(TypeParameter tp, String name,
     private Optional<MethodUsage> solveMethodAsUsage(Type type, String name, List<Type> argumentsTypes, TypeSolver typeSolver, Context invokationContext) {
         if (type instanceof ReferenceType) {
             return solveMethodAsUsage((ReferenceType) type, name, argumentsTypes, typeSolver, invokationContext);
-        } else if (type instanceof TypeParameter) {
-            return solveMethodAsUsage((TypeParameter) type, name, argumentsTypes, typeSolver, invokationContext);
+        } else if (type instanceof TypeVariable) {
+            return solveMethodAsUsage((TypeVariable) type, name, argumentsTypes, typeSolver, invokationContext);
         } else if (type instanceof Wildcard) {
             Wildcard wildcardUsage = (Wildcard) type;
             if (wildcardUsage.isSuper()) {

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/javaparsermodel/contexts/MethodContext.java

@@ -4,7 +4,7 @@
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.body.Parameter;
 import me.tomassetti.symbolsolver.model.declarations.ValueDeclaration;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
 import me.tomassetti.symbolsolver.resolution.SymbolDeclarator;
 import me.tomassetti.symbolsolver.model.resolution.SymbolReference;
@@ -40,7 +40,7 @@ public SymbolReference<? extends ValueDeclaration> solveSymbol(String name, Type
     public Optional<Type> solveGenericType(String name, TypeSolver typeSolver) {
         for (com.github.javaparser.ast.TypeParameter tp : wrappedNode.getTypeParameters()) {
             if (tp.getName().equals(name)) {
-                return Optional.of(new TypeParameter(new JavaParserTypeParameter(tp, typeSolver)));
+                return Optional.of(new TypeVariable(new JavaParserTypeParameter(tp, typeSolver)));
             }
         }
         return super.solveGenericType(name, typeSolver);

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionFactory.java

@@ -4,7 +4,7 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.usages.typesystem.*;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 
 import java.lang.reflect.*;
 
@@ -26,11 +26,11 @@ public static Type typeUsageFor(Class<?> clazz, TypeSolver typeSolver) {
     }
 
     public static Type typeUsageFor(java.lang.reflect.Type type, TypeSolver typeSolver) {
-        if (type instanceof TypeVariable) {
-            TypeVariable tv = (TypeVariable) type;
-            boolean declaredOnClass = ((TypeVariable) type).getGenericDeclaration() instanceof java.lang.reflect.Type;
+        if (type instanceof java.lang.reflect.TypeVariable) {
+            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);
-            return new TypeParameter(typeParameter);
+            return new TypeVariable(typeParameter);
         } else if (type instanceof ParameterizedType) {
             ParameterizedType pt = (ParameterizedType) type;
             ReferenceType rawType = typeUsageFor(pt.getRawType(), typeSolver).asReferenceType();

java-symbol-solver-core/src/main/java/me/tomassetti/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java

@@ -8,7 +8,7 @@
 import me.tomassetti.symbolsolver.core.resolution.Context;
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.usages.typesystem.ReferenceTypeImpl;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
 
 import java.lang.reflect.Method;
@@ -43,7 +43,7 @@ static Optional<MethodUsage> solveMethodAsUsage(String name, List<Type> argument
                     i++;
                 }
                 for (TypeParameterDeclaration methodTypeParameter : methodDeclaration.getTypeParameters()) {
-                    methodUsage = methodUsage.replaceTypeParameterByName(methodTypeParameter.getName(), new TypeParameter(methodTypeParameter));
+                    methodUsage = methodUsage.replaceTypeParameterByName(methodTypeParameter.getName(), new TypeVariable(methodTypeParameter));
                 }
                 methods.add(methodUsage);
             }

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/logic/GenericTypeInferenceLogicTest.java

@@ -7,7 +7,7 @@
 import me.tomassetti.symbolsolver.model.resolution.TypeSolver;
 import me.tomassetti.symbolsolver.model.usages.typesystem.ReferenceType;
 import me.tomassetti.symbolsolver.model.usages.typesystem.ReferenceTypeImpl;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
 import me.tomassetti.symbolsolver.reflectionmodel.ReflectionClassDeclaration;
 import me.tomassetti.symbolsolver.resolution.typesolvers.JreTypeSolver;
@@ -32,7 +32,7 @@ public void inferGenericTypesTestSimpleCase() {
         TypeParameterDeclaration a = EasyMock.createMock(TypeParameterDeclaration.class);
         EasyMock.expect(a.getName()).andReturn("A").anyTimes();
         EasyMock.replay(a);
-        TypeParameter aUsage = new TypeParameter(a);
+        TypeVariable aUsage = new TypeVariable(a);
         assertEquals(ImmutableMap.of("A", string), GenericTypeInferenceLogic.inferGenericTypes(
                 ImmutableList.of(new Tuple2<Type, Type>(aUsage, string))));
     }
@@ -51,9 +51,9 @@ public void inferGenericTypesTestSimpleCaseWithTwoSubstitutions() {
         EasyMock.replay(a);
         EasyMock.replay(b);
         EasyMock.replay(c);
-        TypeParameter aUsage = new TypeParameter(a);
-        TypeParameter bUsage = new TypeParameter(b);
-        TypeParameter cUsage = new TypeParameter(c);
+        TypeVariable aUsage = new TypeVariable(a);
+        TypeVariable bUsage = new TypeVariable(b);
+        TypeVariable cUsage = new TypeVariable(c);
         assertEquals(ImmutableMap.of("A", string, "B", object, "C", string), GenericTypeInferenceLogic.inferGenericTypes(
                 ImmutableList.of(new Tuple2<Type, Type>(aUsage, string),
                         new Tuple2<Type, Type>(bUsage, object),

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/ArrayTypeTest.java

@@ -34,7 +34,7 @@ public void setup() {
         arrayOfStrings = new ArrayType(STRING);
         arrayOfListOfA = new ArrayType(new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
         arrayOfListOfStrings = new ArrayType(new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
                 ImmutableList.of(new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver)), typeSolver));

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/NullTypeTest.java

@@ -30,7 +30,7 @@ public void setup() {
         arrayOfBooleans = new ArrayType(PrimitiveType.BOOLEAN);
         arrayOfListOfA = new ArrayType(new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
     }
 
     @Test

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/PrimitiveTypeTest.java

@@ -39,7 +39,7 @@ public void setup() {
         arrayOfBooleans = new ArrayType(PrimitiveType.BOOLEAN);
         arrayOfListOfA = new ArrayType(new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
 
         booleanBox = new ReferenceTypeImpl(new ReflectionClassDeclaration(Boolean.class, typeSolver), typeSolver);
         characterBox = new ReferenceTypeImpl(new ReflectionClassDeclaration(Character.class, typeSolver), typeSolver);

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/ReferenceTypeTest.java

@@ -33,7 +33,7 @@ public void setup() {
         string = new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver);
         listOfA = new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver);
+                ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver);
         listOfStrings = new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
                 ImmutableList.of(new ReferenceTypeImpl(new ReflectionClassDeclaration(String.class, typeSolver), typeSolver)), typeSolver);

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/VoidTypeTest.java

@@ -30,7 +30,7 @@ public void setup() {
         arrayOfBooleans = new ArrayType(PrimitiveType.BOOLEAN);
         arrayOfListOfA = new ArrayType(new ReferenceTypeImpl(
                 new ReflectionInterfaceDeclaration(List.class, typeSolver),
-                ImmutableList.of(new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
+                ImmutableList.of(new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()))), typeSolver));
     }
 
     @Test

java-symbol-solver-core/src/test/java/me/tomassetti/symbolsolver/model/usages/typesystem/WildcardUsageTest.java

@@ -31,7 +31,7 @@ class Bar extends Foo { }
     private Wildcard extendsA;
     private Wildcard superString;
     private Wildcard extendsString;
-    private TypeParameter a;
+    private TypeVariable a;
 
     @Before
     public void setup() {
@@ -44,7 +44,7 @@ public void setup() {
         superBar = Wildcard.superBound(bar);
         extendsFoo = Wildcard.extendsBound(foo);
         extendsBar = Wildcard.extendsBound(bar);
-        a = new TypeParameter(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()));
+        a = new TypeVariable(TypeParameterDeclaration.onClass("A", "foo.Bar", Collections.emptyList()));
         superA = Wildcard.superBound(a);
         extendsA = Wildcard.extendsBound(a);
         superString = Wildcard.superBound(string);

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/usages/TypeParametersMap.java

@@ -2,7 +2,7 @@
 
 import me.tomassetti.symbolsolver.model.declarations.TypeParameterDeclaration;
 import me.tomassetti.symbolsolver.model.usages.typesystem.Type;
-import me.tomassetti.symbolsolver.model.usages.typesystem.TypeParameter;
+import me.tomassetti.symbolsolver.model.usages.typesystem.TypeVariable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -51,7 +51,7 @@ public Type getValue(TypeParameterDeclaration typeParameter) {
         if (nameToValue.containsKey(qualifiedName)) {
             return nameToValue.get(qualifiedName);
         } else {
-            return new TypeParameter(typeParameter);
+            return new TypeVariable(typeParameter);
         }
     }
 

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/usages/typesystem/ReferenceType.java

@@ -53,7 +53,7 @@ public ReferenceType(TypeDeclaration typeDeclaration, List<Type> typeParameters,
     }
 
     private static List<Type> deriveParams(TypeDeclaration typeDeclaration) {
-        return typeDeclaration.getTypeParameters().stream().map((tp) -> new TypeParameter(tp)).collect(Collectors.toList());
+        return typeDeclaration.getTypeParameters().stream().map((tp) -> new TypeVariable(tp)).collect(Collectors.toList());
     }
 
     public ReferenceType asReferenceType() {

java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/usages/typesystem/TypeParameter.java → java-symbol-solver-model/src/main/java/me/tomassetti/symbolsolver/model/usages/typesystem/TypeVariable.java

@@ -3,13 +3,16 @@
 import me.tomassetti.symbolsolver.model.declarations.TypeParameterDeclaration;
 
 /**
+ * From JLS 4.4: A type variable is introduced by the declaration of a type parameter of a generic class,
+ * interface, method, or constructor (§8.1.2, §9.1.2, §8.4.4, §8.8.4).
+ *
  * @author Federico Tomassetti
  */
-public class TypeParameter implements Type {
+public class TypeVariable implements Type {
 
     private TypeParameterDeclaration typeParameter;
 
-    public TypeParameter(TypeParameterDeclaration typeParameter) {
+    public TypeVariable(TypeParameterDeclaration typeParameter) {
         this.typeParameter = typeParameter;
     }
 
@@ -27,7 +30,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TypeParameter that = (TypeParameter) o;
+        TypeVariable that = (TypeVariable) o;
 
         if (!typeParameter.getName().equals(that.typeParameter.getName())) return false;
         if (typeParameter.declaredOnClass() != that.typeParameter.declaredOnClass()) return false;