Tidy up scijava-types subpackages

ctrueden · ctrueden · commit a023ea760155 · 2024-05-22T18:50:56.000-05:00
* The extractors package is now named extract.
* The TypeExtractor and TypeReifier infrastructure moved into the
  extract subpackage; nothing in the base types package uses it.
* The inference package is now named infer, for symmetry.
diff --git a/scijava-ops-engine/src/main/java/module-info.java b/scijava-ops-engine/src/main/java/module-info.java
@@ -70,7 +70,7 @@
 	uses org.scijava.ops.engine.yaml.YAMLOpInfoCreator;
 	uses org.scijava.ops.spi.Op;
 	uses org.scijava.ops.spi.OpCollection;
-	uses org.scijava.types.TypeExtractor;
+	uses org.scijava.types.extract.TypeExtractor;
 
 	provides org.scijava.discovery.Discoverer with
 		org.scijava.ops.engine.yaml.impl.YAMLOpInfoDiscoverer;
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -53,7 +53,9 @@
 import org.scijava.progress.Progress;
 import org.scijava.struct.ItemIO;
 import org.scijava.types.*;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.extract.DefaultTypeReifier;
+import org.scijava.types.extract.TypeReifier;
+import org.scijava.types.infer.GenericAssignability;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/LambdaTypeBaker.java
@@ -46,7 +46,7 @@
 import javassist.CtNewConstructor;
 import javassist.CtNewMethod;
 import javassist.NotFoundException;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 public final class LambdaTypeBaker {
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationMatchingRoutine.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationMatchingRoutine.java
@@ -57,7 +57,7 @@
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.GenericAssignability;
 
 public class AdaptationMatchingRoutine implements MatchingRoutine {
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/Conversions.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/Conversions.java
@@ -37,8 +37,8 @@
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.FunctionalInterfaces;
+import org.scijava.types.infer.GenericAssignability;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConvertedOpInfo.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConvertedOpInfo.java
@@ -56,8 +56,8 @@
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.FunctionalInterfaces;
+import org.scijava.types.infer.GenericAssignability;
 
 /**
  * An {@link OpInfo} whose input and output types are transformed through the
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRequest.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpRequest.java
@@ -37,7 +37,7 @@
 import org.scijava.ops.api.OpRequest;
 import org.scijava.ops.engine.matcher.OpMatcher;
 import org.scijava.types.Types;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.GenericAssignability;
 
 /**
  * Data structure which identifies an Op by name and/or type(s) and/or argument
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/InfoMatchingOpRequest.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/InfoMatchingOpRequest.java
@@ -33,7 +33,7 @@
 import org.scijava.ops.api.OpRequest;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.GenericAssignability;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/RuntimeSafeMatchingRoutine.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/RuntimeSafeMatchingRoutine.java
@@ -55,7 +55,7 @@
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
 import org.scijava.types.Types.TypeVarInfo;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.GenericAssignability;
 
 public class RuntimeSafeMatchingRoutine implements MatchingRoutine {
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/AbstractInfoReducer.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/AbstractInfoReducer.java
@@ -32,10 +32,9 @@
 import java.lang.reflect.Type;
 
 import org.scijava.ops.api.OpInfo;
-import org.scijava.ops.api.Ops;
 import org.scijava.ops.engine.BaseOpHints;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 public abstract class AbstractInfoReducer implements InfoReducer {
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/ReductionUtils.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/ReductionUtils.java
@@ -40,7 +40,7 @@
 import org.scijava.ops.spi.Nullable;
 import org.scijava.struct.Member;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 import com.google.common.collect.Streams;
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java
@@ -40,7 +40,7 @@
 import org.scijava.struct.MemberParser;
 import org.scijava.struct.Structs;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 public class ClassParameterMemberParser implements
 	MemberParser<Class<?>, SynthesizedParameterMember<?>>
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -43,7 +43,7 @@
 import org.scijava.struct.ItemIO;
 import org.scijava.struct.Structs;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 public final class FunctionalParameters {
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedFieldParameterData.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedFieldParameterData.java
@@ -36,7 +36,7 @@
 
 import org.scijava.ops.engine.exceptions.impl.NullablesOnMultipleMethodsException;
 import org.scijava.struct.ItemIO;
-import org.scijava.types.inference.FunctionalInterfaces;
+import org.scijava.types.infer.FunctionalInterfaces;
 
 /**
  * Lazily generates the parameter data for a {@link List} of
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java
@@ -49,8 +49,8 @@
 import org.scijava.struct.Member;
 import org.scijava.struct.StructInstance;
 import org.scijava.types.Types;
-import org.scijava.types.inference.FunctionalInterfaces;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.FunctionalInterfaces;
+import org.scijava.types.infer.GenericAssignability;
 
 /**
  * Common code used by Ops backed by {@link Method}s.
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/MatchingUtilsTest.java
@@ -47,7 +47,7 @@
 import org.scijava.ops.engine.matcher.impl.MatchingUtils;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.inference.GenericAssignability;
+import org.scijava.types.infer.GenericAssignability;
 
 public class MatchingUtilsTest {
 
diff --git a/scijava-ops-engine/templates/main/java/module-info.vm b/scijava-ops-engine/templates/main/java/module-info.vm
@@ -41,7 +41,7 @@ module org.scijava.ops.engine {
 	uses org.scijava.ops.engine.yaml.YAMLOpInfoCreator;
 	uses org.scijava.ops.spi.Op;
 	uses org.scijava.ops.spi.OpCollection;
-	uses org.scijava.types.TypeExtractor;
+	uses org.scijava.types.extract.TypeExtractor;
 
 	provides org.scijava.discovery.Discoverer with
 		org.scijava.ops.engine.yaml.impl.YAMLOpInfoDiscoverer;
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/types/FitParamsTypeExtractor.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/types/FitParamsTypeExtractor.java
@@ -31,13 +31,13 @@
 
 import net.imglib2.util.Util;
 import org.scijava.ops.flim.FitParams;
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import java.lang.reflect.Type;
 
 /**
- * A {@link org.scijava.types.TypeExtractor} that reifies {@link FitParams}.
+ * A {@link org.scijava.types.extract.TypeExtractor} that reifies {@link FitParams}.
  * Useful for directly passing {@code FitParams} objects directly to Op calls.
  *
  * @author Gabriel Selzer
diff --git a/scijava-ops-image/src/main/java/module-info.java b/scijava-ops-image/src/main/java/module-info.java
@@ -55,7 +55,7 @@
 	requires mines.jtk;
 	requires net.imglib2.realtransform;
 
-	provides org.scijava.types.TypeExtractor with
+	provides org.scijava.types.extract.TypeExtractor with
 			org.scijava.ops.image.types.ImgFactoryTypeExtractor,
 			org.scijava.ops.image.types.ImgLabelingTypeExtractor,
 			org.scijava.ops.image.types.NativeImgTypeExtractor,
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/ImgFactoryTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/ImgFactoryTypeExtractor.java
@@ -31,9 +31,9 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.img.ImgFactory;
 
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/ImgLabelingTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/ImgLabelingTypeExtractor.java
@@ -32,9 +32,9 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.roi.labeling.ImgLabeling;
 import net.imglib2.view.Views;
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/LabelingMappingTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/LabelingMappingTypeExtractor.java
@@ -32,9 +32,9 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.roi.labeling.LabelingMapping;
 
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/NativeImgTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/NativeImgTypeExtractor.java
@@ -32,9 +32,9 @@
 import java.lang.reflect.Type;
 
 import org.scijava.priority.Priority;
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.img.NativeImg;
 
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsConstantValueFactoryTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsConstantValueFactoryTypeExtractor.java
@@ -31,10 +31,10 @@
 
 import java.lang.reflect.Type;
 
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
 import org.scijava.types.Types;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.outofbounds.OutOfBoundsConstantValueFactory;
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsFactoryTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsFactoryTypeExtractor.java
@@ -33,9 +33,9 @@
 
 import org.scijava.priority.Priority;
 import org.scijava.types.Any;
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.outofbounds.OutOfBoundsFactory;
 
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsRandomValueFactoryTypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/OutOfBoundsRandomValueFactoryTypeExtractor.java
@@ -33,10 +33,10 @@
 import java.lang.reflect.Type;
 
 import org.scijava.types.Any;
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
 import org.scijava.types.Types;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.outofbounds.OutOfBoundsRandomValueFactory;
diff --git a/scijava-ops-image/src/main/java/org/scijava/ops/image/types/RAITypeExtractor.java b/scijava-ops-image/src/main/java/org/scijava/ops/image/types/RAITypeExtractor.java
@@ -32,9 +32,9 @@
 import java.lang.reflect.Type;
 
 import org.scijava.priority.Priority;
-import org.scijava.types.SubTypeExtractor;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.SubTypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.util.Util;
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/copy/CopyImgLabelingTest.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/copy/CopyImgLabelingTest.java
@@ -32,9 +32,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import java.util.HashMap;
-
-import net.imglib2.RandomAccessibleInterval;
 import net.imglib2.type.Type;
 import net.imglib2.type.numeric.IntegerType;
 import org.scijava.ops.image.AbstractOpTest;
@@ -48,7 +45,6 @@
 import org.junit.jupiter.api.Test;
 import org.scijava.function.Computers;
 import org.scijava.types.Nil;
-import org.scijava.types.inference.GenericAssignability;
 
 /**
  * Test
diff --git a/scijava-ops-image/src/test/java/org/scijava/ops/image/types/TypeExtractorTests.java b/scijava-ops-image/src/test/java/org/scijava/ops/image/types/TypeExtractorTests.java
@@ -42,7 +42,7 @@
 import net.imglib2.type.numeric.integer.UnsignedByteType;
 
 import org.junit.jupiter.api.Test;
-import org.scijava.types.TypeExtractor;
+import org.scijava.types.extract.TypeExtractor;
 
 /**
  * Tests various {@link TypeExtractor}s.
diff --git a/scijava-ops-legacy/src/main/java/module-info.java b/scijava-ops-legacy/src/main/java/module-info.java
@@ -36,5 +36,5 @@
 	requires org.scijava.ops.api;
 	requires org.scijava.progress;
 
-	provides org.scijava.types.TypeExtractor with org.scijava.legacy.types.DatasetTypeExtractor;
+	provides org.scijava.types.extract.TypeExtractor with org.scijava.legacy.types.DatasetTypeExtractor;
 }
diff --git a/scijava-ops-legacy/src/main/java/org/scijava/legacy/types/DatasetTypeExtractor.java b/scijava-ops-legacy/src/main/java/org/scijava/legacy/types/DatasetTypeExtractor.java
@@ -31,8 +31,8 @@
 
 import net.imagej.Dataset;
 import org.scijava.priority.Priority;
-import org.scijava.types.TypeExtractor;
-import org.scijava.types.TypeReifier;
+import org.scijava.types.extract.TypeExtractor;
+import org.scijava.types.extract.TypeReifier;
 
 import java.lang.reflect.Type;
 
diff --git a/scijava-ops-legacy/src/test/java/org/scijava/legacy/types/DatasetTypeExtractorTest.java b/scijava-ops-legacy/src/test/java/org/scijava/legacy/types/DatasetTypeExtractorTest.java
@@ -41,8 +41,8 @@
 import org.scijava.discovery.Discoverer;
 import org.scijava.ops.api.OpEnvironment;
 import org.scijava.types.Any;
-import org.scijava.types.DefaultTypeReifier;
 import org.scijava.types.Types;
+import org.scijava.types.extract.DefaultTypeReifier;
 
 /**
  * Tests {@link DatasetTypeExtractor}
diff --git a/scijava-types/src/main/java/module-info.java b/scijava-types/src/main/java/module-info.java
@@ -30,11 +30,11 @@
 module org.scijava.types {
 
 	exports org.scijava.types;
-	exports org.scijava.types.inference;
+	exports org.scijava.types.infer;
 
-	opens org.scijava.types.extractors;
 	opens org.scijava.types;
-	exports org.scijava.types.extractors;
+	opens org.scijava.types.extract;
+	exports org.scijava.types.extract;
 
 	requires transitive com.google.common;
 	requires transitive org.scijava.common3;
@@ -43,10 +43,10 @@
 
 	requires org.slf4j;
 
-	uses org.scijava.types.TypeExtractor;
+	uses org.scijava.types.extract.TypeExtractor;
 
-	provides org.scijava.types.TypeExtractor with //
-			org.scijava.types.extractors.IterableTypeExtractor,
-			org.scijava.types.extractors.MapTypeExtractor;
+	provides org.scijava.types.extract.TypeExtractor with //
+			org.scijava.types.extract.IterableTypeExtractor,
+			org.scijava.types.extract.MapTypeExtractor;
 
 }
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/DefaultTypeReifier.java b/scijava-types/src/main/java/org/scijava/types/extract/DefaultTypeReifier.java
@@ -27,7 +27,7 @@
  * #L%
  */
 
-package org.scijava.types;
+package org.scijava.types.extract;
 
 import org.scijava.discovery.Discoverer;
 import org.slf4j.Logger;
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/IterableTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extract/IterableTypeExtractor.java
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/MapTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extract/MapTypeExtractor.java
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/SubTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extract/SubTypeExtractor.java
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/TypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extract/TypeExtractor.java
diff --git a/scijava-types/src/main/java/org/scijava/types/extract/TypeReifier.java b/scijava-types/src/main/java/org/scijava/types/extract/TypeReifier.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/FunctionalInterfaces.java b/scijava-types/src/main/java/org/scijava/types/infer/FunctionalInterfaces.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/GenericAssignability.java b/scijava-types/src/main/java/org/scijava/types/infer/GenericAssignability.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/TypeInferenceException.java b/scijava-types/src/main/java/org/scijava/types/infer/TypeInferenceException.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/TypeMapping.java b/scijava-types/src/main/java/org/scijava/types/infer/TypeMapping.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/TypeVarAssigns.java b/scijava-types/src/main/java/org/scijava/types/infer/TypeVarAssigns.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/WildcardTypeMapping.java b/scijava-types/src/main/java/org/scijava/types/infer/WildcardTypeMapping.java
diff --git a/scijava-types/src/main/java/org/scijava/types/package-info.java b/scijava-types/src/main/java/org/scijava/types/package-info.java
diff --git a/scijava-types/src/main/resources/META-INF/services/org.scijava.types.TypeExtractor b/scijava-types/src/main/resources/META-INF/services/org.scijava.types.TypeExtractor
diff --git a/scijava-types/src/test/java/org/scijava/types/extract/DefaultTypeReifierTest.java b/scijava-types/src/test/java/org/scijava/types/extract/DefaultTypeReifierTest.java
diff --git a/scijava-types/src/test/java/org/scijava/types/infer/InferTypeVariablesTest.java b/scijava-types/src/test/java/org/scijava/types/infer/InferTypeVariablesTest.java
