Add correct indices to OpRef transformation

Treiblesschorle · gselzer · commit 23eb3f4f3642 · 2019-04-12T12:54:02.000-05:00
diff --git a/src/main/java/org/scijava/ops/transform/OpRefTransformUtils.java b/src/main/java/org/scijava/ops/transform/OpRefTransformUtils.java
@@ -48,17 +48,29 @@ private OpRefTransformUtils() {
 
 	/**
 	 * Attempts to perform "unlift" transformation of the specified
-	 * {@link OpRef} if it matches the specified classes. Otherwise, null is
-	 * returned, indicating that transformation is not possible.
+	 * {@link OpRef} if it matches the specified classes. Otherwise null is
+	 * returned, indicating that transformation is not possible. If no indices
+	 * are given, all types will be unlifted.
 	 * 
-	 * @param toRef the ref to transform
-	 * @param rawSearchClass the functional raw type to look for
-	 * @param unliftRawClass the raw type of types to unlift
+	 * @param toRef
+	 *            the ref to transform
+	 * @param rawSearchClass
+	 *            the functional raw type to look for
+	 * @param unliftRawClass
+	 *            the raw type of types to unlift
+	 * @param typeArgumentIndices
+	 *            the indices of type arguments of the functional refTypes to unlift
+	 * @param argIndices
+	 *            the indices of arg types of the ref to unlift
+	 * @param outputIndices
+	 *            the indices of output types of the ref to unlift
 	 * @return
 	 */
-	public static OpRef unliftTransform(OpRef toRef, Class<?> rawSearchClass, Class<?> unliftRawClass) {
+	public static OpRef unliftTransform(OpRef toRef, Class<?> rawSearchClass, Class<?> unliftRawClass,
+			Integer[] typeArgumentIndices, Integer[] argIndices, Integer[] outputIndices) {
 		Type[] refTypes = toRef.getTypes();
-		boolean typesChanged = TypeModUtils.unliftParameterizedTypes(refTypes, rawSearchClass, unliftRawClass);
+		boolean typesChanged = TypeModUtils.unliftParameterizedTypes(refTypes, rawSearchClass, unliftRawClass,
+				typeArgumentIndices);
 		// TODO We assume here that the functional input is the first Type in
 		// this list and all others are secondary args if there are any (we do
 		// not want to touch them as they are not part of op transformations).
@@ -67,9 +79,9 @@ public static OpRef unliftTransform(OpRef toRef, Class<?> rawSearchClass, Class<
 		// need to be requested first and are thus at the beginning of the list.
 		// From the functional type we know how many there must be.
 		Type[] args = toRef.getArgs();
-		boolean argsChanged = TypeModUtils.unliftTypes(args, unliftRawClass);
+		boolean argsChanged = TypeModUtils.unliftTypes(args, unliftRawClass, argIndices);
 		Type[] outs = toRef.getOutTypes();
-		boolean outsChanged = TypeModUtils.unliftTypes(outs, unliftRawClass);
+		boolean outsChanged = TypeModUtils.unliftTypes(outs, unliftRawClass, outputIndices);
 
 		if (typesChanged && argsChanged && outsChanged) {
 			return OpRef.fromTypes(toRef.getName(), refTypes, outs, args);
diff --git a/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToIterableTransformer.java b/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToIterableTransformer.java
@@ -19,7 +19,8 @@ public Object transform(OpService opService, OpRef fromRef, Object src) {
 
 	@Override
 	public OpRef getRefTransformingTo(OpRef toRef) {
-		return OpRefTransformUtils.unliftTransform(toRef, Function.class, Iterable.class);
+		return OpRefTransformUtils.unliftTransform(toRef, Function.class, 
+				Iterable.class, new Integer[]{}, new Integer[]{0}, new Integer[]{ 0 });
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToListTransformer.java b/src/main/java/org/scijava/ops/transform/lift/LiftFunctionToListTransformer.java
@@ -20,9 +20,10 @@ public Object transform(OpService opService, OpRef fromRef, Object src) {
 
 	@Override
 	public OpRef getRefTransformingTo(OpRef toRef) {
-		return OpRefTransformUtils.unliftTransform(toRef, Function.class, List.class);
+		return OpRefTransformUtils.unliftTransform(toRef, Function.class, List.class, new Integer[] {},
+				new Integer[] { 0 }, new Integer[] { 0 });
 	}
-	
+
 	@Override
 	public Class<?> srcClass() {
 		return Function.class;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public Object transform(OpService opService, OpRef fromRef, Object src) {`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public OpRef getRefTransformingTo(OpRef toRef) {`
`22`		`- return OpRefTransformUtils.unliftTransform(toRef, Function.class, Iterable.class);`
	`22`	`+ return OpRefTransformUtils.unliftTransform(toRef, Function.class,`
	`23`	`+ Iterable.class, new Integer[]{}, new Integer[]{0}, new Integer[]{ 0 });`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`@Override`