From ea4f7d365f87d3a8e2d1da239c5c8bf0bdba0f31 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 31 Jul 2019 23:48:21 +0200 Subject: [PATCH] Deprecate logger field in HandlerMethodArgumentResolverComposite --- ...andlerMethodArgumentResolverComposite.java | 21 ++++++++++--------- ...andlerMethodArgumentResolverComposite.java | 18 +++++++++------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java index 89ecd7b5253..937befe33e6 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java @@ -28,8 +28,8 @@ import org.springframework.messaging.Message; /** * Resolves method parameters by delegating to a list of registered - * {@link HandlerMethodArgumentResolver}. Previously resolved method parameters are cached - * for faster lookups. + * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. + * Previously resolved method parameters are cached for faster lookups. * * @author Rossen Stoyanchev * @author Juergen Hoeller @@ -46,8 +46,8 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu /** * Add the given {@link HandlerMethodArgumentResolver}. */ - public HandlerMethodArgumentResolverComposite addResolver(HandlerMethodArgumentResolver argumentResolver) { - this.argumentResolvers.add(argumentResolver); + public HandlerMethodArgumentResolverComposite addResolver(HandlerMethodArgumentResolver resolver) { + this.argumentResolvers.add(resolver); return this; } @@ -55,7 +55,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. * @since 4.3 */ - public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMethodArgumentResolver... resolvers) { + public HandlerMethodArgumentResolverComposite addResolvers( + @Nullable HandlerMethodArgumentResolver... resolvers) { + if (resolvers != null) { Collections.addAll(this.argumentResolvers, resolvers); } @@ -66,10 +68,10 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. */ public HandlerMethodArgumentResolverComposite addResolvers( - @Nullable List argumentResolvers) { + @Nullable List resolvers) { - if (argumentResolvers != null) { - this.argumentResolvers.addAll(argumentResolvers); + if (resolvers != null) { + this.argumentResolvers.addAll(resolvers); } return this; } @@ -102,8 +104,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu * Iterate over registered * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers} * and invoke the one that supports it. - * @throws IllegalStateException if no suitable - * {@link HandlerMethodArgumentResolver} is found. + * @throws IllegalArgumentException if no suitable argument resolver is found */ @Override @Nullable diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java index 1f567865750..ea6de1a45af 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java @@ -41,6 +41,7 @@ import org.springframework.web.context.request.NativeWebRequest; */ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgumentResolver { + @Deprecated protected final Log logger = LogFactory.getLog(getClass()); private final List argumentResolvers = new LinkedList<>(); @@ -61,7 +62,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. * @since 4.3 */ - public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMethodArgumentResolver... resolvers) { + public HandlerMethodArgumentResolverComposite addResolvers( + @Nullable HandlerMethodArgumentResolver... resolvers) { + if (resolvers != null) { Collections.addAll(this.argumentResolvers, resolvers); } @@ -107,10 +110,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu /** * Iterate over registered - * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers} and - * invoke the one that supports it. - * @throws IllegalStateException if no suitable - * {@link HandlerMethodArgumentResolver} is found. + * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers} + * and invoke the one that supports it. + * @throws IllegalArgumentException if no suitable argument resolver is found */ @Override @Nullable @@ -133,9 +135,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu private HandlerMethodArgumentResolver getArgumentResolver(MethodParameter parameter) { HandlerMethodArgumentResolver result = this.argumentResolverCache.get(parameter); if (result == null) { - for (HandlerMethodArgumentResolver methodArgumentResolver : this.argumentResolvers) { - if (methodArgumentResolver.supportsParameter(parameter)) { - result = methodArgumentResolver; + for (HandlerMethodArgumentResolver resolver : this.argumentResolvers) { + if (resolver.supportsParameter(parameter)) { + result = resolver; this.argumentResolverCache.put(parameter, result); break; }