WIP: Add type variables instead of wildcards

Treiblesschorle · gselzer · commit 320d4bfb0878 · 2019-04-12T12:54:03.000-05:00
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -702,7 +702,6 @@ public static Type component(final Type type) {
 	 * </pre>
 	 */
 	public static Type fieldType(final Field field, final Class<?> type) {
-		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
 		final Type pType = parameterizeRaw(type);
 		return GenericTypeReflector.getExactFieldType(field, pType);
 	}
@@ -714,8 +713,8 @@ public static Type fieldType(final Field field, final Class<?> type) {
 	public static Type methodReturnType(final Method method,
 		final Class<?> type)
 	{
-		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
-		return GenericTypeReflector.getExactReturnType(method, wildType);
+		final Type pType = parameterizeRaw(type);
+		return GenericTypeReflector.getExactReturnType(method, pType);
 	}
 
 	/**
@@ -725,8 +724,8 @@ public static Type methodReturnType(final Method method,
 	public static Type[] methodParamTypes(final Method method,
 		final Class<?> type)
 	{
-		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
-		return GenericTypeReflector.getExactParameterTypes(method, wildType);
+		final Type pType = parameterizeRaw(type);
+		return GenericTypeReflector.getExactParameterTypes(method, pType);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,6 @@ public static Type component(final Type type) {`
`702`	`702`	`* </pre>`
`703`	`703`	`*/`
`704`	`704`	`public static Type fieldType(final Field field, final Class<?> type) {`
`705`		`- final Type wildType = GenericTypeReflector.addWildcardParameters(type);`
`706`	`705`	`final Type pType = parameterizeRaw(type);`
`707`	`706`	`return GenericTypeReflector.getExactFieldType(field, pType);`
`708`	`707`	`}`
`@@ -714,8 +713,8 @@ public static Type fieldType(final Field field, final Class<?> type) {`
`714`	`713`	`public static Type methodReturnType(final Method method,`
`715`	`714`	`final Class<?> type)`
`716`	`715`	`{`
`717`		`- final Type wildType = GenericTypeReflector.addWildcardParameters(type);`
`718`		`- return GenericTypeReflector.getExactReturnType(method, wildType);`
	`716`	`+ final Type pType = parameterizeRaw(type);`
	`717`	`+ return GenericTypeReflector.getExactReturnType(method, pType);`
`719`	`718`	`}`
`720`	`719`
`721`	`720`	`/**`
`@@ -725,8 +724,8 @@ public static Type methodReturnType(final Method method,`
`725`	`724`	`public static Type[] methodParamTypes(final Method method,`
`726`	`725`	`final Class<?> type)`
`727`	`726`	`{`
`728`		`- final Type wildType = GenericTypeReflector.addWildcardParameters(type);`
`729`		`- return GenericTypeReflector.getExactParameterTypes(method, wildType);`
	`727`	`+ final Type pType = parameterizeRaw(type);`
	`728`	`+ return GenericTypeReflector.getExactParameterTypes(method, pType);`
`730`	`729`	`}`
`731`	`730`
`732`	`731`	`/**`