Skip to content

Commit a1fe2cc

Browse files
committed
Use a better exception for converting engine ops
1 parent 397aa0b commit a1fe2cc

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConversionMatchingRoutine.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.scijava.ops.engine.matcher.MatchingResult;
4040
import org.scijava.ops.engine.matcher.OpMatcher;
4141
import org.scijava.ops.engine.matcher.impl.RuntimeSafeMatchingRoutine;
42+
import org.scijava.ops.spi.Op;
4243
import org.scijava.priority.Priority;
4344

4445
import java.lang.reflect.Type;
@@ -53,16 +54,18 @@ public void checkSuitability(MatchingConditions conditions)
5354
{
5455
if (conditions.hints().containsAny(BaseOpHints.Conversion.IN_PROGRESS,
5556
BaseOpHints.Conversion.FORBIDDEN)) //
56-
throw new OpMatchingException("Conversion is not disabled");
57+
throw new OpMatchingException("Conversion is disabled");
58+
if (conditions.request().getName().startsWith("engine.")) {
59+
throw new OpMatchingException( //
60+
"Conversion is unsuitable for internal engine Ops" //
61+
);
62+
}
5763
}
5864

5965
@Override
6066
public OpCandidate findMatch(MatchingConditions conditions, OpMatcher matcher,
6167
OpEnvironment env)
6268
{
63-
if (conditions.request().getName().equals("engine.create"))
64-
throw new OpMatchingException(
65-
"TODO: Avoid converting engine namespace Ops");
6669
final var convertConditions = MatchingConditions.from( //
6770
conditions.request(), //
6871
conditions.hints().plus(BaseOpHints.Conversion.IN_PROGRESS) //

0 commit comments

Comments
 (0)