Move MatchingConditions/MatchingRoutine to API

gselzer · ctrueden · commit 4c7278ce09e5 · 2021-12-06T16:44:07.000-06:00
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingConditions.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingConditions.java
@@ -1,5 +1,5 @@
 
-package org.scijava.ops.engine.impl;
+package org.scijava.ops.api.features;
 
 import java.util.Objects;
 
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingResult.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingResult.java
@@ -1,4 +1,4 @@
-package org.scijava.ops.engine.matcher;
+package org.scijava.ops.api.features;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,13 +7,12 @@
 import org.scijava.ops.api.OpRef;
 import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.api.OpCandidate.StatusCode;
-import org.scijava.ops.api.features.OpMatchingException;
 
 /**
- * Class representing the result from type matching done by the
- * {@link OpMatcher}. Contains the original candidates which match
- * the types specified by {@link OpRef} and the final matches that match all
- * inputs, outputs, and arguments.
+ * Class representing the result from type matching done by a
+ * {@link MatchingRoutine}. Contains the original candidates which match the
+ * types specified by {@link OpRef} and the final matches that match all inputs,
+ * outputs, and arguments.
  * 
  * @author David Kolb
  */
diff --git a/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingRoutine.java b/scijava/scijava-ops-api/src/main/java/org/scijava/ops/api/features/MatchingRoutine.java
@@ -0,0 +1,8 @@
+package org.scijava.ops.api.features;
+
+
+public interface MatchingRoutine {
+
+	MatchingResult match(MatchingConditions conditions);
+
+}
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
@@ -65,6 +65,7 @@
 import org.scijava.ops.api.OpWrapper;
 import org.scijava.ops.api.RichOp;
 import org.scijava.ops.api.features.DependencyMatchingException;
+import org.scijava.ops.api.features.MatchingConditions;
 import org.scijava.ops.api.features.OpMatchingException;
 import org.scijava.ops.api.features.BaseOpHints.Adaptation;
 import org.scijava.ops.api.features.BaseOpHints.DependencyMatching;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpMatcher.java
@@ -35,7 +35,7 @@
 import org.scijava.ops.api.OpCandidate;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpRef;
-import org.scijava.ops.engine.matcher.MatchingResult;
+import org.scijava.ops.api.features.MatchingResult;
 
 /**
  * Finds Ops which match an {@link OpRef}.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpMatcher.java
@@ -50,9 +50,9 @@
 import org.scijava.ops.api.OpRef;
 import org.scijava.ops.api.OpUtils;
 import org.scijava.ops.api.OpCandidate.StatusCode;
+import org.scijava.ops.api.features.MatchingResult;
 import org.scijava.ops.api.features.BaseOpHints.Simplification;
 import org.scijava.ops.engine.hint.DefaultHints;
-import org.scijava.ops.engine.matcher.MatchingResult;
 import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.ops.engine.simplify.InfoSimplificationGenerator;
 import org.scijava.service.AbstractService;
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java
@@ -37,12 +37,6 @@ public SynthesizedParameterMember(final FunctionalMethodType fmt, final Producer
 		this.descriptionGenerator = () -> synthesizerGenerator.create().description(fmt);
 	}
 
-	public SynthesizedParameterMember(final Type itemType, final String name,
-		final String description, final ItemIO ioType)
-	{
-		throw new UnsupportedOperationException();
-	}
-
 	// -- Member methods --
 
 	@Override
diff --git a/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java b/scijava/scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/OpCachingTest.java
@@ -42,6 +42,7 @@
 import org.scijava.function.Producer;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.ops.api.OpInstance;
+import org.scijava.ops.api.features.MatchingConditions;
 import org.scijava.ops.engine.AbstractTestEnvironment;
 import org.scijava.ops.engine.OpService;
 import org.scijava.ops.spi.Op;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-package org.scijava.ops.engine.impl;`
	`2`	`+package org.scijava.ops.api.features;`
`3`	`3`
`4`	`4`	`import java.util.Objects;`
`5`	`5`