Fix for primitives

Treiblesschorle · ctrueden · commit f39460b9da57 · 2019-04-18T12:16:31.000-05:00
diff --git a/src/main/java/org/scijava/ops/transform/TypeModUtils.java b/src/main/java/org/scijava/ops/transform/TypeModUtils.java
@@ -37,8 +37,11 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.scijava.util.ClassUtils;
 import org.scijava.util.Types;
 
+import com.google.common.primitives.Primitives;
+
 /**
  * Utility class to do modification on {@link Type}s.
  * 
@@ -108,8 +111,11 @@ public static Type unliftParameterizedType(Type type, Class<?> searchRawType, Cl
 			if (Types.raw(type).equals(searchRawType)) {
 				Type[] typeArgs = casted.getActualTypeArguments();
 				boolean hit = unliftTypes(typeArgs, unliftRawArgType, argIndices);
-				
-				if(hit) {
+				// Types can't be parameterized with primitives in java.
+				// Hence, if the unlifting of type args would result in
+				// primitives, we would create an invalid type
+				boolean containsPrimitive = containsPrimitive(typeArgs);
+				if(hit && !containsPrimitive) {
 					return Types.parameterize(searchRawType, typeArgs);
 				}
 			}
@@ -270,4 +276,8 @@ private static boolean mutateTypes(Type[] types, Function<Type, Type> typeFunc,
 		}
 		return hit;
 	}
+	
+	private static boolean containsPrimitive(Type[] types) {
+		return Arrays.stream(types).anyMatch(t -> Types.raw(t).isPrimitive());
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,11 @@`
`37`	`37`	`import java.util.List;`
`38`	`38`	`import java.util.function.Function;`
`39`	`39`
	`40`	`+import org.scijava.util.ClassUtils;`
`40`	`41`	`import org.scijava.util.Types;`
`41`	`42`
	`43`	`+import com.google.common.primitives.Primitives;`
	`44`	`+`
`42`	`45`	`/**`
`43`	`46`	`* Utility class to do modification on {@link Type}s.`
`44`	`47`	`*`
`@@ -108,8 +111,11 @@ public static Type unliftParameterizedType(Type type, Class<?> searchRawType, Cl`
`108`	`111`	`if (Types.raw(type).equals(searchRawType)) {`
`109`	`112`	`Type[] typeArgs = casted.getActualTypeArguments();`
`110`	`113`	`boolean hit = unliftTypes(typeArgs, unliftRawArgType, argIndices);`
`111`		`-`
`112`		`- if(hit) {`
	`114`	`+ // Types can't be parameterized with primitives in java.`
	`115`	`+ // Hence, if the unlifting of type args would result in`
	`116`	`+ // primitives, we would create an invalid type`
	`117`	`+ boolean containsPrimitive = containsPrimitive(typeArgs);`
	`118`	`+ if(hit && !containsPrimitive) {`
`113`	`119`	`return Types.parameterize(searchRawType, typeArgs);`
`114`	`120`	`}`
`115`	`121`	`}`
`@@ -270,4 +276,8 @@ private static boolean mutateTypes(Type[] types, Function<Type, Type> typeFunc,`
`270`	`276`	`}`
`271`	`277`	`return hit;`
`272`	`278`	`}`
	`279`	`+`
	`280`	`+ private static boolean containsPrimitive(Type[] types) {`
	`281`	`+ return Arrays.stream(types).anyMatch(t -> Types.raw(t).isPrimitive());`
	`282`	`+ }`
`273`	`283`	`}`