Use OpInfo to resolve Op dependencies

wiedenm · wiedenm · commit fef11ee68b18 · 2019-06-28T14:00:38.000-05:00
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -182,49 +182,52 @@ public LogService logger() {
 	 * object by looking for Ops matching the field type and the name specified in
 	 * the annotation. The field type is assumed to be functional.
 	 *
-	 * @param obj
+	 * @param op
 	 * @throws OpMatchingException
 	 *             if the type of the specified object is not functional, if the Op
 	 *             matching the functional type and the name could not be found, if
 	 *             an exception occurs during injection
 	 */
-	private void resolveOpDependencies(Object obj, OpCandidate parentOp) throws OpMatchingException {
-		Object op = obj;
+	private void resolveOpDependencies(Object op, OpCandidate parentOp) throws OpMatchingException {
 		// HACK: Only works with Op instances and OpRunner, not extensible.
 		// Consider extensible ways to achieve something similar e.g. extending OpInfo
 		// to support OpDependencies.
-		if (obj instanceof OpRunner) {
-			op = ((OpRunner) obj).getAdaptedOp();
-		}
-		final List<Field> opFields = ClassUtils.getAnnotatedFields(op.getClass(), OpDependency.class);
-
-		for (final Field opField : opFields) {
-			final String opName = opField.getAnnotation(OpDependency.class).name();
-			final Type fieldType = Types.fieldType(opField, op.getClass());
-			final Type mappedFieldType = Types.mapVarToTypes(new Type[] { fieldType }, parentOp.typeVarAssigns())[0];
-
-			OpRef inferredRef = inferOpRef(mappedFieldType, opName, parentOp.typeVarAssigns());
+		if (op instanceof OpRunner) {
+			op = ((OpRunner<?>) op).getAdaptedOp();
+		}
+		final List<OpDependencyMember<?>> dependencies = parentOp.opInfo()
+			.dependencies();
+		for (final OpDependencyMember<?> dependency : dependencies) {
+			final String dependencyName = dependency.getDependencyName();
+			final Type mappedDependencyType = Types.mapVarToTypes(new Type[] {
+				dependency.getType() }, parentOp.typeVarAssigns())[0];
+			final OpRef inferredRef = inferOpRef(mappedDependencyType, dependencyName,
+				parentOp.typeVarAssigns());
 			if (inferredRef == null) {
-				throw new OpMatchingException(
-						"Could not infer functional " + "method inputs and outputs of Op dependency field: " + opField);
+				throw new OpMatchingException("Could not infer functional " +
+					"method inputs and outputs of Op dependency field: " + dependency
+						.getKey());
 			}
-
 			Object matchedOp = null;
 			try {
-				matchedOp = findOpInstance(opName, inferredRef);
-			} catch (Exception e) {
-				throw new OpMatchingException("Could not find Op that matches requested Op dependency field:"
-						+ "\nOp class: " + op.getClass().getName() + "\nDependency field: " + opField.getName()
-						+ "\n\n Attempted request:\n" + inferredRef, e);
+				matchedOp = findOpInstance(dependencyName, inferredRef);
+			}
+			catch (final Exception e) {
+				throw new OpMatchingException(
+					"Could not find Op that matches requested Op dependency field:" +
+						"\nOp class: " + op.getClass().getName() + //
+						"\nDependency field: " + dependency.getKey() + //
+						"\n\n Attempted request:\n" + inferredRef, e);
 			}
-
 			try {
-				opField.setAccessible(true);
-				opField.set(op, matchedOp);
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-				throw new OpMatchingException("Exception trying to inject Op dependency field.\n"
-						+ "\tOp dependency field to resolve: " + opField + "\n" + "\tFound Op to inject: "
-						+ matchedOp.getClass().getName() + "\n" + "\tWith inferred OpRef: " + inferredRef, e);
+				dependency.createInstance(op).set(matchedOp);
+			}
+			catch (final Exception e) {
+				throw new OpMatchingException(
+					"Exception trying to inject Op dependency field.\n" +
+						"\tOp dependency field to resolve: " + dependency.getKey() + "\n" +
+						"\tFound Op to inject: " + matchedOp.getClass().getName() + "\n" +
+						"\tWith inferred OpRef: " + inferredRef, e);
 			}
 		}
 	}
