Remove any-injecting behavior for lambda args

gselzer · gselzer · commit 16653e798694 · 2020-02-14T13:19:45.000-06:00
This could cause nasty ClassCastExceptions if users naively pass through
lambdas that do not provide the needed types.
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -888,15 +888,10 @@ private static boolean isApplicableToParameterizedTypes(final Type arg,
 
 		// get an array of the source argument types
 		Type argType = arg;
-		if (arg instanceof Class) {
-			for(int i = 0; i < srcTypes.length; i++)
-				srcTypes[i] = new Any();
-		}
-		else {
-			ParameterizedType parameterizedSuperType = (ParameterizedType) GenericTypeReflector
-					.getExactSuperType(argType, Types.raw(param));
-			srcTypes = parameterizedSuperType.getActualTypeArguments();
-		}
+		Type superType = Types
+				.getExactSuperType(argType, Types.raw(param));
+		if (superType == null || !(superType instanceof ParameterizedType)) return false;
+		srcTypes = ((ParameterizedType)superType).getActualTypeArguments();
 		
 		// List to collect the indices of destination parameters that are type vars
 		// If a type vars is contain within a parameterized type if must not be checked
diff --git a/src/test/java/org/scijava/ops/types/AnyTest.java b/src/test/java/org/scijava/ops/types/AnyTest.java
@@ -78,13 +78,6 @@ public void testRunAnyFunction1FromComputer2() {
 		assertEquals(Long.toString(in1 + in2), out.getValue());
 	}
 	
-	@SuppressWarnings("cast")
-	@Test
-	public void testAnyInjectionIntoFunctionRaws() {
-		final Function<Long, Long> func = (in) -> in / 2;
-		final Long output = (Long) new OpBuilder(ops, "test.functionAndLongToLong").input(func, 20l).outType(Long.class).apply();
-		assert(output == 10);
-	}
 }
 
 @Plugin(type = Op.class, name = "test.functionAndLongToLong")
diff --git a/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java
@@ -36,8 +36,10 @@ public class OpsAsParametersTest extends AbstractTestEnvironment {
 		return output;
 	};
 
-	@Test
-	public void TestOpWithOpField() {
+	// TODO: find a better way to check that this call fails BECAUSE func cannot be
+	// reified
+	@Test(expected=IllegalArgumentException.class)
+	public void TestOpWithNonReifiableFunction() {
 
 		List<Number> list = new ArrayList<>();
 		list.add(40l);
@@ -77,6 +79,7 @@ public void TestOpWithOpClass() {
 		}, new Nil<Double>() {
 		});
 
+		@SuppressWarnings("unused")
 		List<Double> output = new OpBuilder(ops, "test.parameter.op").input(list, funcClass).outType(new Nil<List<Double>>() {}).apply();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,6 @@ public void testRunAnyFunction1FromComputer2() {`
`78`	`78`	`assertEquals(Long.toString(in1 + in2), out.getValue());`
`79`	`79`	`}`
`80`	`80`
`81`		`- @SuppressWarnings("cast")`
`82`		`- @Test`
`83`		`- public void testAnyInjectionIntoFunctionRaws() {`
`84`		`- final Function<Long, Long> func = (in) -> in / 2;`
`85`		`- final Long output = (Long) new OpBuilder(ops, "test.functionAndLongToLong").input(func, 20l).outType(Long.class).apply();`
`86`		`- assert(output == 10);`
`87`		`- }`
`88`	`81`	`}`
`89`	`82`
`90`	`83`	`@Plugin(type = Op.class, name = "test.functionAndLongToLong")`