Add getExactSuperType and parameterizeRaw methods

Treiblesschorle · ctrueden · commit fe8107b4fc35 · 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
@@ -1230,6 +1230,19 @@ public static Class<?> erase(final Type type)
 		return GenericTypeReflector.erase(type);
 	}
 
+	/**
+	 * See {@link GenericTypeReflector#getExactSuperType(Type, Class)}
+	 * 
+	 * @param type
+	 * @param searchClass
+	 * @return
+	 */
+	public static Type getExactSuperType(final Type type,
+			final Class<?> searchClass)
+	{
+		return GenericTypeReflector.getExactSuperType(type, searchClass);
+	}
+	
 	/**
 	 * See {@link TypeUtils#unrollVariables(Map, Type, boolean)}
 	 * 
@@ -1244,6 +1257,23 @@ public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
 		return TypeUtils.unrollVariables(typeArguments, type, followTypeVars);
 	}
 	
+	/**
+	 * Tries to parameterize the given raw type with its type parameters. If
+	 * type is not raw, it will be returned. Otherwise, a parameterized type
+	 * containing the type variables of the specified is returned.
+	 * 
+	 * @param rawType
+	 *            the raw type to parameterize
+	 * @return either the input of not raw, or a parameterized type
+	 */
+	public static Type parameterizeRaw(Class<?> rawType) {
+		TypeVariable<?>[] typeParams = rawType.getTypeParameters();
+		if (typeParams.length == 0) {
+			return rawType;
+		}
+		return Types.parameterize(rawType, typeParams);
+	}
+	
 	// -- Helper methods --
 
 	private static IllegalArgumentException iae(final String... s) {
