Improve any checking in parameterizedTypes

gselzer · gselzer · commit b26ce6567775 · 2020-01-13T14:27:34.000-06:00
Now, a Function&lt;Function&lt;I, O&gt;, Function&lt;Iterable&lt;I&gt;, Iterable&lt;O&gt;&gt;&gt; can
be matched to a Function&lt;Any, Function&lt;Iterable&lt;Double&gt;,
   Iterable&lt;Double&gt;&gt;&gt;
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -2238,8 +2238,17 @@ private static boolean isAssignable(final Type type,
 				// parameters of the target type.
 				if (fromResolved != null && !fromResolved.equals(toResolved) && !(toResolved instanceof WildcardType
 						&& isAssignable(fromResolved, toResolved, typeVarAssigns))) {
+					// check for anys
 					if (fromResolved instanceof Any || toResolved instanceof Any)
 						continue;
+					if (fromResolved instanceof ParameterizedType && Types.raw(fromResolved) == Types.raw(toResolved)) {
+						Type[] fromTypes = ((ParameterizedType) fromResolved).getActualTypeArguments();
+						Type[] toTypes = ((ParameterizedType) toResolved).getActualTypeArguments();
+						for(int i = 0; i < fromTypes.length; i++) {
+							if(!(fromTypes[i] instanceof Any || toTypes[i] instanceof Any)) return false;
+						}
+						continue;
+					}
 					return false;
 				}
 			}
