TypeExtractor - use map, not list

gselzer · gselzer · commit 23c8d669ecc2 · 2024-02-22T13:02:24.000-06:00
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
@@ -45,7 +45,7 @@
 public class ImgFactoryTypeExtractor extends SubTypeExtractor<ImgFactory<?>> {
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return ImgFactory.class;
 	}
 
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
@@ -50,7 +50,7 @@ public class ImgLabelingTypeExtractor extends
 {
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return ImgLabeling.class;
 	}
 
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
@@ -53,7 +53,7 @@ public class LabelingMappingTypeExtractor extends
 {
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return LabelingMapping.class;
 	}
 
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
@@ -58,7 +58,7 @@ public double getPriority() {
 	}
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return NativeImg.class;
 	}
 
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
@@ -50,7 +50,7 @@ public class OutOfBoundsConstantValueFactoryTypeExtractor extends
 {
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return OutOfBoundsConstantValueFactory.class;
 	}
 
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
@@ -60,7 +60,7 @@ public double getPriority() {
 	}
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return OutOfBoundsFactory.class;
 	}
 
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
@@ -52,7 +52,7 @@ public class OutOfBoundsRandomValueFactoryTypeExtractor extends
 {
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return OutOfBoundsRandomValueFactory.class;
 	}
 
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
@@ -59,7 +59,7 @@ public double getPriority() {
 	}
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return RandomAccessibleInterval.class;
 	}
 
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
@@ -45,8 +45,8 @@ public double getPriority() {
 	}
 
 	@Override
-	public boolean canReify(TypeReifier r, Class<?> object) {
-		return Dataset.class.isAssignableFrom(object);
+	public Class<?> baseClass() {
+		return Dataset.class;
 	}
 
 	@Override
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
@@ -35,9 +35,11 @@
 import net.imagej.DefaultDataset;
 import net.imagej.ImgPlus;
 import net.imglib2.img.array.ArrayImgs;
+import net.imglib2.type.numeric.integer.UnsignedByteType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 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;
@@ -65,6 +67,11 @@ public void testDatasetTypeExtractor() {
 		var actual = new DatasetTypeExtractor().reify(reifier, ds);
 		var expected = Types.parameterize(ImgPlus.class, new Type[] { new Any() });
 		Assertions.assertEquals(expected, actual);
+		OpEnvironment env = OpEnvironment.build();
+		actual = env.genericType(ds);
+		expected = Types.parameterize(ImgPlus.class, new Type[] {
+			UnsignedByteType.class });
+		Assertions.assertEquals(expected, actual);
 	}
 
 }
diff --git a/scijava-types/src/main/java/module-info.java b/scijava-types/src/main/java/module-info.java
@@ -45,7 +45,6 @@
 	uses org.scijava.types.TypeExtractor;
 
 	provides org.scijava.types.TypeExtractor with //
-			org.scijava.types.extractors.ParameterizedTypeExtractor,
 			org.scijava.types.extractors.IterableTypeExtractor,
 			org.scijava.types.extractors.MapTypeExtractor;
 
diff --git a/scijava-types/src/main/java/org/scijava/types/DefaultTypeReifier.java b/scijava-types/src/main/java/org/scijava/types/DefaultTypeReifier.java
@@ -29,17 +29,13 @@
 
 package org.scijava.types;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.scijava.discovery.Discoverer;
 
