root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate logger field in HandlerMethodArgumentResolverComposite

This commit is contained in:
Juergen Hoeller 2019-07-31 23:48:21 +02:00
parent 438b40f6d7
commit ea4f7d365f
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java
View File

@ -28,8 +28,8 @@ import org.springframework.messaging.Message;
/** /**
* Resolves method parameters by delegating to a list of registered * Resolves method parameters by delegating to a list of registered
* {@link HandlerMethodArgumentResolver}. Previously resolved method parameters are cached * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
* for faster lookups. * Previously resolved method parameters are cached for faster lookups.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Juergen Hoeller * @author Juergen Hoeller
@ -46,8 +46,8 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
/** /**
* Add the given {@link HandlerMethodArgumentResolver}. * Add the given {@link HandlerMethodArgumentResolver}.
*/ */
public HandlerMethodArgumentResolverComposite addResolver(HandlerMethodArgumentResolver argumentResolver) { public HandlerMethodArgumentResolverComposite addResolver(HandlerMethodArgumentResolver resolver) {
this.argumentResolvers.add(argumentResolver); this.argumentResolvers.add(resolver);
return this; return this;
} }
@ -55,7 +55,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
* Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
* @since 4.3 * @since 4.3
*/ */
public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMethodArgumentResolver... resolvers) { public HandlerMethodArgumentResolverComposite addResolvers(
@Nullable HandlerMethodArgumentResolver... resolvers) {
if (resolvers != null) { if (resolvers != null) {
Collections.addAll(this.argumentResolvers, resolvers); Collections.addAll(this.argumentResolvers, resolvers);
} }
@ -66,10 +68,10 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
* Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
*/ */
public HandlerMethodArgumentResolverComposite addResolvers( public HandlerMethodArgumentResolverComposite addResolvers(
@Nullable List<? extends HandlerMethodArgumentResolver> argumentResolvers) { @Nullable List<? extends HandlerMethodArgumentResolver> resolvers) {
if (argumentResolvers != null) { if (resolvers != null) {
this.argumentResolvers.addAll(argumentResolvers); this.argumentResolvers.addAll(resolvers);
} }
return this; return this;
} }
@ -102,8 +104,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
* Iterate over registered * Iterate over registered
* {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers} * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}
* and invoke the one that supports it. * and invoke the one that supports it.
* @throws IllegalStateException if no suitable * @throws IllegalArgumentException if no suitable argument resolver is found
* {@link HandlerMethodArgumentResolver} is found.
*/ */
@Override @Override
@Nullable @Nullable

18
spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
View File

@ -41,6 +41,7 @@ import org.springframework.web.context.request.NativeWebRequest;
*/ */
public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgumentResolver { public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgumentResolver {
@Deprecated
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
private final List<HandlerMethodArgumentResolver> argumentResolvers = new LinkedList<>(); private final List<HandlerMethodArgumentResolver> argumentResolvers = new LinkedList<>();
@ -61,7 +62,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
* Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}. * Add the given {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
* @since 4.3 * @since 4.3
*/ */
public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMethodArgumentResolver... resolvers) { public HandlerMethodArgumentResolverComposite addResolvers(
@Nullable HandlerMethodArgumentResolver... resolvers) {
if (resolvers != null) { if (resolvers != null) {
Collections.addAll(this.argumentResolvers, resolvers); Collections.addAll(this.argumentResolvers, resolvers);
} }
@ -107,10 +110,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
/** /**
* Iterate over registered * Iterate over registered
* {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers} and * {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}
* invoke the one that supports it. * and invoke the one that supports it.
* @throws IllegalStateException if no suitable * @throws IllegalArgumentException if no suitable argument resolver is found
* {@link HandlerMethodArgumentResolver} is found.
*/ */
@Override @Override
@Nullable @Nullable
@ -133,9 +135,9 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
private HandlerMethodArgumentResolver getArgumentResolver(MethodParameter parameter) { private HandlerMethodArgumentResolver getArgumentResolver(MethodParameter parameter) {
HandlerMethodArgumentResolver result = this.argumentResolverCache.get(parameter); HandlerMethodArgumentResolver result = this.argumentResolverCache.get(parameter);
if (result == null) { if (result == null) {
for (HandlerMethodArgumentResolver methodArgumentResolver : this.argumentResolvers) { for (HandlerMethodArgumentResolver resolver : this.argumentResolvers) {
if (methodArgumentResolver.supportsParameter(parameter)) { if (resolver.supportsParameter(parameter)) {
result = methodArgumentResolver; result = resolver;
this.argumentResolverCache.put(parameter, result); this.argumentResolverCache.put(parameter, result);
break; break;
} }