Fix OpRef transformer for Function to Computer

Treiblesschorle · ctrueden · commit ca42427d49fe · 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
@@ -32,6 +32,7 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
@@ -219,6 +220,37 @@ public static Type replaceRawType(Type type, Class<?> searchClass, Class<?> repl
 		return null;
 	}
 	
+	/**
+	 * Insert the specified type at the specified index into the specified array.
+	 * Has the same behavior as {@link List#add(int, Object)}.
+	 * 
+	 * @param types
+	 * @param type
+	 * @param index
+	 * @return
+	 */
+	public static Type[] insert(Type[] types, Type type, int index) {
+		List<Type> out = new ArrayList<>();
+		out.addAll(Arrays.asList(types));
+		out.add(index, type);
+		return out.toArray(new Type[out.size()]);
+	}
+	
+	/**
+	 * Remove the specified index from the specified array.
+	 * Has the same behavior as {@link List#remove(int)}.
+	 * 
+	 * @param types
+	 * @param index
+	 * @return
+	 */
+	public static Type[] remove(Type[] types, int index) {
+		List<Type> out = new ArrayList<>();
+		out.addAll(Arrays.asList(types));
+		out.remove(index);
+		return out.toArray(new Type[out.size()]);
+	}
+	
 	private static boolean mutateTypes(Type[] types, Function<Type, Type> typeFunc, Integer... indices) {
 		List<Integer> is = Arrays.asList(indices);
 		
diff --git a/src/main/java/org/scijava/ops/transform/impl/FunctionToComputerTransformer.java b/src/main/java/org/scijava/ops/transform/impl/FunctionToComputerTransformer.java
@@ -36,7 +36,10 @@ public OpRef getFromTransformTo(OpRef toRef) {
 		Type[] refTypes = toRef.getTypes();
 		boolean hit = TypeModUtils.replaceRawTypes(refTypes, Computer.class, Function.class);
 		if (hit) {
-			return OpRef.fromTypes(toRef.getName(), refTypes, toRef.getOutTypes(), toRef.getArgs());
+			// The computer has a ItemIO.BOTH as second functional parameter of type output.
+			// This is not the case for a Function, hence we remove it.
+			Type[] functionArgs = TypeModUtils.remove(toRef.getArgs(), 1);
+			return OpRef.fromTypes(toRef.getName(), refTypes, toRef.getOutTypes(), functionArgs);
 		}
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@ public OpRef getFromTransformTo(OpRef toRef) {`
`36`	`36`	`Type[] refTypes = toRef.getTypes();`
`37`	`37`	`boolean hit = TypeModUtils.replaceRawTypes(refTypes, Computer.class, Function.class);`
`38`	`38`	`if (hit) {`
`39`		`- return OpRef.fromTypes(toRef.getName(), refTypes, toRef.getOutTypes(), toRef.getArgs());`
	`39`	`+ // The computer has a ItemIO.BOTH as second functional parameter of type output.`
	`40`	`+ // This is not the case for a Function, hence we remove it.`
	`41`	`+ Type[] functionArgs = TypeModUtils.remove(toRef.getArgs(), 1);`
	`42`	`+ return OpRef.fromTypes(toRef.getName(), refTypes, toRef.getOutTypes(), functionArgs);`
`40`	`43`	`}`
`41`	`44`	`return null;`
`42`	`45`	`}`