Fix satisfies method for types missing type parameters

Treiblesschorle · ctrueden · commit 0b76079ef98e · 2019-04-18T12:16:30.000-05:00
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -864,16 +864,13 @@ private static boolean satisfiesParameterizedTypes(final Type arg,
 		final Type[] destTypes = param.getActualTypeArguments();
 
 		// get an array of the source argument types
-		// TODO: Verify that this is correct. getExactSuperType should always return a ParameterizedType here because
-		// param is parameterized and we know (check done earlier) that arg is assignable to param. Hence, arg must have
-		// type parameters for param?
+		Type argType = arg;
+		if (arg instanceof Class) {
+			argType = parameterizeRaw((Class<?>) arg);
+		}
 		ParameterizedType parameterizedSuperType = (ParameterizedType) GenericTypeReflector
-				.getExactSuperType(arg, Types.raw(param));
+				.getExactSuperType(argType, Types.raw(param));
 		final Type[] srcTypes = parameterizedSuperType.getActualTypeArguments();
-//		final Type[] srcTypes = new Type[destTypes.length];
-//		for (int i = 0; i < srcTypes.length; i++) {
-//			srcTypes[i] = Types.param(arg, Types.raw(arg), i);
-//		}
 		
 		// check to see if any of the Types of this ParameterizedType are
 		// TypeVariables, if so restrict them to the type parameter of the argument.
