Prevent NSEExceptions when OpMethod type incorrect

gselzer · ctrueden · commit 39d62a3923b4 · 2021-11-15T17:25:20.000-06:00
Suppose that an Inplace OpMethod is annotated with the functional
interface BiFunction. We must catch these situations quickly and fail
before the struct is generated, as it is not the job of ParameterStructs
to deal with incorrectly annotated methods
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java
@@ -97,16 +97,15 @@ public OpMethodInfo(final Method method) {
 		}
 		this.method = method;
 		this.hints = formHints(method.getAnnotation(OpHints.class));
+		// determine the functional interface this Op should implement
+		final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
 		try {
+			opType = ParameterStructs.getOpMethodType(methodAnnotation.type(),
+				method);
 			struct = ParameterStructs.structOf(method.getDeclaringClass(), method);
-			final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class);
-			try {
-				opType = ParameterStructs.getOpMethodType(methodAnnotation.type(),
-					method);
-			}
-			catch (IllegalArgumentException e) {
-				opType = Types.parameterizeRaw(methodAnnotation.type());
-			}
+		}
+		catch (IllegalArgumentException e) {
+			problems.add(new ValidityProblem(e));
 		}
 		catch (final ValidityException e) {
 			problems.addAll(e.problems());
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java
@@ -13,6 +13,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.scijava.function.Computers;
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.OpField;
 import org.scijava.ops.OpInfo;
