Restructure packages

Treiblesschorle · ctrueden · commit 26f7b39d854c · 2019-04-18T12:16:31.000-05:00
diff --git a/src/main/java/org/scijava/ops/OpEnvironment.java b/src/main/java/org/scijava/ops/OpEnvironment.java
@@ -27,10 +27,13 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops;
 
 import java.util.Collection;
 
+import org.scijava.ops.matcher.OpInfo;
+import org.scijava.ops.matcher.OpRef;
+
 /**
  * An op environment is the top-level entry point into op execution. It provides
  * all the built-in functionality of ops in a single place, including:
diff --git a/src/main/java/org/scijava/ops/OpService.java b/src/main/java/org/scijava/ops/OpService.java
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package org.scijava.ops.base;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -35,7 +35,12 @@
 
 import org.scijava.InstantiableException;
 import org.scijava.log.LogService;
-import org.scijava.ops.Op;
+import org.scijava.ops.core.Op;
+import org.scijava.ops.matcher.MatchingResult;
+import org.scijava.ops.matcher.OpCandidate;
+import org.scijava.ops.matcher.OpInfo;
+import org.scijava.ops.matcher.OpRef;
+import org.scijava.ops.matcher.OpTypeMatchingService;
 import org.scijava.ops.util.Inject;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/src/main/java/org/scijava/ops/OpUtils.java b/src/main/java/org/scijava/ops/OpUtils.java
@@ -27,13 +27,17 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops;
 
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.scijava.ops.base.OpCandidate.StatusCode;
+import org.scijava.ops.matcher.MatchingResult;
+import org.scijava.ops.matcher.OpCandidate;
+import org.scijava.ops.matcher.OpInfo;
+import org.scijava.ops.matcher.OpRef;
+import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.param.ParameterMember;
 import org.scijava.struct.Member;
 import org.scijava.struct.MemberInstance;
diff --git a/src/main/java/org/scijava/ops/core/BiComputer.java b/src/main/java/org/scijava/ops/core/BiComputer.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 @FunctionalInterface
 public interface BiComputer<I1, I2, O> extends TriConsumer<I1, I2, O> {
diff --git a/src/main/java/org/scijava/ops/core/BiInplace1.java b/src/main/java/org/scijava/ops/core/BiInplace1.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.BiConsumer;
 
diff --git a/src/main/java/org/scijava/ops/core/BiInplace2.java b/src/main/java/org/scijava/ops/core/BiInplace2.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.BiConsumer;
 
diff --git a/src/main/java/org/scijava/ops/core/Computer.java b/src/main/java/org/scijava/ops/core/Computer.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.BiConsumer;
 
diff --git a/src/main/java/org/scijava/ops/core/Inplace.java b/src/main/java/org/scijava/ops/core/Inplace.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/org/scijava/ops/core/NullaryComputer.java b/src/main/java/org/scijava/ops/core/NullaryComputer.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/org/scijava/ops/core/OneToOneCommand.java b/src/main/java/org/scijava/ops/core/OneToOneCommand.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/org/scijava/ops/core/Op.java b/src/main/java/org/scijava/ops/core/Op.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import org.scijava.plugin.SciJavaPlugin;
 
diff --git a/src/main/java/org/scijava/ops/core/Source.java b/src/main/java/org/scijava/ops/core/Source.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/org/scijava/ops/core/TriConsumer.java b/src/main/java/org/scijava/ops/core/TriConsumer.java
@@ -1,4 +1,4 @@
-package org.scijava.ops;
+package org.scijava.ops.core;
 
 import java.util.Objects;
 import java.util.function.Consumer;
diff --git a/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java b/src/main/java/org/scijava/ops/matcher/DefaultOpTypeMatchingService.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -37,7 +37,9 @@
 
 import org.scijava.Context;
 import org.scijava.log.LogService;
-import org.scijava.ops.base.OpCandidate.StatusCode;
+import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpUtils;
+import org.scijava.ops.matcher.OpCandidate.StatusCode;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
diff --git a/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/src/main/java/org/scijava/ops/matcher/MatchingResult.java
@@ -1,8 +1,10 @@
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.ops.OpUtils;
+
 /**
  * Class representing the result from type matching done by the
  * {@link OpTypeMatchingService}. Contains the original candidates which match
diff --git a/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/src/main/java/org/scijava/ops/matcher/OpCandidate.java
@@ -27,10 +27,12 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.lang.reflect.Type;
 
+import org.scijava.ops.OpEnvironment;
+import org.scijava.ops.OpUtils;
 import org.scijava.param.ValidityProblem;
 import org.scijava.struct.Member;
 import org.scijava.struct.Struct;
diff --git a/src/main/java/org/scijava/ops/matcher/OpInfo.java b/src/main/java/org/scijava/ops/matcher/OpInfo.java
@@ -27,11 +27,12 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.util.List;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.OpUtils;
+import org.scijava.ops.core.Op;
 import org.scijava.param.ParameterStructs;
 import org.scijava.param.ValidityException;
 import org.scijava.plugin.Plugin;
diff --git a/src/main/java/org/scijava/ops/matcher/OpMatchingUtil.java b/src/main/java/org/scijava/ops/matcher/OpMatchingUtil.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/main/java/org/scijava/ops/matcher/OpRef.java b/src/main/java/org/scijava/ops/matcher/OpRef.java
@@ -27,14 +27,14 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Objects;
 
-import org.scijava.ops.Op;
+import org.scijava.ops.core.Op;
 import org.scijava.util.TypeUtils;
 import org.scijava.util.Types;
 
diff --git a/src/main/java/org/scijava/ops/matcher/OpTypeMatchingService.java b/src/main/java/org/scijava/ops/matcher/OpTypeMatchingService.java
@@ -27,12 +27,13 @@
  * #L%
  */
 
