Allow Dependencies to not be adaptable

gselzer · gselzer · commit 43d8ecc9d4d8 · 2020-02-14T13:19:45.000-06:00
diff --git a/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java b/src/main/java/org/scijava/ops/AnnotatedOpDependencyMember.java
@@ -61,6 +61,11 @@ public OpDependency getAnnotation() {
 	public String getDependencyName() {
 		return annotation.name();
 	}
+	
+	@Override
+	public boolean isAdaptable() {
+		return annotation.adaptable();
+	}
 
 	// -- Member methods --
 
diff --git a/src/main/java/org/scijava/ops/OpDependency.java b/src/main/java/org/scijava/ops/OpDependency.java
@@ -12,4 +12,7 @@
 	
 	/** The name of the Op to inject. */
 	String name();
+	
+	/** Set to false if the dependency should not be adapted */
+	boolean adaptable() default true;
 }
diff --git a/src/main/java/org/scijava/ops/OpDependencyMember.java b/src/main/java/org/scijava/ops/OpDependencyMember.java
@@ -39,6 +39,8 @@
 public interface OpDependencyMember<T> extends Member<T> {
 
 	String getDependencyName();
+	
+	boolean isAdaptable();
 
 	// -- Member methods --
 
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -242,7 +242,7 @@ private List<Object> resolveOpDependencies(OpCandidate op) throws OpMatchingExce
 						+ "method inputs and outputs of Op dependency field: " + dependency.getKey());
 			}
 			try {
-				resolvedDependencies.add(findOpInstance(dependencyName, inferredRef));
+				resolvedDependencies.add(findOpInstance(dependencyName, inferredRef, dependency.isAdaptable()));
 			} catch (final Exception e) {
 				throw new OpMatchingException("Could not find Op that matches requested Op dependency:" + "\nOp class: "
 						+ op.opInfo().implementationName() + //
@@ -258,10 +258,10 @@ public <T> T findOpInstance(final String opName, final Nil<T> specialType, final
 			final Nil<?> outType) {
 		final OpRef ref = OpRef.fromTypes(opName, toTypes(specialType), outType != null ? outType.getType() : null,
 				toTypes(inTypes));
-		return (T) findOpInstance(opName, ref);
+		return (T) findOpInstance(opName, ref, true);
 	}
 
-	public Object findOpInstance(final String opName, final OpRef ref) {
+	public Object findOpInstance(final String opName, final OpRef ref, boolean adaptable) {
 		Object op = null;
 		OpCandidate match = null;
 		OpTransformationCandidate transformation = null;
@@ -272,6 +272,9 @@ public Object findOpInstance(final String opName, final OpRef ref) {
 			op = match.createOp(dependencies);
 		} catch (OpMatchingException e) {
 			log.debug("No matching Op for request: " + ref + "\n");
+			if(adaptable == false) {
+				throw new IllegalArgumentException(opName + " cannot be adapted (adaptation is disabled)");
+			}
 			log.debug("Attempting Op transformation...");
 
 			// If we can't find an op matching the original request, we try to find a
diff --git a/src/main/java/org/scijava/ops/transform/functional/ComputerToFunctionTransformer.java b/src/main/java/org/scijava/ops/transform/functional/ComputerToFunctionTransformer.java
@@ -137,13 +137,13 @@ private static Object findInputAwareCreate(final OpService ops, final Class<?> c
 			Type[]::new);
 		final Type createOpType = Types.parameterize(createOpRawType, paramTypes);
 		final OpRef opRef = OpRef.fromTypes(CREATE_OP_NAME, new Type[] { createOpType }, outputParamType, inputParamTypes);
-		return ops.findOpInstance(CREATE_OP_NAME, opRef);
+		return ops.findOpInstance(CREATE_OP_NAME, opRef, true);
 	}
 
 	private static Producer<?> findCreate(final OpService ops, final Type outputParamType) {
 		final Type createOpType = Types.parameterize(Producer.class, new Type[] { outputParamType });
 		final OpRef opRef = OpRef.fromTypes(CREATE_OP_NAME, new Type[] { createOpType }, outputParamType);
-		return (Producer<?>) ops.findOpInstance(CREATE_OP_NAME, opRef);
+		return (Producer<?>) ops.findOpInstance(CREATE_OP_NAME, opRef, true);
 	}
 
 	private static <I, O> Function<I, O> computerToFunction(final Computers.Arity1<I, O> src, final Object inputAwareCreate,

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@`
`12`	`12`
`13`	`13`	`/** The name of the Op to inject. */`
`14`	`14`	`String name();`
	`15`	`+`
	`16`	`+ /** Set to false if the dependency should not be adapted */`
	`17`	`+ boolean adaptable() default true;`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,13 +137,13 @@ private static Object findInputAwareCreate(final OpService ops, final Class<?> c`
`137`	`137`	`Type[]::new);`
`138`	`138`	`final Type createOpType = Types.parameterize(createOpRawType, paramTypes);`
`139`	`139`	`final OpRef opRef = OpRef.fromTypes(CREATE_OP_NAME, new Type[] { createOpType }, outputParamType, inputParamTypes);`
`140`		`- return ops.findOpInstance(CREATE_OP_NAME, opRef);`
	`140`	`+ return ops.findOpInstance(CREATE_OP_NAME, opRef, true);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`private static Producer<?> findCreate(final OpService ops, final Type outputParamType) {`
`144`	`144`	`final Type createOpType = Types.parameterize(Producer.class, new Type[] { outputParamType });`
`145`	`145`	`final OpRef opRef = OpRef.fromTypes(CREATE_OP_NAME, new Type[] { createOpType }, outputParamType);`
`146`		`- return (Producer<?>) ops.findOpInstance(CREATE_OP_NAME, opRef);`
	`146`	`+ return (Producer<?>) ops.findOpInstance(CREATE_OP_NAME, opRef, true);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`private static <I, O> Function<I, O> computerToFunction(final Computers.Arity1<I, O> src, final Object inputAwareCreate,`