From 0b61755ea310767537cce549aeb174ac632d5695 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Fri, 24 Nov 2023 12:03:24 +0800 Subject: [PATCH] Polish GenericTypeResolver Javadoc See gh-31663 --- .../core/GenericTypeResolver.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index b3bd606aa4e..6fd1a54aec1 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -82,18 +82,18 @@ public final class GenericTypeResolver { } /** - * Resolve the single type argument of the given generic interface against the given + * Resolve the single type argument of the given generic type against the given * target method which is assumed to return the given interface or an implementation * of it. * @param method the target method to check the return type of - * @param genericIfc the generic interface or superclass to resolve the type argument from + * @param genericType the generic interface or superclass to resolve the type argument from * @return the resolved parameter type of the method return type, or {@code null} * if not resolvable or if the single argument is of type {@link WildcardType}. */ @Nullable - public static Class resolveReturnTypeArgument(Method method, Class genericIfc) { + public static Class resolveReturnTypeArgument(Method method, Class genericType) { Assert.notNull(method, "Method must not be null"); - ResolvableType resolvableType = ResolvableType.forMethodReturnType(method).as(genericIfc); + ResolvableType resolvableType = ResolvableType.forMethodReturnType(method).as(genericType); if (!resolvableType.hasGenerics() || resolvableType.getType() instanceof WildcardType) { return null; } @@ -101,16 +101,16 @@ public final class GenericTypeResolver { } /** - * Resolve the single type argument of the given generic interface against + * Resolve the single type argument of the given generic type against * the given target class which is assumed to implement the generic interface * and possibly declare a concrete type for its type variable. * @param clazz the target class to check against - * @param genericIfc the generic interface or superclass to resolve the type argument from + * @param genericType the generic interface or superclass to resolve the type argument from * @return the resolved type of the argument, or {@code null} if not resolvable */ @Nullable - public static Class resolveTypeArgument(Class clazz, Class genericIfc) { - ResolvableType resolvableType = ResolvableType.forClass(clazz).as(genericIfc); + public static Class resolveTypeArgument(Class clazz, Class genericType) { + ResolvableType resolvableType = ResolvableType.forClass(clazz).as(genericType); if (!resolvableType.hasGenerics()) { return null; } @@ -127,17 +127,17 @@ public final class GenericTypeResolver { /** - * Resolve the type arguments of the given generic interface against the given + * Resolve the type arguments of the given generic type against the given * target class which is assumed to implement the generic interface and possibly * declare concrete types for its type variables. * @param clazz the target class to check against - * @param genericIfc the generic interface or superclass to resolve the type argument from + * @param genericType the generic interface or superclass to resolve the type argument from * @return the resolved type of each argument, with the array size matching the * number of actual type arguments, or {@code null} if not resolvable */ @Nullable - public static Class[] resolveTypeArguments(Class clazz, Class genericIfc) { - ResolvableType type = ResolvableType.forClass(clazz).as(genericIfc); + public static Class[] resolveTypeArguments(Class clazz, Class genericType) { + ResolvableType type = ResolvableType.forClass(clazz).as(genericType); if (!type.hasGenerics() || type.isEntirelyUnresolvable()) { return null; }