-package org.scijava.ops.base;
+package org.scijava.ops.matcher;
 
 import java.util.List;
 
 import org.scijava.module.Module;
 import org.scijava.module.ModuleInfo;
+import org.scijava.ops.OpEnvironment;
 import org.scijava.service.SciJavaService;
 import org.scijava.struct.StructInstance;
 
diff --git a/src/main/java/org/scijava/ops/math/Add.java b/src/main/java/org/scijava/ops/math/Add.java
@@ -6,9 +6,9 @@
 import java.util.stream.Stream;
 
 import org.scijava.core.Priority;
-import org.scijava.ops.BiComputer;
-import org.scijava.ops.BiInplace1;
-import org.scijava.ops.Op;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.BiInplace1;
+import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/src/main/java/org/scijava/ops/math/Power.java b/src/main/java/org/scijava/ops/math/Power.java
@@ -3,8 +3,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.scijava.ops.Computer;
-import org.scijava.ops.Op;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/src/main/java/org/scijava/ops/math/Sqrt.java b/src/main/java/org/scijava/ops/math/Sqrt.java
@@ -3,10 +3,10 @@
 import java.util.function.Function;
 import java.util.stream.IntStream;
 
-import org.scijava.ops.BiInplace1;
-import org.scijava.ops.Computer;
-import org.scijava.ops.Inplace;
-import org.scijava.ops.Op;
+import org.scijava.ops.core.BiInplace1;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.Inplace;
+import org.scijava.ops.core.Op;
 import org.scijava.ops.math.Add.MathAddOp;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
diff --git a/src/main/java/org/scijava/ops/math/Zero.java b/src/main/java/org/scijava/ops/math/Zero.java
@@ -2,8 +2,8 @@
 
 import java.util.stream.IntStream;
 
-import org.scijava.ops.NullaryComputer;
-import org.scijava.ops.Op;
+import org.scijava.ops.core.NullaryComputer;
+import org.scijava.ops.core.Op;
 import org.scijava.param.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.struct.ItemIO;
