From ba8000d5b8c7a8b47f1c448edb08637a0d50c29a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 17 Jul 2020 19:15:06 +0200 Subject: [PATCH] Polishing --- .../result/method/annotation/ControllerMethodResolver.java | 6 ++---- .../mvc/method/annotation/RequestMappingHandlerAdapter.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java index bdecbced86..72dd2f685c 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java @@ -83,7 +83,7 @@ class ControllerMethodResolver { AnnotatedElementUtils.hasAnnotation(method, ModelAttribute.class)); - private static Log logger = LogFactory.getLog(ControllerMethodResolver.class); + private static final Log logger = LogFactory.getLog(ControllerMethodResolver.class); private final List initBinderResolvers; @@ -95,14 +95,12 @@ class ControllerMethodResolver { private final ReactiveAdapterRegistry reactiveAdapterRegistry; - private final Map, Set> initBinderMethodCache = new ConcurrentHashMap<>(64); private final Map, Set> modelAttributeMethodCache = new ConcurrentHashMap<>(64); private final Map, ExceptionHandlerMethodResolver> exceptionHandlerCache = new ConcurrentHashMap<>(64); - private final Map> initBinderAdviceCache = new LinkedHashMap<>(64); private final Map> modelAttributeAdviceCache = new LinkedHashMap<>(64); @@ -169,7 +167,7 @@ class ControllerMethodResolver { boolean requestMappingMethod = !readers.isEmpty() && supportDataBinding; // Annotation-based... - List result = new ArrayList<>(); + List result = new ArrayList<>(30); result.add(new RequestParamMethodArgumentResolver(beanFactory, adapterRegistry, false)); result.add(new RequestParamMapMethodArgumentResolver(adapterRegistry)); result.add(new PathVariableMethodArgumentResolver(beanFactory, adapterRegistry)); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 63bed632d2..3c6805af07 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -181,7 +181,6 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter @Nullable private ConfigurableBeanFactory beanFactory; - private final Map, SessionAttributesHandler> sessionAttributesHandlerCache = new ConcurrentHashMap<>(64); private final Map, Set> initBinderCache = new ConcurrentHashMap<>(64);