simplify TypeUsage

javaparser · Oct 30, 2015 · 392bb1e · 392bb1e
1 parent 051adb2
commit 392bb1e
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsage.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 public class ArrayTypeUsage implements TypeUsage {
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/ReferenceTypeUsage.java
@@ -178,7 +178,12 @@ public Optional<TypeUsage> solveGenericType(String name) {
         return Optional.empty();
     }
 
-    @Override
+    /**
+     * Create a copy of the value with the type parameter changed.
+     * @param i
+     * @param replaced
+     * @return
+     */
     public TypeUsage replaceParam(int i, TypeUsage replaced) {
         ArrayList<TypeUsage> typeParametersCorrected = new ArrayList<>(typeParameters);
         typeParametersCorrected.set(i, replaced);
@@ -214,7 +219,7 @@ private TypeUsage replaceTypeParams(TypeUsage typeUsage){
             TypeUsage replaced = replaceTypeParams(typeUsage.parameters().get(i));
             // Identity comparison on purpose
             if (replaced != typeUsage.parameters().get(i)) {
-                typeUsage = typeUsage.replaceParam(i, replaced);
+                typeUsage = typeUsage.asReferenceTypeUsage().replaceParam(i, replaced);
             }
         }
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsage.java b/src/main/java/me/tomassetti/symbolsolver/model/typesystem/TypeUsage.java
@@ -87,16 +87,6 @@ default TypeParameter asTypeParameter() {
     /// TypeParameters
     ///
 
-    /**
-     * Create a copy of the value with the type parameter changed.
-     * @param i
-     * @param replaced
-     * @return
-     */
-    default TypeUsage replaceParam(int i, TypeUsage replaced) {
-        throw new UnsupportedOperationException(this.getClass().getCanonicalName());
-    }
-
     default TypeUsage replaceParam(String name, TypeUsage replaced) {
         //throw new UnsupportedOperationException(this.getClass().getCanonicalName());
         return this;
@@ -118,7 +108,7 @@ default TypeUsage solveGenericTypes(Context context, TypeSolver typeSolver) {
             TypeUsage result = this;
             int i=0;
             for (TypeUsage tp : this.parameters()) {
-                result = result.replaceParam(i, tp.solveGenericTypes(context, typeSolver));
+                result = result.asReferenceTypeUsage().replaceParam(i, tp.solveGenericTypes(context, typeSolver));
                 i++;
             }
             return result;

diff --git a/...java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java b/...java/me/tomassetti/symbolsolver/resolution/javaparser/contexts/MethodCallExprContext.java
@@ -30,7 +30,7 @@ public Optional<TypeUsage> solveGenericType(String name, TypeSolver typeSolver)
             throw new UnsupportedOperationException(name);
         }
         TypeUsage typeOfScope = JavaParserFacade.get(typeSolver).getType(wrappedNode.getScope());
-        return typeOfScope.solveGenericType(name);
+        return typeOfScope.asReferenceTypeUsage().solveGenericType(name);
     }
 
     @Override

diff --git a/...massetti/symbolsolver/resolution/javaparser/declarations/JavaParserMethodDeclaration.java b/...massetti/symbolsolver/resolution/javaparser/declarations/JavaParserMethodDeclaration.java
@@ -153,7 +153,7 @@ private TypeUsage replaceTypeParams(TypeUsage typeUsage, TypeSolver typeSolver,
             TypeUsage replaced = replaceTypeParams(typeUsage.parameters().get(i), typeSolver, context);
             // Identity comparison on purpose
             if (replaced != typeUsage.parameters().get(i)) {
-                typeUsage = typeUsage.replaceParam(i, replaced);
+                typeUsage = typeUsage.asReferenceTypeUsage().replaceParam(i, replaced);
             }
         }
 

diff --git a/src/main/java/me/tomassetti/symbolsolver/resolution/javassist/JavassistClassDeclaration.java b/src/main/java/me/tomassetti/symbolsolver/resolution/javassist/JavassistClassDeclaration.java
@@ -99,7 +99,7 @@ public Optional<MethodUsage> solveMethodAsUsage(String name, List<TypeUsage> par
                         List<TypeUsage> parametersOfReturnType = parseTypeParameters(classSignature.getReturnType().toString(), typeSolver, new JavassistMethodContext(method), invokationContext);
                         TypeUsage newReturnType = methodUsage.returnType();
                         for (int i = 0; i < parametersOfReturnType.size(); i++) {
-                            newReturnType = newReturnType.replaceParam(i, parametersOfReturnType.get(i));
+                            newReturnType = newReturnType.asReferenceTypeUsage().replaceParam(i, parametersOfReturnType.get(i));
                         }
                         methodUsage = methodUsage.replaceReturnType(newReturnType);
                     }

diff --git a/src/test/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsageTest.java b/src/test/java/me/tomassetti/symbolsolver/model/typesystem/ArrayTypeUsageTest.java
@@ -59,4 +59,20 @@ public void testIsTypeVariable() {
         assertEquals(false, arrayOfStrings.isTypeVariable());
     }
 
+    @Test(expected = UnsupportedOperationException.class)
+    public void testAsReferenceTypeUsage() {
+        arrayOfBooleans.asReferenceTypeUsage();
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void testAsTypeParameter() {
+        arrayOfBooleans.asTypeParameter();
+    }
+
+    @Test
+    public void testAsDescribe() {
+        assertEquals("boolean[]", arrayOfBooleans.describe());
+        assertEquals("java.lang.String[]", arrayOfStrings.describe());
+    }
+
 }