diff --git a/src/main/java/org/scijava/ops/util/Adapt.java b/src/main/java/org/scijava/ops/util/Adapt.java
@@ -3,11 +3,11 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.scijava.ops.BiComputer;
-import org.scijava.ops.Computer;
-import org.scijava.ops.OneToOneCommand;
-import org.scijava.ops.Op;
-import org.scijava.ops.Source;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.OneToOneCommand;
+import org.scijava.ops.core.Op;
+import org.scijava.ops.core.Source;
 
 /**
  * Utility providing adaptation between {@link Op} types.
diff --git a/src/main/java/org/scijava/ops/util/Computers.java b/src/main/java/org/scijava/ops/util/Computers.java
@@ -3,10 +3,10 @@
 import java.lang.reflect.Type;
 import java.util.function.Function;
 
-import org.scijava.ops.BiComputer;
-import org.scijava.ops.Computer;
-import org.scijava.ops.Op;
-import org.scijava.ops.base.OpService;
+import org.scijava.ops.OpService;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.Op;
 import org.scijava.ops.types.Nil;
 import org.scijava.util.Types;
 
diff --git a/src/main/java/org/scijava/ops/util/Functions.java b/src/main/java/org/scijava/ops/util/Functions.java
@@ -5,8 +5,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import org.scijava.ops.Op;
-import org.scijava.ops.base.OpService;
+import org.scijava.ops.OpService;
+import org.scijava.ops.core.Op;
 import org.scijava.ops.types.Nil;
 import org.scijava.util.Types;
 
diff --git a/src/main/java/org/scijava/ops/util/Inplaces.java b/src/main/java/org/scijava/ops/util/Inplaces.java
@@ -2,11 +2,11 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.ops.BiInplace1;
-import org.scijava.ops.Computer;
-import org.scijava.ops.Inplace;
-import org.scijava.ops.Op;
-import org.scijava.ops.base.OpService;
+import org.scijava.ops.OpService;
+import org.scijava.ops.core.BiInplace1;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.Inplace;
+import org.scijava.ops.core.Op;
 import org.scijava.ops.types.Nil;
 import org.scijava.util.Types;
 
diff --git a/src/test/java/org/scijava/ops/AbstractTestEnvironment.java b/src/test/java/org/scijava/ops/AbstractTestEnvironment.java
@@ -5,7 +5,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.scijava.Context;
-import org.scijava.ops.base.OpService;
 
 public abstract class AbstractTestEnvironment {
 
diff --git a/src/test/java/org/scijava/ops/AdaptersTest.java b/src/test/java/org/scijava/ops/AdaptersTest.java
@@ -33,6 +33,9 @@
 import java.util.function.Function;
 
 import org.junit.Test;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.OneToOneCommand;
 import org.scijava.ops.math.Add.MathAddOp;
 import org.scijava.ops.math.Sqrt.MathSqrtOp;
 import org.scijava.ops.types.Nil;
diff --git a/src/test/java/org/scijava/ops/ComputersTest.java b/src/test/java/org/scijava/ops/ComputersTest.java
@@ -30,6 +30,8 @@
 package org.scijava.ops;
 
 import org.junit.Test;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.Computer;
 import org.scijava.ops.math.Add.MathAddOp;
 import org.scijava.ops.math.Sqrt.MathSqrtOp;
 import org.scijava.ops.util.Computers;
diff --git a/src/test/java/org/scijava/ops/InplacesTest.java b/src/test/java/org/scijava/ops/InplacesTest.java
@@ -30,6 +30,8 @@
 package org.scijava.ops;
 
 import org.junit.Test;
+import org.scijava.ops.core.BiInplace1;
+import org.scijava.ops.core.Inplace;
 import org.scijava.ops.math.Add.MathAddOp;
 import org.scijava.ops.math.Sqrt.MathSqrtOp;
 import org.scijava.ops.util.Inplaces;
diff --git a/src/test/java/org/scijava/ops/OpsTest.java b/src/test/java/org/scijava/ops/OpsTest.java
@@ -35,6 +35,11 @@
 import java.util.function.Function;
 
 import org.junit.Test;
+import org.scijava.ops.core.BiComputer;
+import org.scijava.ops.core.BiInplace1;
+import org.scijava.ops.core.Computer;
+import org.scijava.ops.core.Inplace;
+import org.scijava.ops.core.NullaryComputer;
 import org.scijava.ops.math.Add.MathAddDoublesFunction;
 import org.scijava.ops.math.Add.MathAddOp;
 import org.scijava.ops.math.Power.MathPowerOp;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.scijava.ops;`
	`1`	`+package org.scijava.ops.core;`
`2`	`2`
`3`	`3`	`@FunctionalInterface`
`4`	`4`	`public interface BiComputer<I1, I2, O> extends TriConsumer<I1, I2, O> {`