Rename Types.param to Types.typeParamOf

ctrueden · ctrueden · commit 18146d9de437 · 2024-05-28T14:34:36.000-05:00
Ideally, this method would be deleted in favor of using
Types.typeParamsOf, which returns all type parameters, not just the
ith one. But the typeParamsOf method appears to be a little buggy
in comparison to Types.typeParamOf, so for now, both of them stay.
diff --git a/scijava-struct/src/test/java/org/scijava/struct/ParameterStructs.java b/scijava-struct/src/test/java/org/scijava/struct/ParameterStructs.java
@@ -63,7 +63,7 @@ public static List<Member<?>> parse(final Class<?> type)
 			if (p.length == paramCount) {
 				for (int i=0; i<p.length; i++) {
 					String key = p[i].key();
-					final Type itemType = Types.param(type, functionalType, i);
+					final Type itemType = Types.typeParamOf(type, functionalType, i);
 					final Class<?> rawItemType = Types.raw(itemType);
 					final boolean valid = checkValidity(p[i], key, rawItemType, false,
 						names, problems);
diff --git a/scijava-types/src/main/java/org/scijava/types/Types.java b/scijava-types/src/main/java/org/scijava/types/Types.java
@@ -234,7 +234,7 @@ public static Type typeOf(final Field field, final Class<?> type) {
 	 * {@code String}.
 	 * </p>
 	 */
-	public static Type param(final Type type, final Class<?> c, final int no) {
+	public static Type typeParamOf(final Type type, final Class<?> c, final int no) {
 		return GenericTypeReflector.getTypeParameter(type, //
 			c.getTypeParameters()[no]);
 	}
@@ -1163,10 +1163,8 @@ private static boolean isApplicableToTypeVariableBounds(
 				for (int i = 0; i < paramBoundTypes.length; i++) {
 					// Get the type parameter of arg from the bound type which we know
 					// is parameterized.
-					final Type argType = param(arg, raw(paramBoundType), i);
-					if (argType == null) {
-						return false;
-					}
+					final Type argType = typeParamOf(arg, raw(paramBoundType), i);
+					if (argType == null) return false;
 					if (paramBoundTypes[i] instanceof TypeVariable<?> &&
 						!isApplicableToTypeParameter(argType,
 							(TypeVariable<?>) paramBoundTypes[i], typeBounds)) return false;
diff --git a/scijava-types/src/test/java/org/scijava/types/TypesTest.java b/scijava-types/src/test/java/org/scijava/types/TypesTest.java
@@ -168,16 +168,16 @@ public void testTypeOf() {
 		assertSame(Integer.class, iType);
 	}
 
-	/** Tests {@link Types#param}. */
+	/** Tests {@link Types#typeParamOf}. */
 	@Test
-	public void testParam() {
+	public void testTypeParamOf() {
 		class Struct {
 
 			@SuppressWarnings("unused")
 			private List<int[]> list;
 		}
 		final Type listType = type(Struct.class, "list");
-		final Type paramType = Types.param(listType, List.class, 0);
+		final Type paramType = Types.typeParamOf(listType, List.class, 0);
 		final Class<?> paramClass = Types.raw(paramType);
 		assertSame(int[].class, paramClass);
 	}

Original file line number	Diff line number	Diff line change
`@@ -168,16 +168,16 @@ public void testTypeOf() {`
`168`	`168`	`assertSame(Integer.class, iType);`
`169`	`169`	`}`
`170`	`170`
`171`		`- /** Tests {@link Types#param}. */`
	`171`	`+ /** Tests {@link Types#typeParamOf}. */`
`172`	`172`	`@Test`
`173`		`- public void testParam() {`
	`173`	`+ public void testTypeParamOf() {`
`174`	`174`	`class Struct {`
`175`	`175`
`176`	`176`	`@SuppressWarnings("unused")`
`177`	`177`	`private List<int[]> list;`
`178`	`178`	`}`
`179`	`179`	`final Type listType = type(Struct.class, "list");`
`180`		`- final Type paramType = Types.param(listType, List.class, 0);`
	`180`	`+ final Type paramType = Types.typeParamOf(listType, List.class, 0);`
`181`	`181`	`final Class<?> paramClass = Types.raw(paramType);`
`182`	`182`	`assertSame(int[].class, paramClass);`
`183`	`183`	`}`