Remove public TypeVarFromParameterizedTypeInfo

ctrueden · ctrueden · commit d3ee45b1c1fc · 2024-05-24T12:37:21.000-05:00
The special case it handles can be encapsulated with an anonymous
subclass overriding the TypeVarInfo#allowType(Type, boolean) method
within the private Types#isApplicableToTypeParameter method.
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/MatchingUtils.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/MatchingUtils.java
@@ -41,7 +41,6 @@
 import org.scijava.types.Any;
 import org.scijava.types.Nil;
 import org.scijava.types.Types;
-import org.scijava.types.Types.TypeVarFromParameterizedTypeInfo;
 import org.scijava.types.Types.TypeVarInfo;
 
 public final class MatchingUtils {
@@ -125,8 +124,7 @@ static int checkGenericOutputsAssignability(Type[] froms, Type[] tos,
 				// has one bound, being to.
 				if (typeVarInfo == null) {
 					TypeVariable<?> fromTypeVar = (TypeVariable<?>) from;
-					TypeVarFromParameterizedTypeInfo fromInfo =
-						new TypeVarFromParameterizedTypeInfo(fromTypeVar);
+					TypeVarInfo fromInfo = new TypeVarInfo(fromTypeVar);
 					fromInfo.fixBounds(to, true);
 					typeBounds.put(fromTypeVar, fromInfo);
 					from = to;
diff --git a/scijava-types/src/main/java/org/scijava/types/Types.java b/scijava-types/src/main/java/org/scijava/types/Types.java
@@ -734,8 +734,15 @@ private static boolean isApplicableToTypeParameter(final Type arg,
 	{
 		// add the type variable to the HashMap if it does not yet exist.
 		if (!typeBounds.containsKey(param)) {
-            typeBounds.put(param, new TypeVarFromParameterizedTypeInfo(
-                    param));
+			typeBounds.put(param, new TypeVarInfo(param) {
+				@Override
+				public boolean allowType(Type type, boolean refuseWildcards) {
+					// NB: Hardcode refuseWildcards to true. Necessary for TypeVariables
+					// which were contained in ParameterizedTypes. Behavior tested by
+					// TypesTest#testSatisfiesWildcardsInParameterizedType().
+					return super.allowType(type, true);
+				}
+			});
 		}
 		// attempt to restrict the bounds of the type variable to the argument.
 		// We call the fixBounds method the refuseWildcards flag to be true,
@@ -1312,27 +1319,6 @@ public String toString() {
 		}
 	}
 
-	/**
-	 * Class for {@link TypeVariable} which were contained in
-	 * {@link ParameterizedType}s. The only difference to {@link TypeVarInfo} is
-	 * that {@link TypeVarInfo#allowType(Type, boolean)} will be always called
-	 * with refuseWildcards flag to be true.
-	 */
-	public static class TypeVarFromParameterizedTypeInfo extends TypeVarInfo {
-
-		public TypeVarFromParameterizedTypeInfo(TypeVariable<?> var) {
-			super(var);
-		}
-
-		/**
-		 * @param refuseWildcards hardcoded to true
-		 */
-		@Override
-		public boolean allowType(Type type, boolean refuseWildcards) {
-			return super.allowType(type, true);
-		}
-	}
-
 	// -- BEGIN FORK OF APACHE COMMONS LANG 3.4 CODE --
 
 	/*
