From 0b697a3068fa440c44300f9954dfc8d32acfa9d9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 17 Jul 2020 19:24:23 +0200 Subject: [PATCH 1/2] Polishing --- .../result/method/annotation/ControllerMethodResolver.java | 4 +--- .../mvc/method/annotation/RequestMappingHandlerAdapter.java | 1 - 2 files changed, 1 insertion(+), 4 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 7063267742..f35b8c9897 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); 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 a3b09fa17c..16d750567f 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 @@ -180,7 +180,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); From bd3b44838f76526da30cc1dfcfda8623cdd71e21 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 17 Jul 2020 19:24:50 +0200 Subject: [PATCH 2/2] Upgrade to Checkstyle 8.34 and HtmlUnit 2.42 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b1b650f1d2..c8b4c2dc48 100644 --- a/build.gradle +++ b/build.gradle @@ -194,10 +194,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.10.0" - dependency("net.sourceforge.htmlunit:htmlunit:2.40.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.42.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.40.0") { + dependency("org.seleniumhq.selenium:htmlunit-driver:2.42.0") { exclude group: "commons-logging", name: "commons-logging" } dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { @@ -326,7 +326,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "8.33" + toolVersion = "8.34" configDir = rootProject.file("src/checkstyle") }