Migrate Producer

gselzer · gselzer · commit 091f92cfc3e4 · 2021-06-25T14:01:16.000-05:00
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java
@@ -20,7 +20,7 @@
 
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java
@@ -52,7 +52,7 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Functions;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.plugin.Plugin;
 
 @Plugin(type = OpCollection.class)
diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateNativeTypeTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateNativeTypeTest.java
@@ -41,7 +41,7 @@
 
 import org.junit.jupiter.api.Test;
 import net.imagej.ops2.AbstractOpTest;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.types.Nil;
 
 /**
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java
@@ -42,7 +42,7 @@
 import org.scijava.ops.core.Op;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java
@@ -41,7 +41,7 @@
 import org.scijava.ops.core.Op;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java
@@ -41,11 +41,11 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.function.ComputerUtils;
 import org.scijava.ops.function.FunctionUtils;
 import org.scijava.ops.function.InplaceUtils;
-import org.scijava.ops.function.Producer;
 import org.scijava.ops.hints.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java
@@ -6,7 +6,7 @@
 import org.scijava.Priority;
 import org.scijava.ops.OpField;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/function/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/function/FunctionUtils.java
@@ -15,6 +15,7 @@
 import java.util.function.Function;
 
 import org.scijava.functions.Functions;
+import org.scijava.functions.Producer;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.hints.Hints;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/function/Functions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/function/Functions.java
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/function/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/function/OpWrappers.java
@@ -12,6 +12,7 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.functions.annotations.Container;
 import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/function/Producer.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/function/Producer.java
diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java
@@ -15,7 +15,7 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 
 /**
  * Utility providing adaptation between {@link Op} types.
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java
@@ -41,7 +41,7 @@
 import org.scijava.Context;
 import org.scijava.ops.core.Op;
 import org.scijava.ops.core.OpCollection;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.ops.impl.DefaultOpEnvironment;
 import org.scijava.ops.impl.MatchingConditions;
 import org.scijava.ops.matcher.OpRef;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java
@@ -6,7 +6,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.scijava.Priority;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.ops.matcher.OpClassInfo;
 import org.scijava.param.Parameter;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java
@@ -42,7 +42,7 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java
@@ -37,7 +37,7 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.scijava.Priority;
 import org.scijava.ops.core.Op;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.types.Nil;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java
@@ -42,7 +42,7 @@
 import org.scijava.ops.core.OpCollection;
 import org.scijava.ops.core.builder.OpBuilder;
 import org.scijava.functions.Computers;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java
@@ -41,7 +41,7 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 
 /**
  * Tests {@link OpBuilder}. For each arity, we test the following matches and
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java
@@ -37,7 +37,7 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/function/OpWrappersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/function/OpWrappersTest.java
@@ -15,10 +15,11 @@
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.ops.function.ComputerUtils;
 import org.scijava.ops.function.FunctionUtils;
 import org.scijava.ops.function.InplaceUtils;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java
@@ -11,7 +11,7 @@
 import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.ops.core.Op;
 import org.scijava.functions.Computers;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.types.Any;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm
@@ -42,7 +42,7 @@ import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm
@@ -41,7 +41,7 @@ import org.scijava.ops.OpDependency;
 import org.scijava.ops.core.Op;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm
@@ -41,11 +41,11 @@ import java.util.function.Function;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.function.ComputerUtils;
 import org.scijava.ops.function.FunctionUtils;
 import org.scijava.ops.function.InplaceUtils;
-import org.scijava.ops.function.Producer;
 import org.scijava.ops.hints.Hints;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/function/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/function/FunctionUtils.vm
@@ -15,6 +15,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.scijava.functions.Functions;
+import org.scijava.functions.Producer;
 import org.scijava.ops.OpEnvironment;
 import org.scijava.ops.hints.Hints;
 import org.scijava.types.Nil;
diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/function/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/function/OpWrappers.vm
@@ -12,6 +12,7 @@ import java.util.function.Function;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.functions.annotations.Container;
 import org.scijava.ops.util.OpWrapper;
 import org.scijava.plugin.Plugin;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm
@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.scijava.ops.core.OpCollection;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm
@@ -37,7 +37,7 @@ import org.scijava.ops.core.OpCollection;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm
@@ -41,7 +41,7 @@ import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 
 /**
  * Tests {@link OpBuilder}. For each arity, we test the following matches and
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm
@@ -37,7 +37,7 @@ import org.scijava.ops.core.OpCollection;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/function/OpWrappersTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/function/OpWrappersTest.vm
@@ -15,10 +15,11 @@ import org.scijava.ops.AbstractTestEnvironment;
 import org.scijava.functions.Computers;
 import org.scijava.functions.Functions;
 import org.scijava.functions.Inplaces;
+import org.scijava.functions.Producer;
 import org.scijava.ops.function.ComputerUtils;
 import org.scijava.ops.function.FunctionUtils;
 import org.scijava.ops.function.InplaceUtils;
-import org.scijava.ops.function.Producer;
+import org.scijava.functions.Producer;
 import org.scijava.types.GenericTyped;
 import org.scijava.types.Nil;
 
