Types: improve the wildcard methods

ctrueden · ctrueden · commit 3a835475f7e9 · 2024-05-29T22:19:10.000-05:00
Nowhere in the code do we use the wildcard(upperBound, lowerBound)
method to set a lower bound. But we often want to set a single upper
bound, or multiple upper bounds, without any lower bounds.
As such, this commit transforms wildcard() into wildcard(Type...),
for improved convenience of usage.
diff --git a/scijava-common3/src/main/java/org/scijava/common3/Types.java b/scijava-common3/src/main/java/org/scijava/common3/Types.java
@@ -632,26 +632,12 @@ public static ParameterizedType parameterize(final Class<?> rawType,
 	}
 
 	/**
-	 * Creates a new {@link WildcardType} with no upper or lower bounds (i.e.,
-	 * {@code ?}).
+	 * Creates a new {@link WildcardType} with the given upper bound(s).
 	 *
 	 * @return The newly created {@link WildcardType}.
 	 */
-	public static WildcardType wildcard() {
-		return wildcard(null, (Type) null);
-	}
-
-	/**
-	 * Creates a new {@link WildcardType} with the given upper and/or lower bound.
-	 *
-	 * @param upperBound Upper bound of the wildcard, or null for none.
-	 * @param lowerBound Lower bound of the wildcard, or null for none.
-	 * @return The newly created {@link WildcardType}.
-	 */
-	public static WildcardType wildcard(final Type upperBound,
-		final Type lowerBound)
-	{
-		return new TypeUtils.WildcardTypeImpl(upperBound, lowerBound);
+	public static WildcardType wildcard(Type... upperBounds) {
+		return wildcard(upperBounds, null);
 	}
 
 	/**
diff --git a/scijava-common3/src/test/java/org/scijava/common3/GreatestCommonSupertypeTest.java b/scijava-common3/src/test/java/org/scijava/common3/GreatestCommonSupertypeTest.java
@@ -195,7 +195,7 @@ class C<T extends Base> {}
 
 	@Test
 	public void testWildcardType() {
-		Type qNThing = Types.wildcard(NThing.class, null);
+		Type qNThing = Types.wildcard(NThing.class);
 		Type typeWithWildcard = Types.parameterize(List.class, new Type[] { qNThing });
 		Type t1 = ((ParameterizedType) typeWithWildcard).getActualTypeArguments()[0];
 		Type t2 = XThing.class;
diff --git a/scijava-common3/src/test/java/org/scijava/common3/TypesTest.java b/scijava-common3/src/test/java/org/scijava/common3/TypesTest.java
@@ -216,7 +216,7 @@ class C<T extends Number> {}
 		var listT = Types.parameterize(List.class, new Type[] { t });
 		var listNumber = Types.parameterize(List.class, new Type[] { Number.class });
 		var listInteger = Types.parameterize(List.class, new Type[] { Integer.class });
-		var listExtendsNumber = Types.parameterize(List.class, new Type[] { Types.wildcard(Number.class, null) });
+		var listExtendsNumber = Types.parameterize(List.class, new Type[] { Types.wildcard(Number.class) });
 		var listListRaw = Types.parameterize(List.class, new Type[] { List.class });
 		var listListInteger = Types.parameterize(List.class, new Type[] { listInteger });
 
@@ -268,7 +268,7 @@ class C<N extends Number, S extends String, T extends List<N>> {}
 		final Type listS = Types.parameterize(List.class, new Type[] { s });
 		final Type listNumber = Types.parameterize(List.class, new Type[] { Number.class });
 		final Type listInteger = Types.parameterize(List.class, new Type[] { Integer.class });
-		final Type listExtendsNumber = Types.parameterize(List.class, new Type[] { Types.wildcard(Number.class, null) });
+		final Type listExtendsNumber = Types.parameterize(List.class, new Type[] { Types.wildcard(Number.class) });
 		// T list = (T) new ArrayList<N>();
 		assertTrue(Types.isAssignable(listN, t));
 		// T list = (T) new ArrayList<Number>();
