Do not export any scijava-ops-engine API

ctrueden · ctrueden · commit 31353d64ca0e · 2024-05-22T23:19:08.000-05:00
Nothing needs to consume it right now.
diff --git a/scijava-ops-engine/src/main/java/module-info.java b/scijava-ops-engine/src/main/java/module-info.java
@@ -33,11 +33,6 @@
  */
 
 module org.scijava.ops.engine {
-
-	exports org.scijava.ops.engine;
-	exports org.scijava.ops.engine.conversionLoss;
-	exports org.scijava.ops.engine.util;
-
 	requires java.compiler;
 
 	requires org.scijava.common3;
@@ -57,7 +52,6 @@
 	requires org.slf4j;
 	requires org.yaml.snakeyaml;
 
-
 	uses javax.annotation.processing.Processor;
 	uses org.scijava.discovery.Discoverer;
 	uses org.scijava.ops.engine.InfoTreeGenerator;
diff --git a/scijava-ops-engine/templates/main/java/module-info.vm b/scijava-ops-engine/templates/main/java/module-info.vm
@@ -4,11 +4,6 @@
  */
 
 module org.scijava.ops.engine {
-
-	exports org.scijava.ops.engine;
-	exports org.scijava.ops.engine.conversionLoss;
-	exports org.scijava.ops.engine.util;
-
 	requires java.compiler;
 
 	requires org.scijava.common3;
@@ -28,7 +23,6 @@ module org.scijava.ops.engine {
 	requires org.slf4j;
 	requires org.yaml.snakeyaml;
 
-
 	uses javax.annotation.processing.Processor;
 	uses org.scijava.discovery.Discoverer;
 	uses org.scijava.ops.engine.InfoTreeGenerator;
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/AbstractOpTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/AbstractOpTest.java
@@ -34,7 +34,6 @@
 
 import org.scijava.ops.api.Hints;
 import org.scijava.ops.api.OpEnvironment;
-import org.scijava.ops.engine.BaseOpHints;
 import org.scijava.ops.spi.Op;
 
 import io.scif.img.IO;
@@ -67,7 +66,7 @@ public abstract class AbstractOpTest {
 	protected static final OpEnvironment ops = OpEnvironment.build();
 
 	static {
-		ops.setDefaultHints(new Hints(BaseOpHints.Progress.TRACK));
+		ops.setDefaultHints(new Hints("progress.TRACK"));
 	}
 
 	private int seed;
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryNumericTypeMathTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryNumericTypeMathTest.java
@@ -34,7 +34,6 @@
 import org.scijava.ops.image.AbstractOpTest;
 import net.imglib2.type.numeric.integer.IntType;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.math.MathOps;
 
 /**
  * Tests {@link BinaryNumericTypeMath}.
@@ -54,7 +53,7 @@ public class BinaryNumericTypeMathTest extends AbstractOpTest {
 	public void testAdd() {
 		IntType e = A.copy();
 		e.add(B);
-		test(MathOps.ADD, e.get());
+		test("math.add", e.get());
 	}
 
 	// SUB
@@ -63,7 +62,7 @@ public void testAdd() {
 	public void testSub() {
 		IntType e = A.copy();
 		e.sub(B);
-		test(MathOps.SUB, e.get());
+		test("math.sub", e.get());
 	}
 
 	// DIV
@@ -72,7 +71,7 @@ public void testSub() {
 	public void testDiv() {
 		IntType e = A.copy();
 		e.div(B);
-		test(MathOps.DIV, e.get());
+		test("math.div", e.get());
 	}
 
 	// MUL
@@ -81,7 +80,7 @@ public void testDiv() {
 	public void testMul() {
 		IntType e = A.copy();
 		e.mul(B);
-		test(MathOps.MUL, e.get());
+		test("math.mul", e.get());
 	}
 
 	// POW
@@ -90,7 +89,7 @@ public void testMul() {
 	public void testPow() {
 		IntType e = A.copy();
 		e.pow(B);
-		test(MathOps.POW, e.get());
+		test("math.pow", e.get());
 	}
 
 	// -- Helpers --
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryRealTypeMathTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/math/BinaryRealTypeMathTest.java
@@ -33,7 +33,6 @@
 import net.imglib2.type.numeric.integer.IntType;
 import net.imglib2.type.numeric.real.DoubleType;
 import org.junit.jupiter.api.Test;
-import org.scijava.ops.engine.math.MathOps;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -55,7 +54,7 @@ public class BinaryRealTypeMathTest extends AbstractOpTest {
 	public void testAdd() {
 		DoubleType e = A.copy();
 		e.set(e.get() + B.get());
-		test(MathOps.ADD, e.get());
+		test("math.add", e.get());
 	}
 
 	// SUB
@@ -64,7 +63,7 @@ public void testAdd() {
 	public void testSub() {
 		DoubleType e = A.copy();
 		e.set(e.get() - B.get());
-		test(MathOps.SUB, e.get());
+		test("math.sub", e.get());
 	}
 
 	// DIV
@@ -73,7 +72,7 @@ public void testSub() {
 	public void testDiv() {
 		DoubleType e = A.copy();
 		e.set(e.get() / B.get());
-		test(MathOps.DIV, e.get());
+		test("math.div", e.get());
 	}
 
 	// MUL
@@ -82,7 +81,7 @@ public void testDiv() {
 	public void testMul() {
 		DoubleType e = A.copy();
 		e.set(e.get() * B.get());
-		test(MathOps.MUL, e.get());
+		test("math.mul", e.get());
 	}
 
 	// POW
@@ -91,14 +90,14 @@ public void testMul() {
 	public void testPow() {
 		DoubleType e = A.copy();
 		e.set(Math.pow(e.get(), B.get()));
-		test(MathOps.POW, e.get());
+		test("math.pow", e.get());
 	}
 
 	// MOD
 
 	@Test
 	public void testMod() {
-		test(MathOps.MOD, A.get() % B.get());
+		test("math.mod", A.get() % B.get());
 	}
 
 	// OR
