Refactor ManualOpCandidate into constructor

gselzer · ctrueden · commit e2647a10f994 · 2022-07-01T16:21:57.000-05:00
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/OpCandidate.java
@@ -31,6 +31,7 @@
 
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,10 +44,10 @@
 
 /**
  * Container class for a possible operation match between an {@link OpRef} and
- * an {@link OpInfo}, as computed by the {@link OpMatcher}.
+ * an {@link OpInfo}.
  *
  * @author Curtis Rueden
- * @see OpMatcher
+ * @author Gabriel Selzer
  */
 public class OpCandidate {
 
@@ -89,6 +90,10 @@ public OpCandidate(final OpEnvironment env, final OpRef ref, final OpInfo info,
 		this.reifiedType = getReifiedType(ref, info, typeVarAssigns);
 	}
 
+	public OpCandidate(final OpEnvironment env, final OpRef ref, final OpInfo info) {
+			this(env, ref, info, typeVarAssignsFromRefAndInfo(ref, info));
+	}
+
 	public static Type getReifiedType(OpRef ref, OpInfo info, Map<TypeVariable<?>, Type> typeVarAssigns) {
 		Type exactSuperType = Types.getExactSuperType(info.opType(), Types.raw(ref.getType()));
 		return Types.mapVarToTypes(exactSuperType, typeVarAssigns);
@@ -237,4 +242,13 @@ public Object createOp(List<?> dependencies)
 		return createOpInstance(dependencies).object();
 	}
 
+	// -- Helper methods -- //
+	private static Map<TypeVariable<?>, Type> typeVarAssignsFromRefAndInfo(final OpRef ref, final OpInfo info) {
+		Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
+		if (!ref.typesMatch(info.opType(), typeVarAssigns))
+			throw new IllegalArgumentException(
+					"OpInfo " + info + " cannot satisfy the requirements contained within OpRef " + ref);
+		return typeVarAssigns;
+	}
+
 }
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -353,8 +353,7 @@ private MatchingConditions insertCacheHit(final OpRef ref, final Hints hints,
 		MatchingConditions conditions = MatchingConditions.from(ref, hints);
 
 		// create new OpCandidate from ref and info
-		OpCandidate candidate = new ManualOpCandidate(this, ref, info,
-			this.matcher);
+		OpCandidate candidate = new OpCandidate(this, ref, info);
 
 		instantiateAndCache(conditions, candidate);
 
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/ManualOpCandidate.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/ManualOpCandidate.java
