#1910 Generified MethodResolutionLogic#solveMethodInType(...)

javaparser · Nov 6, 2018 · 360f369 · 360f369
1 parent 8209c03
commit 360f369
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 45 deletions.
diff --git a/...parser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java b/...parser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
@@ -11,6 +11,7 @@
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
 import com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration;
+import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
 import com.google.common.collect.ImmutableList;
@@ -61,6 +62,12 @@ public Context getContext() {
       return JavaParserFactory.getContext(wrappedNode, typeSolver);
   }
 
+  @Override
+  public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                boolean staticOnly, TypeSolver typeSolver) {
+    return getContext().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
+  }
+
   @Override
   protected ResolvedReferenceType object() {
     return new ReferenceTypeImpl(typeSolver.solveType(Object.class.getCanonicalName()), typeSolver);

diff --git a/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/...thub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -269,6 +269,12 @@ public SymbolReference<ResolvedTypeDeclaration> solveType(String name, TypeSolve
         return getContext().getParent().solveType(name, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return getContext().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
+    }
+
     @Override
     public List<ResolvedReferenceType> getAncestors(boolean acceptIncompleteList) {
         List<ResolvedReferenceType> ancestors = new ArrayList<>();

diff --git a/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/...ithub/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
@@ -33,6 +33,7 @@
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -46,7 +47,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class JavaParserEnumDeclaration extends AbstractTypeDeclaration implements ResolvedEnumDeclaration {
+public class JavaParserEnumDeclaration extends AbstractTypeDeclaration
+        implements ResolvedEnumDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     private TypeSolver typeSolver;
     private com.github.javaparser.ast.body.EnumDeclaration wrappedNode;
@@ -195,6 +197,15 @@ public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType>
         return getContext().solveMethodAsUsage(name, parameterTypes, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        if (name.equals("values") && argumentsTypes.isEmpty()) {
+            return SymbolReference.solved(new JavaParserEnumDeclaration.ValuesMethod(this, typeSolver));
+        }
+        return getContext().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
+    }
+
     @Override
     public List<ResolvedFieldDeclaration> getAllFields() {
         List<ResolvedFieldDeclaration> fields = javaParserTypeAdapter.getFieldsForDeclaredVariables();

diff --git a/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/.../javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -29,6 +29,7 @@
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.LazyType;
@@ -41,7 +42,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class JavaParserInterfaceDeclaration extends AbstractTypeDeclaration implements ResolvedInterfaceDeclaration {
+public class JavaParserInterfaceDeclaration extends AbstractTypeDeclaration
+        implements ResolvedInterfaceDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     private TypeSolver typeSolver;
     private ClassOrInterfaceDeclaration wrappedNode;
@@ -241,6 +243,12 @@ public SymbolReference<ResolvedTypeDeclaration> solveType(String name, TypeSolve
         return getContext().getParent().solveType(name, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return getContext().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
+    }
+
     @Override
     public List<ResolvedReferenceType> getAncestors(boolean acceptIncompleteList) {
         List<ResolvedReferenceType> ancestors = new ArrayList<>();

diff --git a/...ain/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/...ain/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
@@ -223,6 +223,12 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
         return MethodResolutionLogic.findMostApplicable(candidates, name, argumentsTypes, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return solveMethod(name, argumentsTypes, staticOnly);
+    }
+
     public ResolvedType getUsage(Node node) {
         return new ReferenceTypeImpl(this, typeSolver);
     }

diff --git a/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java b/...main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
@@ -25,6 +25,7 @@
 import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.core.resolution.Context;
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -45,7 +46,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class JavassistEnumDeclaration extends AbstractTypeDeclaration implements ResolvedEnumDeclaration {
+public class JavassistEnumDeclaration extends AbstractTypeDeclaration
+        implements ResolvedEnumDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     private CtClass ctClass;
     private TypeSolver typeSolver;
@@ -198,6 +200,12 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
         return MethodResolutionLogic.findMostApplicable(candidates, name, argumentsTypes, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return solveMethod(name, argumentsTypes, staticOnly);
+    }
+
     public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver,
                                                     Context invokationContext, List<ResolvedType> typeParameterValues) {
         return JavassistUtils.getMethodUsage(ctClass, name, argumentsTypes, typeSolver, invokationContext);

diff --git a/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/...java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
@@ -25,6 +25,7 @@
 import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.core.resolution.Context;
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -45,7 +46,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class JavassistInterfaceDeclaration extends AbstractTypeDeclaration implements ResolvedInterfaceDeclaration {
+public class JavassistInterfaceDeclaration extends AbstractTypeDeclaration
+        implements ResolvedInterfaceDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     private CtClass ctClass;
     private TypeSolver typeSolver;
@@ -138,6 +140,12 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
         return MethodResolutionLogic.findMostApplicable(candidates, name, argumentsTypes, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return solveMethod(name, argumentsTypes, staticOnly);
+    }
+
     @Override
     public boolean isAssignableBy(ResolvedType type) {
         throw new UnsupportedOperationException();

diff --git a/...n/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java b/...n/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
@@ -166,6 +166,12 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
         return MethodResolutionLogic.findMostApplicable(methods, name, argumentsTypes, typeSolver);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return solveMethod(name, argumentsTypes, staticOnly);
+    }
+
     @Override
     public String toString() {
         return "ReflectionClassDeclaration{" +
@@ -354,5 +360,4 @@ public Optional<Node> toAst() {
     protected ResolvedReferenceType object() {
         return new ReferenceTypeImpl(typeSolver.solveType(Object.class.getCanonicalName()), typeSolver);
     }
-
 }
diff --git a/...in/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java b/...in/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
@@ -23,6 +23,7 @@
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
 import com.github.javaparser.symbolsolver.logic.ConfilictingGenericTypesException;
 import com.github.javaparser.symbolsolver.logic.InferenceContext;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -34,7 +35,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class ReflectionEnumDeclaration extends AbstractTypeDeclaration implements ResolvedEnumDeclaration {
+public class ReflectionEnumDeclaration extends AbstractTypeDeclaration
+        implements ResolvedEnumDeclaration, TypeDeclarationWithResolutionCapabalities {
 
   ///
   /// Fields
@@ -194,6 +196,12 @@ public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType>
     }
 }
 
+  @Override
+  public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                boolean staticOnly, TypeSolver typeSolver) {
+    return solveMethod(name, argumentsTypes, staticOnly);
+  }
+
   @Override
   public List<ResolvedEnumConstantDeclaration> getEnumConstants() {
       return Arrays.stream(clazz.getFields())

diff --git a/...va/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java b/...va/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
@@ -28,6 +28,7 @@
 import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
 import com.github.javaparser.symbolsolver.logic.ConfilictingGenericTypesException;
 import com.github.javaparser.symbolsolver.logic.InferenceContext;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.NullType;
@@ -40,7 +41,8 @@
 /**
  * @author Federico Tomassetti
  */
-public class ReflectionInterfaceDeclaration extends AbstractTypeDeclaration implements ResolvedInterfaceDeclaration {
+public class ReflectionInterfaceDeclaration extends AbstractTypeDeclaration
+        implements ResolvedInterfaceDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     ///
     /// Fields
@@ -101,6 +103,12 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
                 typeSolver,this, clazz);
     }
 
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+                                                                  boolean staticOnly, TypeSolver typeSolver) {
+        return solveMethod(name, argumentsTypes, staticOnly);
+    }
+
     @Override
     public String toString() {
         return "ReflectionInterfaceDeclaration{" +

diff --git a/...re/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java b/...re/src/main/java/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java
@@ -28,6 +28,7 @@
 import com.github.javaparser.symbolsolver.javassistmodel.JavassistClassDeclaration;
 import com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration;
 import com.github.javaparser.symbolsolver.javassistmodel.JavassistInterfaceDeclaration;
+import com.github.javaparser.symbolsolver.logic.TypeDeclarationWithResolutionCapabalities;
 import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
@@ -578,44 +579,13 @@ public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(Resol
     public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(ResolvedTypeDeclaration typeDeclaration,
                                                                                String name, List<ResolvedType> argumentsTypes, boolean staticOnly,
                                                                                TypeSolver typeSolver) {
-        if (typeDeclaration instanceof JavaParserClassDeclaration) {
-            Context ctx = ((JavaParserClassDeclaration) typeDeclaration).getContext();
-            return ctx.solveMethod(name, argumentsTypes, staticOnly, typeSolver);
-        }
-        if (typeDeclaration instanceof JavaParserInterfaceDeclaration) {
-            Context ctx = ((JavaParserInterfaceDeclaration) typeDeclaration).getContext();
-            return ctx.solveMethod(name, argumentsTypes, staticOnly, typeSolver);
-        }
-        if (typeDeclaration instanceof JavaParserEnumDeclaration) {
-            if (name.equals("values") && argumentsTypes.isEmpty()) {
-                return SymbolReference.solved(new JavaParserEnumDeclaration.ValuesMethod((JavaParserEnumDeclaration) typeDeclaration, typeSolver));
-            }
-            Context ctx = ((JavaParserEnumDeclaration) typeDeclaration).getContext();
-            return ctx.solveMethod(name, argumentsTypes, staticOnly, typeSolver);
-        }
-        if (typeDeclaration instanceof JavaParserAnonymousClassDeclaration) {
-            Context ctx = ((JavaParserAnonymousClassDeclaration) typeDeclaration).getContext();
-            return ctx.solveMethod(name, argumentsTypes, staticOnly, typeSolver);
-        }
-        if (typeDeclaration instanceof ReflectionClassDeclaration) {
-            return ((ReflectionClassDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
-        }
-        if (typeDeclaration instanceof ReflectionInterfaceDeclaration) {
-            return ((ReflectionInterfaceDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
-        }
-        if (typeDeclaration instanceof ReflectionEnumDeclaration) {
-            return ((ReflectionEnumDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
-        }
-        if (typeDeclaration instanceof JavassistInterfaceDeclaration) {
-            return ((JavassistInterfaceDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
-        }
-        if (typeDeclaration instanceof JavassistClassDeclaration) {
-            return ((JavassistClassDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
-        }
-        if (typeDeclaration instanceof JavassistEnumDeclaration) {
-            return ((JavassistEnumDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
+
+        if (typeDeclaration instanceof TypeDeclarationWithResolutionCapabalities) {
+            return ((TypeDeclarationWithResolutionCapabalities) typeDeclaration).solveMethod(name, argumentsTypes,
+                                                                                             staticOnly, typeSolver);
+        } else {
+            throw new UnsupportedOperationException(typeDeclaration.getClass().getCanonicalName());
         }
-        throw new UnsupportedOperationException(typeDeclaration.getClass().getCanonicalName());
     }
 
     private static void inferTypes(ResolvedType source, ResolvedType target, Map<ResolvedTypeParameterDeclaration, ResolvedType> mappings) {

diff --git a/...ogic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java b/...ogic/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java
@@ -27,7 +27,8 @@
  *
  * @author Federico Tomassetti
  */
-public abstract class AbstractClassDeclaration extends AbstractTypeDeclaration implements ResolvedClassDeclaration {
+public abstract class AbstractClassDeclaration extends AbstractTypeDeclaration
+        implements ResolvedClassDeclaration, TypeDeclarationWithResolutionCapabalities {
 
     ///
     /// Public

diff --git a/...a/com/github/javaparser/symbolsolver/logic/TypeDeclarationWithResolutionCapabalities.java b/...a/com/github/javaparser/symbolsolver/logic/TypeDeclarationWithResolutionCapabalities.java
@@ -0,0 +1,16 @@
+package com.github.javaparser.symbolsolver.logic;
+
+import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
+import com.github.javaparser.resolution.types.ResolvedType;
+import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
+import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
+
+import java.util.List;
+
+public interface TypeDeclarationWithResolutionCapabalities {
+
+	SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes,
+	                                                       boolean staticOnly, TypeSolver typeSolver);
+
+
+}
diff --git a/...sting/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java b/...sting/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java
@@ -9,6 +9,8 @@
 import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration;
+import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
+import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver;
 import org.junit.Test;
 
@@ -122,6 +124,11 @@ public String getQualifiedName() {
         public Optional<ResolvedReferenceTypeDeclaration> containerType() {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes, boolean staticOnly, TypeSolver typeSolver) {
+            throw new UnsupportedOperationException();
+        }
     }
 
     @Test