+import java.util.*;
+
 public class DefaultTypeReifier implements TypeReifier {
 
-	private List<TypeExtractor> extractors;
+	private Map<Class<?>, TypeExtractor> extractors;
 	private final Collection<Discoverer> discoverers;
 
 	public DefaultTypeReifier(Discoverer... discoverers) {
@@ -52,12 +48,12 @@ public DefaultTypeReifier(Collection<Discoverer> discoverers) {
 
 	@Override
 	public Optional<TypeExtractor> getExtractor(final Class<?> c) {
-		return extractors().stream().filter(t -> t.canReify(this, c)).findFirst();
+		return Optional.ofNullable(extractors().getOrDefault(c, null));
 	}
 
 	// -- Helper methods --
 
-	private List<TypeExtractor> extractors() {
+	private Map<Class<?>, TypeExtractor> extractors() {
 		if (extractors == null) initExtractors();
 		return extractors;
 	}
@@ -67,9 +63,13 @@ private synchronized void initExtractors() {
 		extractors = getInstances();
 	}
 
-	private List<TypeExtractor> getInstances() {
-		return discoverers.parallelStream() //
+	private Map<Class<?>, TypeExtractor> getInstances() {
+		Map<Class<?>, TypeExtractor> instances = new HashMap<>();
+		discoverers.stream() //
 			.flatMap(d -> d.discover(TypeExtractor.class).stream()) //
-			.sorted().collect(Collectors.toList());
+			// Find the correct set for each extractor and add it.
+			.sorted() //
+			.forEach(e -> instances.putIfAbsent(e.baseClass(), e));
+		return instances;
 	}
 }
diff --git a/scijava-types/src/main/java/org/scijava/types/SubTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/SubTypeExtractor.java
@@ -41,37 +41,31 @@
  */
 public abstract class SubTypeExtractor<T> implements TypeExtractor {
 
-	protected abstract Class<?> getRawType();
-
 	/**
 	 * Returns a {@link Type} array, where the {@code i}th {@link Type} in the
 	 * array is the {@code i}th type parameter of the {@link Class} returned by
-	 * {@link #getRawType()}. Similar to
+	 * {@link #baseClass()}. Similar to
 	 * {@link ParameterizedType#getActualTypeArguments()}, but works on
 	 * {@link Object}s instead of {@link ParameterizedType}s.
 	 *
 	 * @param r the {@link TypeReifier} used to reify the type parameters.
 	 * @param object the {@link Object} to extract type parameters from.
 	 * @see ParameterizedType#getActualTypeArguments()
 	 * @return the actual type arguments of {@code Object}, with respect to the
-	 *         {@link Type} returned by {@link #getRawType()}
+	 *         {@link Type} returned by {@link #baseClass()}
 	 */
 	protected abstract Type[] getTypeParameters(final TypeReifier r,
 		final T object);
 
-	@Override
-	public boolean canReify(TypeReifier r, Class<?> cls) {
-		return getRawType().isAssignableFrom(cls);
-	}
-
 	@Override
 	public Type reify(final TypeReifier r, final Object object) {
-		if (!canReify(r, object.getClass())) throw new IllegalArgumentException(
-			this + " can only reify Objects of Class " + getRawType()
-				.getSimpleName() + "!");
+		if (!baseClass().isAssignableFrom(object.getClass()))
+			throw new IllegalArgumentException(this +
+				" can only reify Objects of Class " + baseClass().getSimpleName() +
+				"!");
 		@SuppressWarnings("unchecked")
 		final Type[] typeVars = getTypeParameters(r, (T) object);
-		return TypeTools.parameterizeViaSuperType(object.getClass(), getRawType(),
+		return TypeTools.parameterizeViaSuperType(object.getClass(), baseClass(),
 			typeVars);
 	}
 
diff --git a/scijava-types/src/main/java/org/scijava/types/TypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/TypeExtractor.java
@@ -46,10 +46,10 @@
  */
 public interface TypeExtractor extends Prioritized<TypeExtractor> {
 
-	boolean canReify(final TypeReifier r, final Class<?> object);
-
 	Type reify(final TypeReifier r, final Object object);
 
+	Class<?> baseClass();
+
 	@Override
 	default double getPriority() {
 		return Priority.NORMAL;
diff --git a/scijava-types/src/main/java/org/scijava/types/TypeReifier.java b/scijava-types/src/main/java/org/scijava/types/TypeReifier.java
@@ -110,56 +110,24 @@ default Type reify(final Object o) {
 		}
 
 		final Class<?> c = o.getClass();
-		final TypeVariable<?>[] typeVars = c.getTypeParameters();
-		final int numVars = typeVars.length;
-
-		if (numVars == 0) {
-			// if the class is synthetic, we are probably missing something due to
-			// type erasure.
-			if (c.isSynthetic()) {
-				log.warn("Object " + o + " is synthetic. " +
-					"Its type parameters are not reifiable and thus will likely cause unintended behavior!");
-			}
-			// Object has no generic parameters; we are done!
-			return c;
-		}
-
-		// Object has parameters which need to be resolved. Let's do it.
-
 		// Here we will store all of our object's resolved type variables.
-		final Map<TypeVariable<?>, Type> resolved = new HashMap<>();
-
-		for (final TypeToken<?> token : TypeToken.of(c).getTypes()) {
-			if (resolved.size() == numVars) break; // Got 'em all!
 
-			final Type type = token.getType();
-			if (!Types.containsTypeVars(type)) {
-				// No type variables are buried in this type; it is useless to us!
-				continue;
-			}
-
-			// Populate relevant type variables from the reified supertype!
-			final Map<TypeVariable<?>, Type> vars = //
-				args(o, token.getRawType());
-
-			if (vars != null) {
-				// Remember any resolved type variables.
-				// Note that vars may contain other type variables from other layers
-				// of the generic type hierarchy, which we don't care about here.
-				for (final TypeVariable<?> typeVar : typeVars) {
-					if (vars.containsKey(typeVar)) {
-						resolved.putIfAbsent(typeVar, vars.get(typeVar));
-					}
-				}
+		for (final var token : TypeToken.of(c).getTypes()) {
+			Optional<TypeExtractor> opt = getExtractor(token.getRawType());
+			if (opt.isPresent()) {
+				return opt.get().reify(this, o);
 			}
 		}
 
+		final TypeVariable<?>[] typeVars = c.getTypeParameters();
+		if (typeVars.length == 0) {
+			return c;
+		}
 		// fill in any remaining unresolved type parameters with wildcards
+		final Map<TypeVariable<?>, Type> resolved = new HashMap<>();
 		for (final TypeVariable<?> typeVar : typeVars) {
-			resolved.putIfAbsent(typeVar, new Any());
+			resolved.putIfAbsent(typeVar, Any.class);
 		}
-
-		// now apply all the type variables we resolved
 		return Types.parameterize(c, resolved);
 	}
 
diff --git a/scijava-types/src/main/java/org/scijava/types/extractors/IterableTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extractors/IterableTypeExtractor.java
@@ -57,7 +57,7 @@ public double getPriority() {
 	}
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return Iterable.class;
 	}
 
diff --git a/scijava-types/src/main/java/org/scijava/types/extractors/MapTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extractors/MapTypeExtractor.java
@@ -56,7 +56,7 @@ public double getPriority() {
 	}
 
 	@Override
-	protected Class<?> getRawType() {
+	public Class<?> baseClass() {
 		return Map.class;
 	}
 
diff --git a/scijava-types/src/main/java/org/scijava/types/extractors/ParameterizedTypeExtractor.java b/scijava-types/src/main/java/org/scijava/types/extractors/ParameterizedTypeExtractor.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

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`public class ImgFactoryTypeExtractor extends SubTypeExtractor<ImgFactory<?>> {`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- protected Class<?> getRawType() {`
	`48`	`+ public Class<?> baseClass() {`
`49`	`49`	`return ImgFactory.class;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public class ImgLabelingTypeExtractor extends`
`50`	`50`	`{`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- protected Class<?> getRawType() {`
	`53`	`+ public Class<?> baseClass() {`
`54`	`54`	`return ImgLabeling.class;`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public class LabelingMappingTypeExtractor extends`
`53`	`53`	`{`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- protected Class<?> getRawType() {`
	`56`	`+ public Class<?> baseClass() {`
`57`	`57`	`return LabelingMapping.class;`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public double getPriority() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- protected Class<?> getRawType() {`
	`61`	`+ public Class<?> baseClass() {`
`62`	`62`	`return NativeImg.class;`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public class OutOfBoundsConstantValueFactoryTypeExtractor extends`
`50`	`50`	`{`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- protected Class<?> getRawType() {`
	`53`	`+ public Class<?> baseClass() {`
`54`	`54`	`return OutOfBoundsConstantValueFactory.class;`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public double getPriority() {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`		`- protected Class<?> getRawType() {`
	`63`	`+ public Class<?> baseClass() {`
`64`	`64`	`return OutOfBoundsFactory.class;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class OutOfBoundsRandomValueFactoryTypeExtractor extends`
`52`	`52`	`{`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- protected Class<?> getRawType() {`
	`55`	`+ public Class<?> baseClass() {`
`56`	`56`	`return OutOfBoundsRandomValueFactory.class;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public double getPriority() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- protected Class<?> getRawType() {`
	`62`	`+ public Class<?> baseClass() {`
`63`	`63`	`return RandomAccessibleInterval.class;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public double getPriority() {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- public boolean canReify(TypeReifier r, Class<?> object) {`
`49`		`- return Dataset.class.isAssignableFrom(object);`
	`48`	`+ public Class<?> baseClass() {`
	`49`	`+ return Dataset.class;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`