diff --git a/build.gradle b/build.gradle index 0234980654..8d49b8472d 100644 --- a/build.gradle +++ b/build.gradle @@ -199,10 +199,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.10.0" - dependency("net.sourceforge.htmlunit:htmlunit:2.41.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.42.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.41.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") { @@ -333,7 +333,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "8.33" + toolVersion = "8.34" configDirectory.set(rootProject.file("src/checkstyle")) } 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 7173a4cbb7..7dd9fde259 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 @@ -189,7 +189,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);