minor refactoring

javaparser · Aug 29, 2017 · 04395d5 · 04395d5
1 parent c733131
commit 04395d5
Showing 1 changed file with 21 additions and 26 deletions.
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
@@ -194,34 +194,11 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(ReferenceTyp
             if (expectedParam.isTypeVariable()) {
                 String expectedParamName = expectedParam.asTypeParameter().getName();
                 if (!actualParam.isTypeVariable() || !actualParam.asTypeParameter().getName().equals(expectedParamName)) {
-                    if (matchedParameters.containsKey(expectedParamName)) {
+                    return matchTypeVariable(expectedParam.asTypeVariable(), actualParam, matchedParameters);
-                        Type matchedParameter = matchedParameters.get(expectedParamName);
-                        if (matchedParameter.isAssignableBy(actualParam)) {
-                            return true;
-                        } else if (actualParam.isAssignableBy(matchedParameter)) {
-                            matchedParameters.put(expectedParamName, actualParam);
-                            return true;
-                        }
-                        return false;
-                    } else {
-                        matchedParameters.put(expectedParamName, actualParam);
-                    }
                 }
             } else if (expectedParam.isReferenceType()) {
-                if (actualParam.isTypeVariable()) {    
+                if (actualParam.isTypeVariable()) {
-                    String actualParamName = actualParam.asTypeParameter().getName();
+                    return matchTypeVariable(actualParam.asTypeVariable(), expectedParam, matchedParameters);
-                    if (matchedParameters.containsKey(actualParamName)) {
-                        Type matchedParameter = matchedParameters.get(actualParamName);
-                        if (matchedParameter.isAssignableBy(expectedParam)) {
-                            return true;
-                        } else if (expectedParam.isAssignableBy(matchedParameter)) {
-                            matchedParameters.put(actualParamName, expectedParam);
-                            return true;
-                        }
-                        return false;
-                    } else {
-                        matchedParameters.put(actualParamName, expectedParam);
-                    }
                 } else if (!expectedParam.equals(actualParam)) {
                     return false;
                 }
@@ -238,6 +215,24 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(ReferenceTyp
         return true;
     }
 
+    private static boolean matchTypeVariable(TypeVariable typeVariable, Type type, Map<String, Type> matchedParameters) {
+        String typeParameterName = typeVariable.asTypeParameter().getName();
+        if (matchedParameters.containsKey(typeParameterName)) {
+            Type matchedParameter = matchedParameters.get(typeParameterName);
+            if (matchedParameter.isAssignableBy(type)) {
+                return true;
+            } else if (type.isAssignableBy(matchedParameter)) {
+                // update matchedParameters to contain the more general type
+                matchedParameters.put(typeParameterName, type);
+                return true;
+            }
+            return false;
+        } else {
+            matchedParameters.put(typeParameterName, type);
+        }
+        return true;
+    }
+
     public static Type replaceTypeParam(Type type, TypeParameterDeclaration tp, TypeSolver typeSolver) {
         if (type.isTypeVariable()) {
             if (type.describe().equals(tp.getName())) {