Fix to narrow number of matching OpTransformers

gselzer · ctrueden · commit c2da31b52ead · 2019-06-11T12:36:36.000-05:00
Essentially we add in a check that makes sure that the to type that we
want is the same as the to type of the OpTransformer. This prevents
`BiFunctionToBiComputer` transformers from matching when you require a
`Computer`.
diff --git a/src/main/java/org/scijava/ops/transform/TypeModUtils.java b/src/main/java/org/scijava/ops/transform/TypeModUtils.java
@@ -237,7 +237,8 @@ public static Type replaceRawType(Type type, Class<?> searchClass, Class<?> repl
 	public static Type[] insert(Type[] types, Type type, int index) {
 		List<Type> out = new ArrayList<>();
 		out.addAll(Arrays.asList(types));
-		out.add(index, type);
+		if(index < out.size()) out.add(index, type);
+		else out.add(type);
 		return out.toArray(new Type[out.size()]);
 	}
 	
@@ -252,7 +253,7 @@ public static Type[] insert(Type[] types, Type type, int index) {
 	public static Type[] remove(Type[] types, int index) {
 		List<Type> out = new ArrayList<>();
 		out.addAll(Arrays.asList(types));
-		out.remove(index);
+		if(index < types.length) out.remove(index);
 		return out.toArray(new Type[out.size()]);
 	}
 	
diff --git a/src/main/java/org/scijava/ops/transform/functional/FunctionalTypeTransformer.java b/src/main/java/org/scijava/ops/transform/functional/FunctionalTypeTransformer.java
@@ -5,6 +5,7 @@
 import org.scijava.ops.matcher.OpRef;
 import org.scijava.ops.transform.OpTransformer;
 import org.scijava.ops.transform.TypeModUtils;
+import org.scijava.util.Types;
 
 /**
  * Interface for transformers converting between functional Op types.</br>
@@ -17,6 +18,7 @@ public interface FunctionalTypeTransformer extends OpTransformer {
 	@Override
 	default OpRef getRefTransformingTo(OpRef toRef) {
 		Type[] refTypes = toRef.getTypes();
+		if(Types.raw(refTypes[0]) != targetClass()) return null;
 		boolean hit = TypeModUtils.replaceRawTypes(refTypes, targetClass(), srcClass());
 		if (hit) {
 			return OpRef.fromTypes(toRef.getName(), refTypes, getTransformedOutputTypes(toRef),
