Add second version of unroll

Treiblesschorle · ctrueden · commit ce0d2b15e4a0 · 2019-04-18T12:16:30.000-05:00
This version allows to specify if type vars should be followed.
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -1230,6 +1230,20 @@ public static Class<?> erase(final Type type)
 		return GenericTypeReflector.erase(type);
 	}
 
+	/**
+	 * See {@link TypeUtils#unrollVariables(Map, Type, boolean)}
+	 * 
+	 * @param typeArguments
+	 * @param type
+	 * @param followTypeVars
+	 * @return
+	 */
+	public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
+			final Type type, boolean followTypeVars)
+	{
+		return TypeUtils.unrollVariables(typeArguments, type, followTypeVars);
+	}
+	
 	// -- Helper methods --
 
 	private static IllegalArgumentException iae(final String... s) {
@@ -2804,13 +2818,36 @@ public static Type getArrayComponentType(final Type type) {
 		 */
 		public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
 			final Type type)
+		{
+			return unrollVariables(typeArguments, type, true);
+		}
+		
+		/**
+		 * Get a type representing {@code type} with variable assignments
+		 * "unrolled."
+		 *
+		 * @param typeArguments as from
+		 *          {@link TypeUtils#getTypeArguments(Type, Class)}
+		 * @param type the type to unroll variable assignments for
+		 * @param followTypeVars whether a {@link TypeVariable} should be recursively followed
+		 * 			if it maps to another {@link TypeVariable}, or if it should be just replaced
+		 * 			by the mapping
+		 * @return Type
+		 * @since 3.2
+		 */
+		public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
+			final Type type, boolean followTypeVars)
 		{
 			if (typeArguments == null) {
 				typeArguments = Collections.<TypeVariable<?>, Type> emptyMap();
 			}
 			if (containsTypeVariables(type)) {
 				if (type instanceof TypeVariable) {
-					return unrollVariables(typeArguments, typeArguments.get(type));
+					if (followTypeVars) {
+						return unrollVariables(typeArguments, typeArguments.get(type));
+					} else {
+						return typeArguments.get(type);
+					}
 				}
 				if (type instanceof ParameterizedType) {
 					final ParameterizedType p = (ParameterizedType) type;
