Remove SJC dep in SciJava Ops SPI

gselzer · ctrueden · commit a0dfaa970272 · 2022-07-01T16:21:57.000-05:00
This required we delete the PluginBasedClassOpInfoGenerator, since the
Op interface no longer extended SciJavaPlugin. But that's fine, since we
were going to delete that anyways!
diff --git a/scijava/scijava-ops-engine/src/main/java/module-info.java b/scijava/scijava-ops-engine/src/main/java/module-info.java
@@ -70,7 +70,6 @@
 	provides org.scijava.ops.api.OpInfoGenerator with
 	    org.scijava.ops.engine.impl.OpClassBasedClassOpInfoGenerator,
 	    org.scijava.ops.engine.impl.OpCollectionInfoGenerator,
-			org.scijava.ops.engine.impl.PluginBasedClassOpInfoGenerator,
 			org.scijava.ops.engine.impl.TherapiOpInfoGenerator;
 
 	provides org.scijava.ops.api.OpWrapper with
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/PluginBasedClassOpInfoGenerator.java
diff --git a/scijava/scijava-ops-engine/templates/main/java/module-info.vm b/scijava/scijava-ops-engine/templates/main/java/module-info.vm
@@ -60,7 +60,6 @@ module org.scijava.ops.engine {
 	provides org.scijava.ops.api.OpInfoGenerator with
 	    org.scijava.ops.engine.impl.OpClassBasedClassOpInfoGenerator,
 	    org.scijava.ops.engine.impl.OpCollectionInfoGenerator,
-		org.scijava.ops.engine.impl.PluginBasedClassOpInfoGenerator,
 		org.scijava.ops.engine.impl.TherapiOpInfoGenerator;
 
 	provides org.scijava.ops.api.OpWrapper with
diff --git a/scijava/scijava-ops-spi/pom.xml b/scijava/scijava-ops-spi/pom.xml
@@ -108,10 +108,6 @@
 	</properties>
 	<dependencies>
 		<!-- SciJava dependencies -->
-		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-common</artifactId>
-		</dependency>
 
 		<!-- Test scope dependencies -->
 	</dependencies>
diff --git a/scijava/scijava-ops-spi/src/main/java/module-info.java b/scijava/scijava-ops-spi/src/main/java/module-info.java
@@ -2,6 +2,4 @@
 
 	exports org.scijava.ops.spi;
 
-	requires org.scijava;
-
 }
diff --git a/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/Op.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/Op.java
@@ -1,7 +1,8 @@
 package org.scijava.ops.spi;
 
-import org.scijava.plugin.SciJavaPlugin;
-
-public interface Op extends SciJavaPlugin {
+/**
+ * TODO: What is an Op?
+ */
+public interface Op {
 	// Marker interface.
 }
diff --git a/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpClass.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpClass.java
@@ -5,8 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.Priority;
-
 /** Annotates an Op declared as a field in an {@link OpCollection}. */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
@@ -18,6 +16,14 @@
 	// to help().
 	String[] params() default "";
 
-	double priority() default Priority.NORMAL;
+	/**
+	 * Returns the priority of this Op
+	 *
+	 * By default, Ops have a priority of 0.0 (corresponding to
+	 * org.scijava.priority.Priority.NORMAL
+	 *
+	 * @return the priority of the Op
+	 */
+	double priority() default 0.0;
 
 }
diff --git a/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpCollection.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpCollection.java
@@ -1,8 +1,6 @@
 package org.scijava.ops.spi;
 
-import org.scijava.plugin.SciJavaPlugin;
-
-/** A plugin marking a collection of ops defined as instance fields. */
-public interface OpCollection extends SciJavaPlugin {
+/** An interface marking a collection of ops defined as instance fields. */
+public interface OpCollection {
 	// Marker interface.
 }
diff --git a/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpField.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpField.java
@@ -5,8 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.Priority;
-
 /** Annotates an Op declared as a field in an {@link OpCollection}. */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -19,6 +17,14 @@
 	//TODO: add default names support in OpFieldInfo
 	String[] params() default "";
 
-	double priority() default Priority.NORMAL;
+	/**
+	 * Returns the priority of this Op
+	 *
+	 * By default, Ops have a priority of 0.0 (corresponding to
+	 * org.scijava.priority.Priority.NORMAL
+	 *
+	 * @return the priority of the Op
+	 */
+	double priority() default 0.0;
 
 }
diff --git a/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpMethod.java b/scijava/scijava-ops-spi/src/main/java/org/scijava/ops/spi/OpMethod.java
@@ -35,8 +35,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.Priority;
-
 /**
  * @author Marcel Wiedenmann
  */
@@ -48,6 +46,14 @@
 
 	Class<?> type();
 
-	double priority() default Priority.NORMAL;
-
-}
+	/**
+	 * Returns the priority of this Op
+	 * 
+	 * By default, Ops have a priority of 0.0 (corresponding to
+	 * org.scijava.priority.Priority.NORMAL
+	 * 
+	 * @return the priority of the Op
+	 */
+	double priority() default 0.0;
+
+}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,4 @@`
`2`	`2`
`3`	`3`	`exports org.scijava.ops.spi;`
`4`	`4`
`5`		`- requires org.scijava;`
`6`		`-`
`7`	`5`	`}`