From ca262eaa1c21fa367783def51c33657abf78f99c Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 14 Jul 2021 06:48:14 +0000
Subject: [PATCH 001/140] Next development version (v5.3.10-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index c05ae8cc9dd2..28b12e96c3a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.9-SNAPSHOT
+version=5.3.10-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

From 0b1d14cdd95eb7582d19daa9f31c13b8f8bfb86d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 16 Jul 2021 09:34:12 +0100
Subject: [PATCH 002/140] Follow-up fix, checking also "ws" and port 80 case

See gh-27097
---
 .../web/util/UriComponentsBuilder.java        |  3 ++-
 .../web/util/UriComponentsBuilderTests.java   | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 6787571c4c97..d378a36840a0 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -881,7 +881,8 @@ else if (isForwardedSslOn(headers)) {
 					"with the removeOnly=true. Request headers: " + headers);
 		}
 
-		if (this.scheme != null && ((this.scheme.equals("http") && "80".equals(this.port)) ||
+		if (this.scheme != null &&
+				(((this.scheme.equals("http") || this.scheme.equals("ws")) && "80".equals(this.port)) ||
 				((this.scheme.equals("https") || this.scheme.equals("wss")) && "443".equals(this.port)))) {
 			port(null);
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
index 52623dacc9af..d6d971c4ed5a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
@@ -378,7 +378,7 @@ void fromHttpRequest() {
 
 	@ParameterizedTest // gh-17368, gh-27097
 	@ValueSource(strings = {"https", "wss"})
-	void fromHttpRequestResetsPortBeforeSettingIt(String protocol) {
+	void fromHttpRequestResetsPort443(String protocol) {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("X-Forwarded-Proto", protocol);
 		request.addHeader("X-Forwarded-Host", "84.198.58.199");
@@ -397,6 +397,27 @@ void fromHttpRequestResetsPortBeforeSettingIt(String protocol) {
 		assertThat(result.getPath()).isEqualTo("/rest/mobile/users/1");
 	}
 
+	@ParameterizedTest // gh-27097
+	@ValueSource(strings = {"http", "ws"})
+	void fromHttpRequestResetsPort80(String protocol) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("X-Forwarded-Proto", protocol);
+		request.addHeader("X-Forwarded-Host", "84.198.58.199");
+		request.addHeader("X-Forwarded-Port", 80);
+		request.setScheme("http");
+		request.setServerName("example.com");
+		request.setServerPort(80);
+		request.setRequestURI("/path");
+
+		HttpRequest httpRequest = new ServletServerHttpRequest(request);
+		UriComponents result = UriComponentsBuilder.fromHttpRequest(httpRequest).build();
+
+		assertThat(result.getScheme()).isEqualTo(protocol);
+		assertThat(result.getHost()).isEqualTo("84.198.58.199");
+		assertThat(result.getPort()).isEqualTo(-1);
+		assertThat(result.getPath()).isEqualTo("/path");
+	}
+
 	@Test  // SPR-14761
 	void fromHttpRequestWithForwardedIPv4Host() {
 		MockHttpServletRequest request = new MockHttpServletRequest();

From e0c0e7f878df0d0e0c5a8ebb615f22527390d72e Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 17 Jul 2021 17:03:51 +0300
Subject: [PATCH 003/140] Fix typo in ref docs

---
 src/docs/asciidoc/web/webmvc.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 2133ce377f86..077bcf39cc56 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -5386,7 +5386,7 @@ You can configure how Spring MVC determines the requested media types from the r
 
 By default, only the `Accept` header is checked.
 
-If you must use URL-based content type resolution, consider using the query parameten
+If you must use URL-based content type resolution, consider using the query parameter
 strategy over path extensions. See
 <<mvc-ann-requestmapping-suffix-pattern-match>> and <<mvc-ann-requestmapping-rfd>> for
 more details.

From 9c0825629b715949b7082201bbcd90bfbf9d660b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 17 Jul 2021 17:53:43 +0300
Subject: [PATCH 004/140] Reintroduce left-hand side navigation in ref docs

A side effect of 71995a90876fd5b0aa39259df35476fcc3b0c5ef caused the
dynamic table of contents in the left-hand side navigation to no longer
be displayed, likely due to the missing "details" DIV.

This commit addresses this issue by applying the custom header only to
index.adoc.

Consequently, the TOC is now displayed again on all pages except the
index page, but the customized header is no longer applied to those
pages.

We may revisit this issue if we decide that we want the custom header
on all pages (and not just the index page).

Closes gh-27177
---
 gradle/docs.gradle                                           | 5 +----
 .../{docinfo-header.html => index-docinfo-header.html}       | 5 +++++
 src/docs/asciidoc/index.adoc                                 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename src/docs/asciidoc/{docinfo-header.html => index-docinfo-header.html} (57%)

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 085d291e0742..4b6e139b6513 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -139,7 +139,7 @@ asciidoctorj {
 			icons: 'font',
 			idprefix: '',
 			idseparator: '-',
-			docinfo: 'shared',
+			docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
 			revnumber: project.version,
 			sectanchors: '',
 			sectnums: '',
@@ -163,9 +163,6 @@ asciidoctorj {
 asciidoctor {
 	baseDirFollowsSourceDir()
 	configurations 'asciidoctorExt'
-	attributes([
-			noheader: '' // custom header in docinfo-header.html
-	])
 	sources {
 		include '*.adoc'
 	}
diff --git a/src/docs/asciidoc/docinfo-header.html b/src/docs/asciidoc/index-docinfo-header.html
similarity index 57%
rename from src/docs/asciidoc/docinfo-header.html
rename to src/docs/asciidoc/index-docinfo-header.html
index 1be13e03b75b..485f2e4e9803 100644
--- a/src/docs/asciidoc/docinfo-header.html
+++ b/src/docs/asciidoc/index-docinfo-header.html
@@ -1,4 +1,9 @@
 <div id="header">
 <h1>Spring Framework Documentation</h1>
+<!--
+<div class="details">
+<span id="revnumber">{revnumber}</span>
+</div>
+-->
 <span><strong>{revnumber}</strong></span>
 </div>
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
index 3df3d0d55ef1..69a81c4c2611 100644
--- a/src/docs/asciidoc/index.adoc
+++ b/src/docs/asciidoc/index.adoc
@@ -1,3 +1,4 @@
+:noheader:
 = Spring Framework Documentation
 
 [horizontal]

From 2594f4e0584269a7dab0e2c37c1d871405548547 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 23 Jul 2021 12:18:15 +0200
Subject: [PATCH 005/140] Avoid unnecessary cause initialization in
 ResponseStatusException

Closes gh-27196
---
 .../web/server/ResponseStatusException.java              | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
index 8582e8625cd3..73f41c48c71b 100644
--- a/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
+++ b/spring-web/src/main/java/org/springframework/web/server/ResponseStatusException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class ResponseStatusException extends NestedRuntimeException {
 	 * @param status the HTTP status (required)
 	 */
 	public ResponseStatusException(HttpStatus status) {
-		this(status, null, null);
+		this(status, null);
 	}
 
 	/**
@@ -57,7 +57,10 @@ public ResponseStatusException(HttpStatus status) {
 	 * @param reason the associated reason (optional)
 	 */
 	public ResponseStatusException(HttpStatus status, @Nullable String reason) {
-		this(status, reason, null);
+		super("");
+		Assert.notNull(status, "HttpStatus is required");
+		this.status = status.value();
+		this.reason = reason;
 	}
 
 	/**

From ba08006d52a1dace8c6af0b713f63eb75bc9d976 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 23 Jul 2021 12:19:35 +0200
Subject: [PATCH 006/140] ObjectMapper.configure(MapperFeature, boolean) is
 deprecated as of Jackson 2.13

Closes gh-27206
---
 .../jms/support/converter/MappingJackson2MessageConverter.java | 3 ++-
 .../messaging/converter/MappingJackson2MessageConverter.java   | 3 ++-
 .../http/converter/json/Jackson2ObjectMapperBuilder.java       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
index 819bbdb3f800..401f5c0cb5ed 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,6 +92,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 	private ClassLoader beanClassLoader;
 
 
+	@SuppressWarnings("deprecation")  // on Jackson 2.13: configure(MapperFeature, boolean)
 	public MappingJackson2MessageConverter() {
 		this.objectMapper = new ObjectMapper();
 		this.objectMapper.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
index 349b07ad19db..9bb32eebd942 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,6 +88,7 @@ public MappingJackson2MessageConverter(MimeType... supportedMimeTypes) {
 	}
 
 
+	@SuppressWarnings("deprecation")  // on Jackson 2.13: configure(MapperFeature, boolean)
 	private ObjectMapper initObjectMapper() {
 		ObjectMapper objectMapper = new ObjectMapper();
 		objectMapper.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 39cf383cb3a3..0157d4efb61d 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -796,6 +796,7 @@ private <T> void addDeserializers(SimpleModule module) {
 				module.addDeserializer((Class<T>) type, (JsonDeserializer<? extends T>) deserializer));
 	}
 
+	@SuppressWarnings("deprecation")  // on Jackson 2.13: configure(MapperFeature, boolean)
 	private void configureFeature(ObjectMapper objectMapper, Object feature, boolean enabled) {
 		if (feature instanceof JsonParser.Feature) {
 			objectMapper.configure((JsonParser.Feature) feature, enabled);

From af67764edbb90495f492124275dd67e3fe55a146 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Fri, 23 Jul 2021 12:20:10 +0200
Subject: [PATCH 007/140] Upgrade to Netty 4.1.66 and Undertow 2.2.9

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index cd5d270ca119..85555c9e06f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
-			mavenBom "io.netty:netty-bom:4.1.65.Final"
+			mavenBom "io.netty:netty-bom:4.1.66.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.9"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -138,7 +138,7 @@ configure(allprojects) { project ->
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.8.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.9.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"

From 460947651ae4c58d31386a0a14396c273b287119 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 22 Jul 2021 21:53:14 +0100
Subject: [PATCH 008/140] Minor refactoring in DefaultPathContainer

Closes gh-27204
---
 .../springframework/http/server/DefaultPathContainer.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java
index 7d4571dfb88c..e3cadabe9786 100644
--- a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java
+++ b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java
@@ -165,10 +165,10 @@ private static void parsePathParamValues(String input, Charset charset, MultiVal
 			int index = input.indexOf('=');
 			if (index != -1) {
 				String name = input.substring(0, index);
-				String value = input.substring(index + 1);
-				for (String v : StringUtils.commaDelimitedListToStringArray(value)) {
-					name = StringUtils.uriDecode(name, charset);
-					if (StringUtils.hasText(name)) {
+				name = StringUtils.uriDecode(name, charset);
+				if (StringUtils.hasText(name)) {
+					String value = input.substring(index + 1);
+					for (String v : StringUtils.commaDelimitedListToStringArray(value)) {
 						output.add(name, StringUtils.uriDecode(v, charset));
 					}
 				}

From d034a1f26d0ea3782f53b8ff7a2a0cea7c825b71 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 23 Jul 2021 17:01:28 +0100
Subject: [PATCH 009/140] Blockhound rule for MediaTypeFactory static
 initializer

Closes gh-26631
---
 .../web/server/adapter/WebHttpHandlerBuilder.java                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
index a73e682a9f73..7222138f44c4 100644
--- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
@@ -433,6 +433,7 @@ public void applyTo(BlockHound.Builder builder) {
 
 			// Avoid hard references potentially anywhere in spring-web (no need for structural dependency)
 
+			builder.allowBlockingCallsInside("org.springframework.http.MediaTypeFactory", "<clinit>");
 			builder.allowBlockingCallsInside("org.springframework.web.util.HtmlUtils", "<clinit>");
 		}
 	}

From e94811f1b9a616db44ffbab7fbc816589332c6cc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 24 Jul 2021 21:45:31 +0300
Subject: [PATCH 010/140] Polish
 WebSocketMessageBrokerConfigurationSupportTests

---
 ...essageBrokerConfigurationSupportTests.java | 110 ++++++++----------
 1 file changed, 50 insertions(+), 60 deletions(-)

diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
index e4ea206c0ebc..fe61f0b8ba12 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,14 +47,12 @@
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.config.WebSocketMessageBrokerStats;
 import org.springframework.web.socket.handler.TestWebSocketSession;
 import org.springframework.web.socket.handler.WebSocketHandlerDecorator;
-import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
 import org.springframework.web.socket.messaging.StompSubProtocolHandler;
 import org.springframework.web.socket.messaging.StompTextMessageBuilder;
 import org.springframework.web.socket.messaging.SubProtocolHandler;
@@ -65,29 +63,29 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * Test fixture for {@link WebSocketMessageBrokerConfigurationSupport}.
+ * Tests for {@link WebSocketMessageBrokerConfigurationSupport}.
  *
  * @author Rossen Stoyanchev
  * @author Sebastien Deleuze
  */
-public class WebSocketMessageBrokerConfigurationSupportTests {
+class WebSocketMessageBrokerConfigurationSupportTests {
 
 	@Test
-	public void handlerMapping() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
-		SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) config.getBean(HandlerMapping.class);
+	void handlerMapping() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
+		SimpleUrlHandlerMapping hm = context.getBean(SimpleUrlHandlerMapping.class);
 		assertThat(hm.getOrder()).isEqualTo(1);
 
 		Map<String, Object> handlerMap = hm.getHandlerMap();
-		assertThat(handlerMap.size()).isEqualTo(1);
+		assertThat(handlerMap).hasSize(1);
 		assertThat(handlerMap.get("/simpleBroker")).isNotNull();
 	}
 
 	@Test
-	public void clientInboundChannelSendMessage() throws Exception {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
-		TestChannel channel = config.getBean("clientInboundChannel", TestChannel.class);
-		SubProtocolWebSocketHandler webSocketHandler = config.getBean(SubProtocolWebSocketHandler.class);
+	void clientInboundChannelSendMessage() throws Exception {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
+		TestChannel channel = context.getBean("clientInboundChannel", TestChannel.class);
+		SubProtocolWebSocketHandler webSocketHandler = context.getBean(SubProtocolWebSocketHandler.class);
 
 		List<ChannelInterceptor> interceptors = channel.getInterceptors();
 		assertThat(interceptors.get(interceptors.size() - 1).getClass()).isEqualTo(ImmutableMessageChannelInterceptor.class);
@@ -108,66 +106,66 @@ public void clientInboundChannelSendMessage() throws Exception {
 	}
 
 	@Test
-	public void clientOutboundChannel() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
-		TestChannel channel = config.getBean("clientOutboundChannel", TestChannel.class);
+	void clientOutboundChannel() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
+		TestChannel channel = context.getBean("clientOutboundChannel", TestChannel.class);
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		List<ChannelInterceptor> interceptors = channel.getInterceptors();
 		assertThat(interceptors.get(interceptors.size() - 1).getClass()).isEqualTo(ImmutableMessageChannelInterceptor.class);
 
-		assertThat(handlers.size()).isEqualTo(1);
-		assertThat(handlers.contains(config.getBean(SubProtocolWebSocketHandler.class))).isTrue();
+		assertThat(handlers).hasSize(1);
+		assertThat(handlers).contains(context.getBean(SubProtocolWebSocketHandler.class));
 	}
 
 	@Test
-	public void brokerChannel() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
-		TestChannel channel = config.getBean("brokerChannel", TestChannel.class);
+	void brokerChannel() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
+		TestChannel channel = context.getBean("brokerChannel", TestChannel.class);
 		Set<MessageHandler> handlers = channel.getSubscribers();
 
 		List<ChannelInterceptor> interceptors = channel.getInterceptors();
 		assertThat(interceptors.get(interceptors.size() - 1).getClass()).isEqualTo(ImmutableMessageChannelInterceptor.class);
 
-		assertThat(handlers.size()).isEqualTo(2);
-		assertThat(handlers.contains(config.getBean(SimpleBrokerMessageHandler.class))).isTrue();
-		assertThat(handlers.contains(config.getBean(UserDestinationMessageHandler.class))).isTrue();
+		assertThat(handlers).hasSize(2);
+		assertThat(handlers).contains(context.getBean(SimpleBrokerMessageHandler.class));
+		assertThat(handlers).contains(context.getBean(UserDestinationMessageHandler.class));
 	}
 
 	@Test
-	public void webSocketHandler() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
-		SubProtocolWebSocketHandler subWsHandler = config.getBean(SubProtocolWebSocketHandler.class);
+	void webSocketHandler() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
+		SubProtocolWebSocketHandler subWsHandler = context.getBean(SubProtocolWebSocketHandler.class);
 
-		assertThat(subWsHandler.getSendBufferSizeLimit()).isEqualTo((1024 * 1024));
-		assertThat(subWsHandler.getSendTimeLimit()).isEqualTo((25 * 1000));
-		assertThat(subWsHandler.getTimeToFirstMessage()).isEqualTo((30 * 1000));
+		assertThat(subWsHandler.getSendBufferSizeLimit()).isEqualTo(1024 * 1024);
+		assertThat(subWsHandler.getSendTimeLimit()).isEqualTo(25 * 1000);
+		assertThat(subWsHandler.getTimeToFirstMessage()).isEqualTo(30 * 1000);
 
 		Map<String, SubProtocolHandler> handlerMap = subWsHandler.getProtocolHandlerMap();
 		StompSubProtocolHandler protocolHandler = (StompSubProtocolHandler) handlerMap.get("v12.stomp");
-		assertThat(protocolHandler.getMessageSizeLimit()).isEqualTo((128 * 1024));
+		assertThat(protocolHandler.getMessageSizeLimit()).isEqualTo(128 * 1024);
 	}
 
 	@Test
-	public void taskScheduler() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
+	void taskScheduler() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
 
 		String name = "messageBrokerSockJsTaskScheduler";
-		ThreadPoolTaskScheduler taskScheduler = config.getBean(name, ThreadPoolTaskScheduler.class);
+		ThreadPoolTaskScheduler taskScheduler = context.getBean(name, ThreadPoolTaskScheduler.class);
 		ScheduledThreadPoolExecutor executor = taskScheduler.getScheduledThreadPoolExecutor();
 		assertThat(executor.getCorePoolSize()).isEqualTo(Runtime.getRuntime().availableProcessors());
 		assertThat(executor.getRemoveOnCancelPolicy()).isTrue();
 
-		SimpleBrokerMessageHandler handler = config.getBean(SimpleBrokerMessageHandler.class);
+		SimpleBrokerMessageHandler handler = context.getBean(SimpleBrokerMessageHandler.class);
 		assertThat(handler.getTaskScheduler()).isNotNull();
-		assertThat(handler.getHeartbeatValue()).isEqualTo(new long[] {15000, 15000});
+		assertThat(handler.getHeartbeatValue()).containsExactly(15000, 15000);
 	}
 
 	@Test
-	public void webSocketMessageBrokerStats() {
-		ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class);
+	void webSocketMessageBrokerStats() {
+		ApplicationContext context = createContext(TestChannelConfig.class, TestConfigurer.class);
 		String name = "webSocketMessageBrokerStats";
-		WebSocketMessageBrokerStats stats = config.getBean(name, WebSocketMessageBrokerStats.class);
+		WebSocketMessageBrokerStats stats = context.getBean(name, WebSocketMessageBrokerStats.class);
 		String actual = stats.toString();
 		String expected = "WebSocketSession\\[0 current WS\\(0\\)-HttpStream\\(0\\)-HttpPoll\\(0\\), " +
 				"0 total, 0 closed abnormally \\(0 connect failure, 0 send limit, 0 transport error\\)], " +
@@ -177,16 +175,16 @@ public void webSocketMessageBrokerStats() {
 				"outboundChannel\\[pool size = \\d, active threads = \\d, queued tasks = \\d, completed tasks = \\d], " +
 				"sockJsScheduler\\[pool size = \\d, active threads = \\d, queued tasks = \\d, completed tasks = \\d]";
 
-		assertThat(actual.matches(expected)).as("\nExpected: " + expected.replace("\\", "") + "\n  Actual: " + actual).isTrue();
+		assertThat(actual).matches(expected);
 	}
 
 	@Test
-	public void webSocketHandlerDecorator() throws Exception {
-		ApplicationContext config = createConfig(WebSocketHandlerDecoratorConfig.class);
-		WebSocketHandler handler = config.getBean(SubProtocolWebSocketHandler.class);
+	void webSocketHandlerDecorator() throws Exception {
+		ApplicationContext context = createContext(WebSocketHandlerDecoratorConfig.class);
+		WebSocketHandler handler = context.getBean(SubProtocolWebSocketHandler.class);
 		assertThat(handler).isNotNull();
 
-		SimpleUrlHandlerMapping mapping = (SimpleUrlHandlerMapping) config.getBean("stompWebSocketHandlerMapping");
+		SimpleUrlHandlerMapping mapping = context.getBean("stompWebSocketHandlerMapping", SimpleUrlHandlerMapping.class);
 		WebSocketHttpRequestHandler httpHandler = (WebSocketHttpRequestHandler) mapping.getHandlerMap().get("/test");
 		handler = httpHandler.getWebSocketHandler();
 
@@ -196,11 +194,8 @@ public void webSocketHandlerDecorator() throws Exception {
 	}
 
 
-	private ApplicationContext createConfig(Class<?>... configClasses) {
-		AnnotationConfigApplicationContext config = new AnnotationConfigApplicationContext();
-		config.register(configClasses);
-		config.refresh();
-		return config;
+	private ApplicationContext createContext(Class<?>... configClasses) {
+		return new AnnotationConfigApplicationContext(configClasses);
 	}
 
 
@@ -286,17 +281,12 @@ protected void registerStompEndpoints(StompEndpointRegistry registry) {
 
 		@Override
 		protected void configureWebSocketTransport(WebSocketTransportRegistration registry) {
-			registry.addDecoratorFactory(new WebSocketHandlerDecoratorFactory() {
-				@Override
-				public WebSocketHandlerDecorator decorate(WebSocketHandler handler) {
-					return new WebSocketHandlerDecorator(handler) {
-						@Override
-						public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-							session.getAttributes().put("decorated", true);
-							super.afterConnectionEstablished(session);
-						}
-					};
-				}
+			registry.addDecoratorFactory(handler -> new WebSocketHandlerDecorator(handler) {
+					@Override
+					public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+						session.getAttributes().put("decorated", true);
+						super.afterConnectionEstablished(session);
+					}
 			});
 		}
 	}

From 42edef0bccb75a09523040b9567866281b574629 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 25 Jul 2021 19:00:52 +0200
Subject: [PATCH 011/140] Avoid StringIndexOutOfBoundsException in
 WebSocketMessageBrokerStats

Prior to this commit, if the TaskExecutor configured in
WebSocketMessageBrokerStats for the inboundChannelExecutor or
outboundChannelExecutor was not a ThreadPoolTaskExecutor, a
StringIndexOutOfBoundsException was thrown when attempting to parse the
results of invoking toString() on the executor.

The reason is that ThreadPoolTaskExecutor delegates to a
ThreadPoolExecutor whose toString() implementation generates text
containing "pool size = ...", and WebSocketMessageBrokerStats'
getExecutorStatsInfo() method relied on the presence of "pool" in the
text returned from toString().

This commit fixes this bug by ensuring that the text returned from
toString() contains "pool" before parsing the text. If "pool" is not
present in the text, getExecutorStatsInfo() now returns "unknown"
instead of throwing a StringIndexOutOfBoundsException.

Closes gh-27209
---
 .../config/WebSocketMessageBrokerStats.java   | 41 ++++++---
 .../WebSocketMessageBrokerStatsTests.java     | 92 +++++++++++++++++++
 2 files changed, 120 insertions(+), 13 deletions(-)
 create mode 100644 spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java
index 6ac28d6fedee..16e1b2f51393 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.time.Instant;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
@@ -49,6 +50,7 @@
  * the {@link org.springframework.jmx.export.MBeanExporter MBeanExporter}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 4.1
  */
 public class WebSocketMessageBrokerStats {
@@ -174,16 +176,14 @@ public String getStompBrokerRelayStatsInfo() {
 	 * Get stats about the executor processing incoming messages from WebSocket clients.
 	 */
 	public String getClientInboundExecutorStatsInfo() {
-		return (this.inboundChannelExecutor != null ?
-				getExecutorStatsInfo(this.inboundChannelExecutor) : "null");
+		return getExecutorStatsInfo(this.inboundChannelExecutor);
 	}
 
 	/**
 	 * Get stats about the executor processing outgoing messages to WebSocket clients.
 	 */
 	public String getClientOutboundExecutorStatsInfo() {
-		return (this.outboundChannelExecutor != null ?
-				getExecutorStatsInfo(this.outboundChannelExecutor) : "null");
+		return getExecutorStatsInfo(this.outboundChannelExecutor);
 	}
 
 	/**
@@ -197,16 +197,31 @@ public String getSockJsTaskSchedulerStatsInfo() {
 			return getExecutorStatsInfo(((ThreadPoolTaskScheduler) this.sockJsTaskScheduler)
 					.getScheduledThreadPoolExecutor());
 		}
-		else {
-			return "unknown";
-		}
+		return "unknown";
 	}
 
-	private String getExecutorStatsInfo(Executor executor) {
-		executor = executor instanceof ThreadPoolTaskExecutor ?
-				((ThreadPoolTaskExecutor) executor).getThreadPoolExecutor() : executor;
-		String str = executor.toString();
-		return str.substring(str.indexOf("pool"), str.length() - 1);
+	private String getExecutorStatsInfo(@Nullable Executor executor) {
+		if (executor == null) {
+			return "null";
+		}
+
+		if (executor instanceof ThreadPoolTaskExecutor) {
+			executor = ((ThreadPoolTaskExecutor) executor).getThreadPoolExecutor();
+		}
+
+		if (executor instanceof ThreadPoolExecutor) {
+			// It is assumed that the implementation of toString() in ThreadPoolExecutor
+			// generates text that ends similar to the following:
+			// pool size = #, active threads = #, queued tasks = #, completed tasks = #]
+			String str = executor.toString();
+			int indexOfPool = str.indexOf("pool");
+			if (indexOfPool != -1) {
+				// (length - 1) omits the trailing "]"
+				return str.substring(indexOfPool, str.length() - 1);
+			}
+		}
+
+		return "unknown";
 	}
 
 	@Override
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java
new file mode 100644
index 000000000000..324dc4942d23
--- /dev/null
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.socket.config;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Unit tests for {@link WebSocketMessageBrokerStats}.
+ *
+ * @author Sam Brannen
+ * @since 5.3.10
+ * @see org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurationSupportTests
+ */
+class WebSocketMessageBrokerStatsTests {
+
+	private final WebSocketMessageBrokerStats stats = new WebSocketMessageBrokerStats();
+
+	@Test
+	void nullValues() {
+		String expected = "WebSocketSession[null], stompSubProtocol[null], stompBrokerRelay[null], " +
+				"inboundChannel[null], outboundChannel[null], sockJsScheduler[null]";
+		assertThat(stats).hasToString(expected);
+	}
+
+	@Test
+	void inboundAndOutboundChannelsWithThreadPoolTaskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.afterPropertiesSet();
+
+		stats.setInboundChannelExecutor(executor);
+		stats.setOutboundChannelExecutor(executor);
+
+		assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats")
+			.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0");
+		assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats")
+			.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0");
+	}
+
+	@Test
+	void inboundAndOutboundChannelsWithMockedTaskExecutor() {
+		TaskExecutor executor = mock(TaskExecutor.class);
+
+		stats.setInboundChannelExecutor(executor);
+		stats.setOutboundChannelExecutor(executor);
+
+		assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats").isEqualTo("unknown");
+		assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats").isEqualTo("unknown");
+	}
+
+	@Test
+	void sockJsTaskSchedulerWithThreadPoolTaskScheduler() {
+		ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+		scheduler.afterPropertiesSet();
+
+		stats.setSockJsTaskScheduler(scheduler);
+
+		assertThat(stats.getSockJsTaskSchedulerStatsInfo())
+			.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0");
+	}
+
+	@Test
+	void sockJsTaskSchedulerWithMockedTaskScheduler() {
+		TaskScheduler scheduler = mock(TaskScheduler.class);
+
+		stats.setSockJsTaskScheduler(scheduler);
+
+		assertThat(stats.getSockJsTaskSchedulerStatsInfo()).isEqualTo("unknown");
+	}
+
+}

From 161c9dc3bd42f2391eaa9f538d4ccad828da1ab0 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 27 Jul 2021 15:05:43 +0200
Subject: [PATCH 012/140] Improve @Cacheable documentation regarding
 java.util.Optional

This commit improves the documentation for @Cacheable to point out that
`null` will be stored in the cache for an empty `Optional` return value.

Closes gh-27184
---
 .../cache/annotation/Cacheable.java                | 10 ++++++----
 src/docs/asciidoc/integration.adoc                 | 14 ++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
index b93cf9373f8b..e1d2700a4c4c 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,11 @@
  * replace the default one (see {@link #keyGenerator}).
  *
  * <p>If no value is found in the cache for the computed key, the target method
- * will be invoked and the returned value stored in the associated cache. Note
- * that Java8's {@code Optional} return types are automatically handled and its
- * content is stored in the cache if present.
+ * will be invoked and the returned value will be stored in the associated cache.
+ * Note that {@link java.util.Optional} return types are unwrapped automatically.
+ * If an {@code Optional} value is {@linkplain java.util.Optional#isPresent()
+ * present}, it will be stored in the associated cache. If an {@code Optional}
+ * value is not present, {@code null} will be stored in the associated cache.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 9e5596052549..15e49e487d23 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -5688,7 +5688,7 @@ method -- if at least one cache is hit, the associated value is returned.
 NOTE: All the other caches that do not contain the value are also updated, even though
 the cached method was not actually invoked.
 
-The following example uses `@Cacheable` on the `findBook` method:
+The following example uses `@Cacheable` on the `findBook` method with multiple caches:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -5896,9 +5896,11 @@ want to cache paperback books, as the following example does:
 <1> Using the `unless` attribute to block hardbacks.
 
 
-The cache abstraction supports `java.util.Optional`, using its content as the cached value
-only if it is present. `#result` always refers to the business entity and never a
-supported wrapper, so the previous example can be rewritten as follows:
+The cache abstraction supports `java.util.Optional` return types. If an `Optional` value
+is _present_, it will be stored in the associated cache. If an `Optional` value is not
+present, `null` will be stored in the associated cache. `#result` always refers to the
+business entity and never a supported wrapper, so the previous example can be rewritten
+as follows:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -5906,8 +5908,8 @@ supported wrapper, so the previous example can be rewritten as follows:
 	public Optional<Book> findBook(String name)
 ----
 
-Note that `result` still refers to `Book` and not `Optional`. As it might be `null`, we
-should use the safe navigation operator.
+Note that `#result` still refers to `Book` and not `Optional<Book>`. Since it might be
+`null`, we use SpEL's <<core.adoc#expressions-operator-safe-navigation, safe navigation operator>>.
 
 [[cache-spel-context]]
 ===== Available Caching SpEL Evaluation Context

From a747cc3e91ea3b16be3351edf2ed6d536524ee60 Mon Sep 17 00:00:00 2001
From: Moncef AOUDIA <mf.aoudia@gmail.com>
Date: Tue, 27 Jul 2021 11:46:24 +0200
Subject: [PATCH 013/140] Fix error message in SynchronossPartHttpMessageReader

---
 .../http/codec/multipart/SynchronossPartHttpMessageReader.java  | 2 +-
 .../codec/multipart/SynchronossPartHttpMessageReaderTests.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
index e4eedfd99eca..4a77c1b53139 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -356,7 +356,7 @@ public StreamStorage newStreamStorageForPartBody(Map<String, List<String>> heade
 			this.isFilePart = (MultipartUtils.getFileName(headers) != null);
 			this.partSize = 0;
 			if (maxParts > 0 && index > maxParts) {
-				throw new DecodingException("Too many parts (" + index + " allowed)");
+				throw new DecodingException("Too many parts (" + index + "/" + maxParts + " allowed)");
 			}
 			return this.storageFactory.newStreamStorageForPartBody(headers, index);
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
index ba025cbd6b2d..5948be6f5a10 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
@@ -170,7 +170,7 @@ void readTooManyParts() {
 							.isInstanceOf(DecodingException.class)
 							.hasMessageStartingWith("Failure while parsing part[2]");
 					assertThat(ex.getCause())
-							.hasMessage("Too many parts (2 allowed)");
+							.hasMessage("Too many parts (2/1 allowed)");
 				}
 		);
 	}

From 6c68419073b43fb29114a3af4e402c729084ed84 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 27 Jul 2021 17:41:30 +0100
Subject: [PATCH 014/140] Polishing contribution

Closes gh-27216
---
 .../SynchronossPartHttpMessageReader.java     |  2 +-
 ...SynchronossPartHttpMessageReaderTests.java | 38 ++++++++-----------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
index 4a77c1b53139..032b787d887b 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -356,7 +356,7 @@ public StreamStorage newStreamStorageForPartBody(Map<String, List<String>> heade
 			this.isFilePart = (MultipartUtils.getFileName(headers) != null);
 			this.partSize = 0;
 			if (maxParts > 0 && index > maxParts) {
-				throw new DecodingException("Too many parts (" + index + "/" + maxParts + " allowed)");
+				throw new DecodingException("Too many parts: Part[" + index + "] but maxParts=" + maxParts);
 			}
 			return this.storageFactory.newStreamStorageForPartBody(headers, index);
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
index 5948be6f5a10..10dbdba63a78 100644
--- a/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,37 +165,31 @@ void gh23768() throws IOException {
 
 	@Test
 	void readTooManyParts() {
-		testMultipartExceptions(reader -> reader.setMaxParts(1), ex -> {
-					assertThat(ex)
-							.isInstanceOf(DecodingException.class)
-							.hasMessageStartingWith("Failure while parsing part[2]");
-					assertThat(ex.getCause())
-							.hasMessage("Too many parts (2/1 allowed)");
-				}
+		testMultipartExceptions(reader -> reader.setMaxParts(1),
+				ex -> assertThat(ex)
+						.isInstanceOf(DecodingException.class)
+						.hasMessageStartingWith("Failure while parsing part[2]")
+						.hasRootCauseMessage("Too many parts: Part[2] but maxParts=1")
 		);
 	}
 
 	@Test
 	void readFilePartTooBig() {
-		testMultipartExceptions(reader -> reader.setMaxDiskUsagePerPart(5), ex -> {
-					assertThat(ex)
-							.isInstanceOf(DecodingException.class)
-							.hasMessageStartingWith("Failure while parsing part[1]");
-					assertThat(ex.getCause())
-							.hasMessage("Part[1] exceeded the disk usage limit of 5 bytes");
-				}
+		testMultipartExceptions(reader -> reader.setMaxDiskUsagePerPart(5),
+				ex -> assertThat(ex)
+						.isInstanceOf(DecodingException.class)
+						.hasMessageStartingWith("Failure while parsing part[1]")
+						.hasRootCauseMessage("Part[1] exceeded the disk usage limit of 5 bytes")
 		);
 	}
 
 	@Test
 	void readPartHeadersTooBig() {
-		testMultipartExceptions(reader -> reader.setMaxInMemorySize(1), ex -> {
-					assertThat(ex)
-							.isInstanceOf(DecodingException.class)
-							.hasMessageStartingWith("Failure while parsing part[1]");
-					assertThat(ex.getCause())
-							.hasMessage("Part[1] exceeded the in-memory limit of 1 bytes");
-				}
+		testMultipartExceptions(reader -> reader.setMaxInMemorySize(1),
+				ex -> assertThat(ex)
+						.isInstanceOf(DecodingException.class)
+						.hasMessageStartingWith("Failure while parsing part[1]")
+						.hasRootCauseMessage("Part[1] exceeded the in-memory limit of 1 bytes")
 		);
 	}
 

From 403e04c0b4a79c68b4caf69aabcc9fd0c7bbbd3c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 28 Jul 2021 10:47:36 +0200
Subject: [PATCH 015/140] Polish MockHttpServletResponse

---
 .../mock/web/MockHttpServletResponse.java     | 31 +++++++++++++------
 .../servlet/MockHttpServletResponse.java      | 31 +++++++++++++------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index b7b6b9626aa8..4182597f33de 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -83,7 +83,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	@Nullable
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 
-	private boolean charset = false;
+	/**
+	 * {@code true} if the character encoding has been explicitly set through
+	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
+	 * on the {@code Content-Type}.
+	 */
+	private boolean characterEncodingSet = false;
 
 	private final ByteArrayOutputStream content = new ByteArrayOutputStream(1024);
 
@@ -117,6 +122,11 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	@Nullable
 	private String errorMessage;
 
+
+	//---------------------------------------------------------------------
+	// Properties for MockRequestDispatcher
+	//---------------------------------------------------------------------
+
 	@Nullable
 	private String forwardedUrl;
 
@@ -158,24 +168,27 @@ public boolean isWriterAccessAllowed() {
 	}
 
 	/**
-	 * Return whether the character encoding has been set.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default encoding value.
+	 * Determine whether the character encoding has been explicitly set through
+	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
+	 * on the {@code Content-Type}.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default
+	 * encoding value.
 	 */
 	public boolean isCharset() {
-		return this.charset;
+		return this.characterEncodingSet;
 	}
 
 	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
-		this.charset = true;
+		this.characterEncodingSet = true;
 		updateContentTypePropertyAndHeader();
 	}
 
 	private void updateContentTypePropertyAndHeader() {
 		if (this.contentType != null) {
 			String value = this.contentType;
-			if (this.charset && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
+			if (this.characterEncodingSet && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
 				value = value + ';' + CHARSET_PREFIX + this.characterEncoding;
 				this.contentType = value;
 			}
@@ -270,7 +283,7 @@ public void setContentType(@Nullable String contentType) {
 				MediaType mediaType = MediaType.parseMediaType(contentType);
 				if (mediaType.getCharset() != null) {
 					this.characterEncoding = mediaType.getCharset().name();
-					this.charset = true;
+					this.characterEncodingSet = true;
 				}
 			}
 			catch (Exception ex) {
@@ -278,7 +291,7 @@ public void setContentType(@Nullable String contentType) {
 				int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 				if (charsetIndex != -1) {
 					this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-					this.charset = true;
+					this.characterEncodingSet = true;
 				}
 			}
 			updateContentTypePropertyAndHeader();
@@ -332,7 +345,7 @@ public boolean isCommitted() {
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
-		this.charset = false;
+		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;
 		this.locale = Locale.getDefault();
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index f3215a88b253..e357bc3ce191 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -83,7 +83,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	@Nullable
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 
-	private boolean charset = false;
+	/**
+	 * {@code true} if the character encoding has been explicitly set through
+	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
+	 * on the {@code Content-Type}.
+	 */
+	private boolean characterEncodingSet = false;
 
 	private final ByteArrayOutputStream content = new ByteArrayOutputStream(1024);
 
@@ -117,6 +122,11 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	@Nullable
 	private String errorMessage;
 
+
+	//---------------------------------------------------------------------
+	// Properties for MockRequestDispatcher
+	//---------------------------------------------------------------------
+
 	@Nullable
 	private String forwardedUrl;
 
@@ -158,24 +168,27 @@ public boolean isWriterAccessAllowed() {
 	}
 
 	/**
-	 * Return whether the character encoding has been set.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default encoding value.
+	 * Determine whether the character encoding has been explicitly set through
+	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
+	 * on the {@code Content-Type}.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default
+	 * encoding value.
 	 */
 	public boolean isCharset() {
-		return this.charset;
+		return this.characterEncodingSet;
 	}
 
 	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
-		this.charset = true;
+		this.characterEncodingSet = true;
 		updateContentTypePropertyAndHeader();
 	}
 
 	private void updateContentTypePropertyAndHeader() {
 		if (this.contentType != null) {
 			String value = this.contentType;
-			if (this.charset && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
+			if (this.characterEncodingSet && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
 				value = value + ';' + CHARSET_PREFIX + this.characterEncoding;
 				this.contentType = value;
 			}
@@ -270,7 +283,7 @@ public void setContentType(@Nullable String contentType) {
 				MediaType mediaType = MediaType.parseMediaType(contentType);
 				if (mediaType.getCharset() != null) {
 					this.characterEncoding = mediaType.getCharset().name();
-					this.charset = true;
+					this.characterEncodingSet = true;
 				}
 			}
 			catch (Exception ex) {
@@ -278,7 +291,7 @@ public void setContentType(@Nullable String contentType) {
 				int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 				if (charsetIndex != -1) {
 					this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-					this.charset = true;
+					this.characterEncodingSet = true;
 				}
 			}
 			updateContentTypePropertyAndHeader();
@@ -332,7 +345,7 @@ public boolean isCommitted() {
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
-		this.charset = false;
+		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;
 		this.locale = Locale.getDefault();

From c2f91765b401c2976fd802358e6453d0fad0d2fd Mon Sep 17 00:00:00 2001
From: DongHyuk <ydh6226@naver.com>
Date: Wed, 28 Jul 2021 22:19:59 +0900
Subject: [PATCH 016/140] Fix typo in Javadoc in AbstractHandlerMapping

Closes gh-27218
---
 .../web/servlet/handler/AbstractHandlerMapping.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index 900b7881be90..d3336710f0c4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
@@ -276,7 +276,7 @@ public void setInterceptors(Object... interceptors) {
 	 * determines the {@code CorsConfiguration} to use which is then further
 	 * {@link CorsConfiguration#combine(CorsConfiguration) combined} with the
 	 * {@code CorsConfiguration} for the selected handler.
-	 * <p>This is mutually exclusie with
+	 * <p>This is mutually exclusive with
 	 * {@link #setCorsConfigurationSource(CorsConfigurationSource)}.
 	 * @since 4.2
 	 * @see #setCorsProcessor(CorsProcessor)
@@ -305,7 +305,7 @@ public void setCorsConfigurations(Map<String, CorsConfiguration> corsConfigurati
 	 * {@code CorsConfiguration} determined by the source is
 	 * {@link CorsConfiguration#combine(CorsConfiguration) combined} with the
 	 * {@code CorsConfiguration} for the selected handler.
-	 * <p>This is mutually exclusie with {@link #setCorsConfigurations(Map)}.
+	 * <p>This is mutually exclusive with {@link #setCorsConfigurations(Map)}.
 	 * @since 5.1
 	 * @see #setCorsProcessor(CorsProcessor)
 	 */

From f1b35f15931e1d0e74df3feb9d74ddecedc694f8 Mon Sep 17 00:00:00 2001
From: Mateusz Swiatkowski <6883643+matvs@users.noreply.github.com>
Date: Thu, 29 Jul 2021 11:03:26 +0200
Subject: [PATCH 017/140] Fix reference to Optional.isPresent() in
 ObjectUtils.isEmpty()

Closes gh-27223
---
 .../src/main/java/org/springframework/util/ObjectUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index 8089a1313e7b..c331a41c1aa8 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -114,7 +114,7 @@ public static boolean isEmpty(@Nullable Object[] array) {
 	 * Determine whether the given object is empty.
 	 * <p>This method supports the following object types.
 	 * <ul>
-	 * <li>{@code Optional}: considered empty if {@link Optional#empty()}</li>
+	 * <li>{@code Optional}: considered empty if not {@link Optional#isPresent()}</li>
 	 * <li>{@code Array}: considered empty if its length is zero</li>
 	 * <li>{@link CharSequence}: considered empty if its length is zero</li>
 	 * <li>{@link Collection}: delegates to {@link Collection#isEmpty()}</li>

From 915f1027a571f850c177a0a7da9263ead95599df Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 29 Jul 2021 11:04:59 +0200
Subject: [PATCH 018/140] Update copyright date

See gh-27223
---
 .../src/main/java/org/springframework/util/ObjectUtils.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
index c331a41c1aa8..f5a703c30181 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 96ee8a3bc71815700c5e952d5eaac733415bfeda Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 28 Jul 2021 16:08:28 +0200
Subject: [PATCH 019/140] Ensure characterEncoding in MockHttpServletResponse
 is non-null

Closes gh-27219
---
 .../mock/web/MockHttpServletResponse.java     | 44 ++++++++++---------
 .../servlet/result/PrintingResultHandler.java |  7 +--
 .../web/MockHttpServletResponseTests.java     |  4 ++
 .../result/PrintingResultHandlerTests.java    | 12 +----
 .../servlet/MockHttpServletResponse.java      | 44 ++++++++++---------
 5 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index 4182597f33de..a3140793791e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -80,7 +80,6 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	private boolean writerAccessAllowed = true;
 
-	@Nullable
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 
 	/**
@@ -171,8 +170,8 @@ public boolean isWriterAccessAllowed() {
 	 * Determine whether the character encoding has been explicitly set through
 	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
 	 * on the {@code Content-Type}.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default
-	 * encoding value.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the default
+	 * character encoding.
 	 */
 	public boolean isCharset() {
 		return this.characterEncodingSet;
@@ -180,16 +179,21 @@ public boolean isCharset() {
 
 	@Override
 	public void setCharacterEncoding(String characterEncoding) {
+		setExplicitCharacterEncoding(characterEncoding);
+		updateContentTypePropertyAndHeader();
+	}
+
+	private void setExplicitCharacterEncoding(String characterEncoding) {
+		Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
 		this.characterEncoding = characterEncoding;
 		this.characterEncodingSet = true;
-		updateContentTypePropertyAndHeader();
 	}
 
 	private void updateContentTypePropertyAndHeader() {
 		if (this.contentType != null) {
 			String value = this.contentType;
-			if (this.characterEncodingSet && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
-				value = value + ';' + CHARSET_PREFIX + this.characterEncoding;
+			if (this.characterEncodingSet && !value.toLowerCase().contains(CHARSET_PREFIX)) {
+				value += ';' + CHARSET_PREFIX + getCharacterEncoding();
 				this.contentType = value;
 			}
 			doAddHeaderValue(HttpHeaders.CONTENT_TYPE, value, true);
@@ -197,7 +201,6 @@ private void updateContentTypePropertyAndHeader() {
 	}
 
 	@Override
-	@Nullable
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -212,9 +215,7 @@ public ServletOutputStream getOutputStream() {
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		Assert.state(this.writerAccessAllowed, "Writer access not allowed");
 		if (this.writer == null) {
-			Writer targetWriter = (this.characterEncoding != null ?
-					new OutputStreamWriter(this.content, this.characterEncoding) :
-					new OutputStreamWriter(this.content));
+			Writer targetWriter = new OutputStreamWriter(this.content, getCharacterEncoding());
 			this.writer = new ResponsePrintWriter(targetWriter);
 		}
 		return this.writer;
@@ -228,14 +229,16 @@ public byte[] getContentAsByteArray() {
 	 * Get the content of the response body as a {@code String}, using the charset
 	 * specified for the response by the application, either through
 	 * {@link HttpServletResponse} methods or through a charset parameter on the
-	 * {@code Content-Type}.
+	 * {@code Content-Type}. If no charset has been explicitly defined, the default
+	 * character encoding will be used.
 	 * @return the content as a {@code String}
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @see #getContentAsString(Charset)
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
 	 */
 	public String getContentAsString() throws UnsupportedEncodingException {
-		return (this.characterEncoding != null ?
-				this.content.toString(this.characterEncoding) : this.content.toString());
+		return this.content.toString(getCharacterEncoding());
 	}
 
 	/**
@@ -248,11 +251,12 @@ public String getContentAsString() throws UnsupportedEncodingException {
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @since 5.2
 	 * @see #getContentAsString()
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
 	 */
 	public String getContentAsString(Charset fallbackCharset) throws UnsupportedEncodingException {
-		return (isCharset() && this.characterEncoding != null ?
-				this.content.toString(this.characterEncoding) :
-				this.content.toString(fallbackCharset.name()));
+		String charsetName = (this.characterEncodingSet ? getCharacterEncoding() : fallbackCharset.name());
+		return this.content.toString(charsetName);
 	}
 
 	@Override
@@ -282,16 +286,14 @@ public void setContentType(@Nullable String contentType) {
 			try {
 				MediaType mediaType = MediaType.parseMediaType(contentType);
 				if (mediaType.getCharset() != null) {
-					this.characterEncoding = mediaType.getCharset().name();
-					this.characterEncodingSet = true;
+					setExplicitCharacterEncoding(mediaType.getCharset().name());
 				}
 			}
 			catch (Exception ex) {
 				// Try to get charset value anyway
 				int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 				if (charsetIndex != -1) {
-					this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-					this.characterEncodingSet = true;
+					setExplicitCharacterEncoding(contentType.substring(charsetIndex + CHARSET_PREFIX.length()));
 				}
 			}
 			updateContentTypePropertyAndHeader();
@@ -344,7 +346,7 @@ public boolean isCommitted() {
 	@Override
 	public void reset() {
 		resetBuffer();
-		this.characterEncoding = null;
+		this.characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index a358760aa3e2..faaae9806db9 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -248,14 +248,11 @@ protected void printFlashMap(FlashMap flashMap) throws Exception {
 	 * Print the response.
 	 */
 	protected void printResponse(MockHttpServletResponse response) throws Exception {
-		String body = (response.getCharacterEncoding() != null ?
-				response.getContentAsString() : MISSING_CHARACTER_ENCODING);
-
 		this.printer.printValue("Status", response.getStatus());
 		this.printer.printValue("Error message", response.getErrorMessage());
 		this.printer.printValue("Headers", getResponseHeaders(response));
 		this.printer.printValue("Content type", response.getContentType());
-		this.printer.printValue("Body", body);
+		this.printer.printValue("Body", response.getContentAsString());
 		this.printer.printValue("Forwarded URL", response.getForwardedUrl());
 		this.printer.printValue("Redirected URL", response.getRedirectedUrl());
 		printCookies(response.getCookies());
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
index 1b45d2d36c2a..e8ac11b36b3e 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
@@ -551,6 +551,8 @@ private void assertPrimarySessionCookie(String expectedValue) {
 
 	@Test  // gh-25501
 	void resetResetsCharset() {
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1");
 		assertThat(response.isCharset()).isFalse();
 		response.setCharacterEncoding("UTF-8");
 		assertThat(response.isCharset()).isTrue();
@@ -562,6 +564,8 @@ void resetResetsCharset() {
 
 		response.reset();
 
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1");
 		assertThat(response.isCharset()).isFalse();
 		// Do not invoke setCharacterEncoding() since that sets the charset flag to true.
 		// response.setCharacterEncoding("UTF-8");
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
index b97f8d3d1f64..f91c39fda969 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -238,16 +238,6 @@ public void printResponseWithDefaultCharacterEncoding() throws Exception {
 		assertValue("MockHttpServletResponse", "Body", "text");
 	}
 
-	@Test
-	public void printResponseWithoutCharacterEncoding() throws Exception {
-		this.response.setCharacterEncoding(null);
-		this.response.getWriter().print("text");
-
-		this.handler.handle(this.mvcResult);
-
-		assertValue("MockHttpServletResponse", "Body", "<no character encoding set>");
-	}
-
 	@Test
 	public void printHandlerNull() throws Exception {
 		StubMvcResult mvcResult = new StubMvcResult(this.request, null, null, null, null, null, this.response);
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index e357bc3ce191..fc294fe2b643 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -80,7 +80,6 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	private boolean writerAccessAllowed = true;
 
-	@Nullable
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 
 	/**
@@ -171,8 +170,8 @@ public boolean isWriterAccessAllowed() {
 	 * Determine whether the character encoding has been explicitly set through
 	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
 	 * on the {@code Content-Type}.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return a default
-	 * encoding value.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the default
+	 * character encoding.
 	 */
 	public boolean isCharset() {
 		return this.characterEncodingSet;
@@ -180,16 +179,21 @@ public boolean isCharset() {
 
 	@Override
 	public void setCharacterEncoding(String characterEncoding) {
+		setExplicitCharacterEncoding(characterEncoding);
+		updateContentTypePropertyAndHeader();
+	}
+
+	private void setExplicitCharacterEncoding(String characterEncoding) {
+		Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
 		this.characterEncoding = characterEncoding;
 		this.characterEncodingSet = true;
-		updateContentTypePropertyAndHeader();
 	}
 
 	private void updateContentTypePropertyAndHeader() {
 		if (this.contentType != null) {
 			String value = this.contentType;
-			if (this.characterEncodingSet && !this.contentType.toLowerCase().contains(CHARSET_PREFIX)) {
-				value = value + ';' + CHARSET_PREFIX + this.characterEncoding;
+			if (this.characterEncodingSet && !value.toLowerCase().contains(CHARSET_PREFIX)) {
+				value += ';' + CHARSET_PREFIX + getCharacterEncoding();
 				this.contentType = value;
 			}
 			doAddHeaderValue(HttpHeaders.CONTENT_TYPE, value, true);
@@ -197,7 +201,6 @@ private void updateContentTypePropertyAndHeader() {
 	}
 
 	@Override
-	@Nullable
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -212,9 +215,7 @@ public ServletOutputStream getOutputStream() {
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		Assert.state(this.writerAccessAllowed, "Writer access not allowed");
 		if (this.writer == null) {
-			Writer targetWriter = (this.characterEncoding != null ?
-					new OutputStreamWriter(this.content, this.characterEncoding) :
-					new OutputStreamWriter(this.content));
+			Writer targetWriter = new OutputStreamWriter(this.content, getCharacterEncoding());
 			this.writer = new ResponsePrintWriter(targetWriter);
 		}
 		return this.writer;
@@ -228,14 +229,16 @@ public byte[] getContentAsByteArray() {
 	 * Get the content of the response body as a {@code String}, using the charset
 	 * specified for the response by the application, either through
 	 * {@link HttpServletResponse} methods or through a charset parameter on the
-	 * {@code Content-Type}.
+	 * {@code Content-Type}. If no charset has been explicitly defined, the default
+	 * character encoding will be used.
 	 * @return the content as a {@code String}
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @see #getContentAsString(Charset)
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
 	 */
 	public String getContentAsString() throws UnsupportedEncodingException {
-		return (this.characterEncoding != null ?
-				this.content.toString(this.characterEncoding) : this.content.toString());
+		return this.content.toString(getCharacterEncoding());
 	}
 
 	/**
@@ -248,11 +251,12 @@ public String getContentAsString() throws UnsupportedEncodingException {
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @since 5.2
 	 * @see #getContentAsString()
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
 	 */
 	public String getContentAsString(Charset fallbackCharset) throws UnsupportedEncodingException {
-		return (isCharset() && this.characterEncoding != null ?
-				this.content.toString(this.characterEncoding) :
-				this.content.toString(fallbackCharset.name()));
+		String charsetName = (this.characterEncodingSet ? getCharacterEncoding() : fallbackCharset.name());
+		return this.content.toString(charsetName);
 	}
 
 	@Override
@@ -282,16 +286,14 @@ public void setContentType(@Nullable String contentType) {
 			try {
 				MediaType mediaType = MediaType.parseMediaType(contentType);
 				if (mediaType.getCharset() != null) {
-					this.characterEncoding = mediaType.getCharset().name();
-					this.characterEncodingSet = true;
+					setExplicitCharacterEncoding(mediaType.getCharset().name());
 				}
 			}
 			catch (Exception ex) {
 				// Try to get charset value anyway
 				int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
 				if (charsetIndex != -1) {
-					this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-					this.characterEncodingSet = true;
+					setExplicitCharacterEncoding(contentType.substring(charsetIndex + CHARSET_PREFIX.length()));
 				}
 			}
 			updateContentTypePropertyAndHeader();
@@ -344,7 +346,7 @@ public boolean isCommitted() {
 	@Override
 	public void reset() {
 		resetBuffer();
-		this.characterEncoding = null;
+		this.characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
 		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;

From 5b3f11c543cefabd4de3a1eb1f8b7ab38e394472 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 29 Jul 2021 14:47:31 +0200
Subject: [PATCH 020/140] Add @Nullable to setLocale in MockHttpServletResponse

See gh-26493
---
 .../springframework/mock/web/MockHttpServletResponse.java    | 5 ++++-
 .../web/testfixture/servlet/MockHttpServletResponse.java     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index a3140793791e..52a7ab354f7e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -358,7 +358,10 @@ public void reset() {
 	}
 
 	@Override
-	public void setLocale(Locale locale) {
+	public void setLocale(@Nullable Locale locale) {
+		// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
+		// state how a null value for the supplied Locale should be handled, both Tomcat and
+		// Jetty simply ignore a null value. So we do the same here.
 		if (locale == null) {
 			return;
 		}
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index fc294fe2b643..7418a2871609 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -358,7 +358,10 @@ public void reset() {
 	}
 
 	@Override
-	public void setLocale(Locale locale) {
+	public void setLocale(@Nullable Locale locale) {
+		// Although the Javadoc for javax.servlet.ServletResponse.setLocale(Locale) does not
+		// state how a null value for the supplied Locale should be handled, both Tomcat and
+		// Jetty simply ignore a null value. So we do the same here.
 		if (locale == null) {
 			return;
 		}

From f2be4e93203d2949a8e46466f92a1715954b85b5 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Fri, 23 Jul 2021 10:00:23 +0800
Subject: [PATCH 021/140] Use MessageSource for @ExceptionHandler methods

Follow-up for commit bb816c123ca86c6f373ee2bd1632f43c117a8f15

See gh-27203
---
 .../web/method/HandlerMethod.java             | 11 ++++-
 .../support/InvocableHandlerMethod.java       |  9 ++++
 .../ExceptionHandlerExceptionResolver.java    |  4 +-
 .../ServletInvocableHandlerMethod.java        |  8 ++++
 ...xceptionHandlerExceptionResolverTests.java | 43 +++++++++++++++++++
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index bbcef56c8bab..90e93fd36427 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -102,11 +102,20 @@ public class HandlerMethod {
 	 * Create an instance from a bean instance and a method.
 	 */
 	public HandlerMethod(Object bean, Method method) {
+		this(bean, method, null);
+	}
+
+
+	/**
+	 * Variant of {@link #HandlerMethod(Object, Method)} that
+	 * also accepts a {@link MessageSource}.
+	 */
+	public HandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
 		Assert.notNull(bean, "Bean is required");
 		Assert.notNull(method, "Method is required");
 		this.bean = bean;
 		this.beanFactory = null;
-		this.messageSource = null;
+		this.messageSource = messageSource;
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
index b9c9a69c9553..68d7b94d54d1 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -20,6 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
+import org.springframework.context.MessageSource;
 import org.springframework.core.CoroutinesUtils;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.KotlinDetector;
@@ -71,6 +72,14 @@ public InvocableHandlerMethod(Object bean, Method method) {
 		super(bean, method);
 	}
 
+	/**
+	 * Variant of {@link #InvocableHandlerMethod(Object, Method)} that
+	 * also accepts a {@link MessageSource}.
+	 */
+	public InvocableHandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
+		super(bean, method, messageSource);
+	}
+
 	/**
 	 * Construct a new handler method with the given bean instance, method name and parameters.
 	 * @param bean the object bean
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
index bdb29fc15a2b..7be174e7a68b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
@@ -483,7 +483,7 @@ protected ServletInvocableHandlerMethod getExceptionHandlerMethod(
 			}
 			Method method = resolver.resolveMethod(exception);
 			if (method != null) {
-				return new ServletInvocableHandlerMethod(handlerMethod.getBean(), method);
+				return new ServletInvocableHandlerMethod(handlerMethod.getBean(), method, this.applicationContext);
 			}
 			// For advice applicability check below (involving base packages, assignable types
 			// and annotation presence), use target class instead of interface-based proxy.
@@ -498,7 +498,7 @@ protected ServletInvocableHandlerMethod getExceptionHandlerMethod(
 				ExceptionHandlerMethodResolver resolver = entry.getValue();
 				Method method = resolver.resolveMethod(exception);
 				if (method != null) {
-					return new ServletInvocableHandlerMethod(advice.resolveBean(), method);
+					return new ServletInvocableHandlerMethod(advice.resolveBean(), method, this.applicationContext);
 				}
 			}
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 8cbdb10549db..88343c3dbfca 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.context.MessageSource;
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
@@ -68,6 +69,13 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
 	@Nullable
 	private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
 
+	/**
+	 * Variant of {@link #ServletInvocableHandlerMethod(Object, Method)} that
+	 * also accepts a {@link MessageSource}.
+	 */
+	public ServletInvocableHandlerMethod(Object handler, Method method, @Nullable MessageSource messageSource) {
+		super(handler, method, messageSource);
+	}
 
 	/**
 	 * Creates an instance from the given handler and method.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
index b3757c556eb4..960935036266 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
@@ -19,7 +19,9 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.net.SocketTimeoutException;
 import java.util.Collections;
+import java.util.Locale;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,8 +32,11 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
@@ -42,6 +47,7 @@
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.context.support.WebApplicationObjectSupport;
 import org.springframework.web.method.HandlerMethod;
@@ -333,6 +339,28 @@ void resolveExceptionWithAssertionErrorAsRootCause() throws Exception {
 		assertThat(this.response.getContentAsString()).isEqualTo(rootCause.toString());
 	}
 
+	@Test //gh-27156
+	void resolveExceptionWithReasonResovledByMessageSource() throws Exception {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class);
+		StaticApplicationContext context = new StaticApplicationContext(ctx);
+		Locale locale = Locale.ENGLISH;
+		context.addMessage("gateway.timeout", locale, "Gateway Timeout");
+		context.refresh();
+		LocaleContextHolder.setLocale(locale);
+		this.resolver.setApplicationContext(context);
+		this.resolver.afterPropertiesSet();
+
+		SocketTimeoutException ex = new SocketTimeoutException();
+		HandlerMethod handlerMethod = new HandlerMethod(new ResponseBodyController(), "handle");
+		ModelAndView mav = this.resolver.resolveException(this.request, this.response, handlerMethod, ex);
+
+		assertThat(mav).as("Exception was not handled").isNotNull();
+		assertThat(mav.isEmpty()).isTrue();
+		assertThat(this.response.getStatus()).isEqualTo(HttpStatus.GATEWAY_TIMEOUT.value());
+		assertThat(this.response.getErrorMessage()).isEqualTo("Gateway Timeout");
+		assertThat(this.response.getContentAsString()).isEqualTo("");
+	}
+
 	@Test
 	void resolveExceptionControllerAdviceHandler() throws Exception {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyControllerAdviceConfig.class);
@@ -530,6 +558,16 @@ public String handleException(Exception ex) {
 		}
 	}
 
+	@RestControllerAdvice
+	@Order(3)
+	static class ResponseStatusTestExceptionResolver {
+
+		@ExceptionHandler(SocketTimeoutException.class)
+		@ResponseStatus(code = HttpStatus.GATEWAY_TIMEOUT, reason = "gateway.timeout")
+		public void handleException(SocketTimeoutException ex) {
+
+		}
+	}
 
 	@Configuration
 	static class MyConfig {
@@ -543,6 +581,11 @@ public TestExceptionResolver testExceptionResolver() {
 		public AnotherTestExceptionResolver anotherTestExceptionResolver() {
 			return new AnotherTestExceptionResolver();
 		}
+
+		@Bean
+		public ResponseStatusTestExceptionResolver responseStatusTestExceptionResolver() {
+			return new ResponseStatusTestExceptionResolver();
+		}
 	}
 
 

From 55e17ef30636b58052b8a53322394ec9d91df22e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 28 Jul 2021 14:44:48 +0100
Subject: [PATCH 022/140] Polishing contribution

Closes gh-27203
---
 .../web/method/HandlerMethod.java             |  6 +++---
 .../support/InvocableHandlerMethod.java       |  7 ++++---
 .../ServletInvocableHandlerMethod.java        | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index 90e93fd36427..35bf35ac01c5 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -105,12 +105,12 @@ public HandlerMethod(Object bean, Method method) {
 		this(bean, method, null);
 	}
 
-
 	/**
 	 * Variant of {@link #HandlerMethod(Object, Method)} that
-	 * also accepts a {@link MessageSource}.
+	 * also accepts a {@link MessageSource} for use from sub-classes.
+	 * @since 5.3.10
 	 */
-	public HandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
+	protected HandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
 		Assert.notNull(bean, "Bean is required");
 		Assert.notNull(method, "Method is required");
 		this.bean = bean;
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
index 68d7b94d54d1..80f98393f3a3 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,9 +74,10 @@ public InvocableHandlerMethod(Object bean, Method method) {
 
 	/**
 	 * Variant of {@link #InvocableHandlerMethod(Object, Method)} that
-	 * also accepts a {@link MessageSource}.
+	 * also accepts a {@link MessageSource}, for use in sub-classes.
+	 * @since 5.3.10
 	 */
-	public InvocableHandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
+	protected InvocableHandlerMethod(Object bean, Method method, @Nullable MessageSource messageSource) {
 		super(bean, method, messageSource);
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 88343c3dbfca..8b2ba44f3ecb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,13 +69,6 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
 	@Nullable
 	private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
 
-	/**
-	 * Variant of {@link #ServletInvocableHandlerMethod(Object, Method)} that
-	 * also accepts a {@link MessageSource}.
-	 */
-	public ServletInvocableHandlerMethod(Object handler, Method method, @Nullable MessageSource messageSource) {
-		super(handler, method, messageSource);
-	}
 
 	/**
 	 * Creates an instance from the given handler and method.
@@ -84,6 +77,16 @@ public ServletInvocableHandlerMethod(Object handler, Method method) {
 		super(handler, method);
 	}
 
+	/**
+	 * Variant of {@link #ServletInvocableHandlerMethod(Object, Method)} that
+	 * also accepts a {@link MessageSource}, e.g. to resolve
+	 * {@code @ResponseStatus} messages with.
+	 * @since 5.3.10
+	 */
+	public ServletInvocableHandlerMethod(Object handler, Method method, @Nullable MessageSource messageSource) {
+		super(handler, method, messageSource);
+	}
+
 	/**
 	 * Create an instance from a {@code HandlerMethod}.
 	 */

From e4b9b1fadb35c4e439acc8931910aaba6e1342e3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 29 Jul 2021 15:38:51 +0200
Subject: [PATCH 023/140] Introduce setDefaultCharacterEncoding() in
 MockHttpServletResponse

Prior to this commit, it was possible to set the character encoding
in MockHttpServletResponse via setCharacterEncoding() or
setContentType(); however, those methods append "charset=..." to the
Content-Type header which may not be an acceptable side effect.

This commit addresses this shortcoming by introducing a new
setDefaultCharacterEncoding() in MockHttpServletResponse which allows
one to override the previously hard coded value of "ISO-8859-1". In
addition, setDefaultCharacterEncoding() does not modify the Content-Type
header.

The reset() method has also been updated to reset the character encoding
to the configured default character encoding.

Closes gh-27214
---
 .../mock/web/MockHttpServletResponse.java     | 36 +++++++++++++++----
 .../web/MockHttpServletResponseTests.java     | 30 ++++++++++++++++
 .../servlet/MockHttpServletResponse.java      | 36 +++++++++++++++----
 3 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
index 52a7ab354f7e..a1b3eca3b08d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -80,7 +80,9 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	private boolean writerAccessAllowed = true;
 
-	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+	private String defaultCharacterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+
+	private String characterEncoding = this.defaultCharacterEncoding;
 
 	/**
 	 * {@code true} if the character encoding has been explicitly set through
@@ -166,12 +168,33 @@ public boolean isWriterAccessAllowed() {
 		return this.writerAccessAllowed;
 	}
 
+	/**
+	 * Set the <em>default</em> character encoding for the response.
+	 * <p>If this method is not invoked, {@code ISO-8859-1} will be used as the
+	 * default character encoding.
+	 * <p>If the {@linkplain #getCharacterEncoding() character encoding} for the
+	 * response has not already been explicitly set via {@link #setCharacterEncoding(String)}
+	 * or {@link #setContentType(String)}, the character encoding for the response
+	 * will be set to the supplied default character encoding.
+	 * @param characterEncoding the default character encoding
+	 * @since 5.3.10
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
+	 */
+	public void setDefaultCharacterEncoding(String characterEncoding) {
+		Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
+		this.defaultCharacterEncoding = characterEncoding;
+		if (!this.characterEncodingSet) {
+			this.characterEncoding = characterEncoding;
+		}
+	}
+
 	/**
 	 * Determine whether the character encoding has been explicitly set through
 	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
 	 * on the {@code Content-Type}.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the default
-	 * character encoding.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the
+	 * {@linkplain #setDefaultCharacterEncoding(String) default character encoding}.
 	 */
 	public boolean isCharset() {
 		return this.characterEncodingSet;
@@ -229,8 +252,9 @@ public byte[] getContentAsByteArray() {
 	 * Get the content of the response body as a {@code String}, using the charset
 	 * specified for the response by the application, either through
 	 * {@link HttpServletResponse} methods or through a charset parameter on the
-	 * {@code Content-Type}. If no charset has been explicitly defined, the default
-	 * character encoding will be used.
+	 * {@code Content-Type}. If no charset has been explicitly defined, the
+	 * {@linkplain #setDefaultCharacterEncoding(String) default character encoding}
+	 * will be used.
 	 * @return the content as a {@code String}
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @see #getContentAsString(Charset)
@@ -346,7 +370,7 @@ public boolean isCommitted() {
 	@Override
 	public void reset() {
 		resetBuffer();
-		this.characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+		this.characterEncoding = this.defaultCharacterEncoding;
 		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
index e8ac11b36b3e..fe0f90f7b500 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
@@ -195,6 +195,36 @@ void setCharacterEncodingThenContentType() {
 		assertThat(response.getCharacterEncoding()).isEqualTo("UTF-8");
 	}
 
+	@Test
+	void defaultCharacterEncoding() {
+		assertThat(response.isCharset()).isFalse();
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("ISO-8859-1");
+
+		response.setDefaultCharacterEncoding("UTF-8");
+		assertThat(response.isCharset()).isFalse();
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("UTF-8");
+
+		response.setContentType("text/plain;charset=UTF-16");
+		assertThat(response.isCharset()).isTrue();
+		assertThat(response.getContentType()).isEqualTo("text/plain;charset=UTF-16");
+		assertThat(response.getCharacterEncoding()).isEqualTo("UTF-16");
+
+		response.reset();
+		assertThat(response.isCharset()).isFalse();
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("UTF-8");
+
+		response.setCharacterEncoding("FOXTROT");
+		assertThat(response.isCharset()).isTrue();
+		assertThat(response.getContentType()).isNull();
+		assertThat(response.getCharacterEncoding()).isEqualTo("FOXTROT");
+
+		response.setDefaultCharacterEncoding("ENIGMA");
+		assertThat(response.getCharacterEncoding()).isEqualTo("FOXTROT");
+	}
+
 	@Test
 	void contentLength() {
 		response.setContentLength(66);
diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
index 7418a2871609..4a343c8344c7 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
@@ -80,7 +80,9 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	private boolean writerAccessAllowed = true;
 
-	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+	private String defaultCharacterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+
+	private String characterEncoding = this.defaultCharacterEncoding;
 
 	/**
 	 * {@code true} if the character encoding has been explicitly set through
@@ -166,12 +168,33 @@ public boolean isWriterAccessAllowed() {
 		return this.writerAccessAllowed;
 	}
 
+	/**
+	 * Set the <em>default</em> character encoding for the response.
+	 * <p>If this method is not invoked, {@code ISO-8859-1} will be used as the
+	 * default character encoding.
+	 * <p>If the {@linkplain #getCharacterEncoding() character encoding} for the
+	 * response has not already been explicitly set via {@link #setCharacterEncoding(String)}
+	 * or {@link #setContentType(String)}, the character encoding for the response
+	 * will be set to the supplied default character encoding.
+	 * @param characterEncoding the default character encoding
+	 * @since 5.3.10
+	 * @see #setCharacterEncoding(String)
+	 * @see #setContentType(String)
+	 */
+	public void setDefaultCharacterEncoding(String characterEncoding) {
+		Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
+		this.defaultCharacterEncoding = characterEncoding;
+		if (!this.characterEncodingSet) {
+			this.characterEncoding = characterEncoding;
+		}
+	}
+
 	/**
 	 * Determine whether the character encoding has been explicitly set through
 	 * {@link HttpServletResponse} methods or through a {@code charset} parameter
 	 * on the {@code Content-Type}.
-	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the default
-	 * character encoding.
+	 * <p>If {@code false}, {@link #getCharacterEncoding()} will return the
+	 * {@linkplain #setDefaultCharacterEncoding(String) default character encoding}.
 	 */
 	public boolean isCharset() {
 		return this.characterEncodingSet;
@@ -229,8 +252,9 @@ public byte[] getContentAsByteArray() {
 	 * Get the content of the response body as a {@code String}, using the charset
 	 * specified for the response by the application, either through
 	 * {@link HttpServletResponse} methods or through a charset parameter on the
-	 * {@code Content-Type}. If no charset has been explicitly defined, the default
-	 * character encoding will be used.
+	 * {@code Content-Type}. If no charset has been explicitly defined, the
+	 * {@linkplain #setDefaultCharacterEncoding(String) default character encoding}
+	 * will be used.
 	 * @return the content as a {@code String}
 	 * @throws UnsupportedEncodingException if the character encoding is not supported
 	 * @see #getContentAsString(Charset)
@@ -346,7 +370,7 @@ public boolean isCommitted() {
 	@Override
 	public void reset() {
 		resetBuffer();
-		this.characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
+		this.characterEncoding = this.defaultCharacterEncoding;
 		this.characterEncodingSet = false;
 		this.contentLength = 0;
 		this.contentType = null;

From 881fa889fcdb1870e12beb7010408a316b30dc62 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 29 Jul 2021 19:18:18 +0200
Subject: [PATCH 024/140] Apply global ResultHandlers before ResultMatchers in
 MockMvc

Prior to this commit, MockMvc applied global ResultMatchers before
global ResultHandlers. This lead to unexpected scenarios where a
failing matcher would prevent a handler from being applied.

One concrete use case is `alwaysDo(print(System.err))` which should
print out MockMvc results for debugging purposes. However, if MockMvc is
configured with something like `alwaysExpect(content().string("?"))`
and the expectation fails, the user will never see the expected debug
output to help diagnose the problem.

This commit addresses this issue by applying global ResultHandlers
before ResultMatchers in MockMvc.

Closes gh-27225
---
 .../test/web/servlet/MockMvc.java             |  8 +-
 ...PrintingResultHandlerIntegrationTests.java | 95 +++++++++++++++++++
 2 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index a8565da45b90..39492cbd0a56 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -217,12 +217,12 @@ private MockHttpServletResponse unwrapResponseIfNecessary(ServletResponse servle
 	}
 
 	private void applyDefaultResultActions(MvcResult mvcResult) throws Exception {
-		for (ResultMatcher matcher : this.defaultResultMatchers) {
-			matcher.match(mvcResult);
-		}
 		for (ResultHandler handler : this.defaultResultHandlers) {
 			handler.handle(mvcResult);
 		}
+		for (ResultMatcher matcher : this.defaultResultMatchers) {
+			matcher.match(mvcResult);
+		}
 	}
 
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
new file mode 100644
index 000000000000..d2a66f5178ba
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.web.servlet.samples.standalone.resulthandlers;
+
+import java.io.StringWriter;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.web.servlet.result.PrintingResultHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
+
+/**
+ * Integration tests for {@link PrintingResultHandler}.
+ *
+ * @author Sam Brannen
+ * @author Rossen Stoyanchev
+ * @since 5.3.10
+ * @see PrintingResultHandlerSmokeTests
+ * @see org.springframework.test.web.servlet.result.PrintingResultHandlerTests
+ */
+class PrintingResultHandlerIntegrationTests {
+
+	@Test
+	void printMvcResultsToWriter() throws Exception {
+		StringWriter writer = new StringWriter();
+
+		standaloneSetup(new SimpleController())
+			.alwaysDo(print(writer))
+			.build()
+			.perform(get("/").content("Hello Request".getBytes()).characterEncoding("ISO-8859-1"))
+			.andExpect(content().string("Hello Response"));
+
+		assertThat(writer).asString()
+			.contains("Hello Request")
+			.contains("Hello Response")
+			.contains("Headers = [Set-Cookie:\"enigma=42\", Content-Type:\"text/plain;charset=ISO-8859-1\", Content-Length:\"14\"]");
+	}
+
+	@Test
+	void printMvcResultsToWriterWithFailingGlobalResultMatcher() throws Exception {
+		StringWriter writer = new StringWriter();
+
+		try {
+			standaloneSetup(new SimpleController())
+				.alwaysDo(print(writer))
+				.alwaysExpect(content().string("Boom!"))
+				.build()
+				.perform(get("/").content("Hello Request".getBytes()).characterEncoding("ISO-8859-1"));
+		}
+		catch (AssertionError error) {
+			assertThat(error).hasMessageContaining("Boom!");
+		}
+
+		assertThat(writer).asString()
+			.contains("Hello Request")
+			.contains("Hello Response")
+			.contains("Headers = [Set-Cookie:\"enigma=42\", Content-Type:\"text/plain;charset=ISO-8859-1\", Content-Length:\"14\"]");
+	}
+
+
+	@RestController
+	private static class SimpleController {
+
+		@GetMapping("/")
+		String hello(HttpServletResponse response) {
+			response.addCookie(new Cookie("enigma", "42"));
+			return "Hello Response";
+		}
+	}
+
+}

From 41fa199178d313bf0399873483d37bb5b298715f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 29 Jul 2021 19:43:54 +0200
Subject: [PATCH 025/140] Polish PrintingResultHandler

---
 .../test/web/servlet/result/PrintingResultHandler.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
index faaae9806db9..f0ea1c5b658d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -123,13 +123,10 @@ protected void printRequest(MockHttpServletRequest request) throws Exception {
 
 	protected final HttpHeaders getRequestHeaders(MockHttpServletRequest request) {
 		HttpHeaders headers = new HttpHeaders();
-		Enumeration<?> names = request.getHeaderNames();
+		Enumeration<String> names = request.getHeaderNames();
 		while (names.hasMoreElements()) {
-			String name = (String) names.nextElement();
-			Enumeration<String> values = request.getHeaders(name);
-			while (values.hasMoreElements()) {
-				headers.add(name, values.nextElement());
-			}
+			String name = names.nextElement();
+			headers.put(name, Collections.list(request.getHeaders(name)));
 		}
 		return headers;
 	}

From 0f421f9f86fc6a06d2b41fbe538ac6b97ed2470f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 30 Jul 2021 14:42:45 +0200
Subject: [PATCH 026/140] Support default character encoding for response in
 MockMvc

Commit e4b9b1fadb introduced support for setting the default character
encoding in MockHttpServletResponse.

This commit introduces support for configuring the default character
encoding in the underlying MockHttpServletResponse used in MockMvc.

Closes gh-27230
---
 .../test/web/servlet/MockMvc.java             | 16 ++++++++++++++
 .../web/servlet/MockMvcBuilderSupport.java    | 21 ++++++++++++++++++-
 .../servlet/setup/AbstractMockMvcBuilder.java | 21 +++++++++++++++++--
 .../setup/ConfigurableMockMvcBuilder.java     | 18 +++++++++++++++-
 .../samples/standalone/ResponseBodyTests.java | 16 +++++++-------
 5 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
index 39492cbd0a56..0c8a28c7fd69 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvc.java
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -78,6 +79,9 @@ public final class MockMvc {
 	@Nullable
 	private RequestBuilder defaultRequestBuilder;
 
+	@Nullable
+	private Charset defaultResponseCharacterEncoding;
+
 	private List<ResultMatcher> defaultResultMatchers = new ArrayList<>();
 
 	private List<ResultHandler> defaultResultHandlers = new ArrayList<>();
@@ -106,6 +110,14 @@ void setDefaultRequest(@Nullable RequestBuilder requestBuilder) {
 		this.defaultRequestBuilder = requestBuilder;
 	}
 
+	/**
+	 * The default character encoding to be applied to every response.
+	 * @see org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder#defaultResponseCharacterEncoding(Charset)
+	 */
+	void setDefaultResponseCharacterEncoding(@Nullable Charset defaultResponseCharacterEncoding) {
+		this.defaultResponseCharacterEncoding = defaultResponseCharacterEncoding;
+	}
+
 	/**
 	 * Expectations to assert after every performed request.
 	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#alwaysExpect(ResultMatcher)
@@ -169,6 +181,10 @@ public ResultActions perform(RequestBuilder requestBuilder) throws Exception {
 			servletResponse = mockResponse;
 		}
 
+		if (this.defaultResponseCharacterEncoding != null) {
+			mockResponse.setDefaultCharacterEncoding(this.defaultResponseCharacterEncoding.name());
+		}
+
 		if (requestBuilder instanceof SmartRequestBuilder) {
 			request = ((SmartRequestBuilder) requestBuilder).postProcessRequest(request);
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
index d08a96f3227d..d635b00b1bab 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet;
 
+import java.nio.charset.Charset;
 import java.util.List;
 
 import javax.servlet.Filter;
@@ -37,10 +38,28 @@
  * @author Rossen Stoyanchev
  * @author Rob Winch
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 3.2
  */
 public abstract class MockMvcBuilderSupport {
 
+	/**
+	 * Delegates to {@link #createMockMvc(Filter[], MockServletConfig, WebApplicationContext, RequestBuilder, List, List, List)}
+	 * for creation of the {@link MockMvc} instance and configures that instance
+	 * with the supplied {@code defaultResponseCharacterEncoding}.
+	 * @since 5.3.10
+	 */
+	protected final MockMvc createMockMvc(Filter[] filters, MockServletConfig servletConfig,
+			WebApplicationContext webAppContext, @Nullable RequestBuilder defaultRequestBuilder,
+			@Nullable Charset defaultResponseCharacterEncoding,
+			List<ResultMatcher> globalResultMatchers, List<ResultHandler> globalResultHandlers,
+			@Nullable List<DispatcherServletCustomizer> dispatcherServletCustomizers) {
+
+		MockMvc mockMvc = createMockMvc(filters, servletConfig, webAppContext, defaultRequestBuilder, globalResultMatchers, globalResultHandlers, dispatcherServletCustomizers);
+		mockMvc.setDefaultResponseCharacterEncoding(defaultResponseCharacterEncoding);
+		return mockMvc;
+	}
+
 	protected final MockMvc createMockMvc(Filter[] filters, MockServletConfig servletConfig,
 			WebApplicationContext webAppContext, @Nullable RequestBuilder defaultRequestBuilder,
 			List<ResultMatcher> globalResultMatchers, List<ResultHandler> globalResultHandlers,
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
index de05563d7043..e5ed43ce30aa 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet.setup;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,6 +49,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.0
  * @param <B> a self reference to the builder type
  */
@@ -59,6 +61,9 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
 	@Nullable
 	private RequestBuilder defaultRequestBuilder;
 
+	@Nullable
+	private Charset defaultResponseCharacterEncoding;
+
 	private final List<ResultMatcher> globalResultMatchers = new ArrayList<>();
 
 	private final List<ResultHandler> globalResultHandlers = new ArrayList<>();
@@ -95,6 +100,17 @@ public final <T extends B> T defaultRequest(RequestBuilder requestBuilder) {
 		return self();
 	}
 
+	/**
+	 * Define the default character encoding to be applied to every response.
+	 * @param defaultResponseCharacterEncoding the default response character encoding
+	 * @since 5.3.10
+	 */
+	@Override
+	public final <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
+		this.defaultResponseCharacterEncoding = defaultResponseCharacterEncoding;
+		return self();
+	}
+
 	@Override
 	public final <T extends B> T alwaysExpect(ResultMatcher resultMatcher) {
 		this.globalResultMatchers.add(resultMatcher);
@@ -157,7 +173,8 @@ public final MockMvc build() {
 		Filter[] filterArray = this.filters.toArray(new Filter[0]);
 
 		return super.createMockMvc(filterArray, mockServletConfig, wac, this.defaultRequestBuilder,
-				this.globalResultMatchers, this.globalResultHandlers, this.dispatcherServletCustomizers);
+				this.defaultResponseCharacterEncoding, this.globalResultMatchers, this.globalResultHandlers,
+				this.dispatcherServletCustomizers);
 	}
 
 	/**
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index a619ee7a5882..43ef6ca9547e 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet.setup;
 
+import java.nio.charset.Charset;
+
 import javax.servlet.Filter;
 
 import org.springframework.test.web.servlet.DispatcherServletCustomizer;
@@ -28,6 +30,7 @@
  * Defines common methods for building a {@code MockMvc}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 4.1
  * @param <B> a self reference to the builder type
  */
@@ -81,6 +84,18 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 	 */
 	<T extends B> T defaultRequest(RequestBuilder requestBuilder);
 
+	/**
+	 * Define the default character encoding to be applied to every response.
+	 * <p>The default implementation of this method ignores the supplied value.
+	 * Concrete implementations are therefore encouraged to override this method.
+	 * @param defaultResponseCharacterEncoding the default response character encoding
+	 * @since 5.3.10
+	 */
+	@SuppressWarnings("unchecked")
+	default <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
+		return (T) this;
+	}
+
 	/**
 	 * Define a global expectation that should <em>always</em> be applied to
 	 * every response. For example, status code 200 (OK), content type
@@ -110,6 +125,7 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 	 * A more advanced variant of {@link #dispatchOptions(boolean)} that allows
 	 * customizing any {@link org.springframework.web.servlet.DispatcherServlet}
 	 * property.
+	 * @since 5.3
 	 */
 	<T extends B> T addDispatcherServletCustomizer(DispatcherServletCustomizer customizer);
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
index 2799b24d191e..e6cbe17338e6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.test.web.servlet.samples.standalone;
 
-import javax.validation.constraints.NotNull;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
@@ -25,6 +23,8 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -42,11 +42,14 @@ class ResponseBodyTests {
 
 	@Test
 	void json() throws Exception {
-		standaloneSetup(new PersonController()).build()
-				.perform(get("/person/Lee").accept(MediaType.APPLICATION_JSON))
+		standaloneSetup(new PersonController()).defaultResponseCharacterEncoding(UTF_8).build()
+				// We use a name containing an umlaut to test UTF-8 encoding for the request and the response.
+				.perform(get("/person/Jürgen").characterEncoding(UTF_8.name()).accept(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
 				.andExpect(content().contentType("application/json"))
-				.andExpect(jsonPath("$.name").value("Lee"))
+				.andExpect(content().encoding(UTF_8.name()))
+				.andExpect(content().string(containsString("Jürgen")))
+				.andExpect(jsonPath("$.name").value("Jürgen"))
 				.andExpect(jsonPath("$.age").value(42))
 				.andExpect(jsonPath("$.age").value(42.0f))
 				.andExpect(jsonPath("$.age").value(equalTo(42)))
@@ -70,7 +73,6 @@ Person get(@PathVariable String name) {
 	@SuppressWarnings("unused")
 	private static class Person {
 
-		@NotNull
 		private final String name;
 
 		private int age;

From 4d115eef91bfb6518d42a5f6fc74d33fbc97bdfa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 30 Jul 2021 15:20:44 +0200
Subject: [PATCH 027/140] Polishing

---
 .../MockHttpServletRequestBuilderTests.java   | 123 +++++++++---------
 .../resultmatchers/ContentAssertionTests.java |  40 +++---
 2 files changed, 73 insertions(+), 90 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
index 47f51e1046f8..734e24c26fc4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 import javax.servlet.ServletContext;
 import javax.servlet.http.Cookie;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
@@ -58,28 +57,22 @@
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  */
-public class MockHttpServletRequestBuilderTests {
+class MockHttpServletRequestBuilderTests {
 
 	private final ServletContext servletContext = new MockServletContext();
 
-	private MockHttpServletRequestBuilder builder;
-
-
-	@BeforeEach
-	public void setUp() {
-		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo/bar");
-	}
+	private MockHttpServletRequestBuilder builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo/bar");
 
 
 	@Test
-	public void method() {
+	void method() {
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
 		assertThat(request.getMethod()).isEqualTo("GET");
 	}
 
 	@Test
-	public void uri() {
+	void uri() {
 		String uri = "https://java.sun.com:8080/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)";
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, uri);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -94,7 +87,7 @@ public void uri() {
 	}
 
 	@Test
-	public void requestUriWithEncoding() {
+	void requestUriWithEncoding() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -102,7 +95,7 @@ public void requestUriWithEncoding() {
 	}
 
 	@Test  // SPR-13435
-	public void requestUriWithDoubleSlashes() throws URISyntaxException {
+	void requestUriWithDoubleSlashes() throws URISyntaxException {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, new URI("/test//currentlyValid/0"));
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -110,13 +103,13 @@ public void requestUriWithDoubleSlashes() throws URISyntaxException {
 	}
 
 	@Test // gh-24556
-	public void requestUriWithoutScheme() {
+	void requestUriWithoutScheme() {
 		assertThatIllegalArgumentException().isThrownBy(() -> MockMvcRequestBuilders.get("localhost:8080/path"))
 				.withMessage("'url' should start with a path or be a complete HTTP URL: localhost:8080/path");
 	}
 
 	@Test
-	public void contextPathEmpty() {
+	void contextPathEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -126,7 +119,7 @@ public void contextPathEmpty() {
 	}
 
 	@Test
-	public void contextPathServletPathEmpty() {
+	void contextPathServletPathEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels/42");
 		this.builder.contextPath("/travel");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -137,7 +130,7 @@ public void contextPathServletPathEmpty() {
 	}
 
 	@Test
-	public void contextPathServletPath() {
+	void contextPathServletPath() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/main/hotels/42");
 		this.builder.contextPath("/travel");
 		this.builder.servletPath("/main");
@@ -150,7 +143,7 @@ public void contextPathServletPath() {
 	}
 
 	@Test
-	public void contextPathServletPathInfoEmpty() {
+	void contextPathServletPathInfoEmpty() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels/42");
 		this.builder.contextPath("/travel");
 		this.builder.servletPath("/hotels/42");
@@ -162,7 +155,7 @@ public void contextPathServletPathInfoEmpty() {
 	}
 
 	@Test
-	public void contextPathServletPathInfo() {
+	void contextPathServletPathInfo() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.servletPath("/index.html");
 		this.builder.pathInfo(null);
@@ -174,7 +167,7 @@ public void contextPathServletPathInfo() {
 	}
 
 	@Test // SPR-16453
-	public void pathInfoIsDecoded() {
+	void pathInfoIsDecoded() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/travel/hotels 42");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -182,7 +175,7 @@ public void pathInfoIsDecoded() {
 	}
 
 	@Test
-	public void contextPathServletPathInvalid() {
+	void contextPathServletPathInvalid() {
 		testContextPathServletPathInvalid("/Foo", "", "Request URI [/foo/bar] does not start with context path [/Foo]");
 		testContextPathServletPathInvalid("foo", "", "Context path must start with a '/'");
 		testContextPathServletPathInvalid("/foo/", "", "Context path must not end with a '/'");
@@ -204,7 +197,7 @@ private void testContextPathServletPathInvalid(String contextPath, String servle
 	}
 
 	@Test
-	public void requestUriAndFragment() {
+	void requestUriAndFragment() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/foo#bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -212,28 +205,28 @@ public void requestUriAndFragment() {
 	}
 
 	@Test
-	public void requestParameter() {
+	void requestParameter() {
 		this.builder.param("foo", "bar", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(parameterMap.get("foo")).containsExactly("bar", "baz");
 	}
 
 	@Test
-	public void requestParameterFromQuery() {
+	void requestParameterFromQuery() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo=bar&foo=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(parameterMap.get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void requestParameterFromQueryList() {
+	void requestParameterFromQueryList() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo[0]=bar&foo[1]=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -244,19 +237,19 @@ public void requestParameterFromQueryList() {
 	}
 
 	@Test
-	public void queryParameter() {
+	void queryParameter() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.queryParam("foo", "bar");
 		this.builder.queryParam("foo", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void queryParameterMap() {
+	void queryParameterMap() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
 		List<String> values = new ArrayList<>();
@@ -267,12 +260,12 @@ public void queryParameterMap() {
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 		assertThat(request.getQueryString()).isEqualTo("foo=bar&foo=baz");
 	}
 
 	@Test
-	public void queryParameterList() {
+	void queryParameterList() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/");
 		this.builder.queryParam("foo[0]", "bar");
 		this.builder.queryParam("foo[1]", "baz");
@@ -285,7 +278,7 @@ public void queryParameterList() {
 	}
 
 	@Test
-	public void requestParameterFromQueryWithEncoding() {
+	void requestParameterFromQueryWithEncoding() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo={value}", "bar=baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -295,18 +288,18 @@ public void requestParameterFromQueryWithEncoding() {
 	}
 
 	@Test  // SPR-11043
-	public void requestParameterFromQueryNull() {
+	void requestParameterFromQueryNull() {
 		this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		Map<String, String[]> parameterMap = request.getParameterMap();
 
-		assertThat(parameterMap.get("foo")).isEqualTo(new String[] {null});
+		assertThat(parameterMap.get("foo")).containsExactly((String) null);
 		assertThat(request.getQueryString()).isEqualTo("foo");
 	}
 
 	@Test  // SPR-13801
-	public void requestParameterFromMultiValueMap() throws Exception {
+	void requestParameterFromMultiValueMap() throws Exception {
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 		params.add("foo", "bar");
 		params.add("foo", "baz");
@@ -315,11 +308,11 @@ public void requestParameterFromMultiValueMap() throws Exception {
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("foo")).isEqualTo(new String[] {"bar", "baz"});
+		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 	}
 
 	@Test
-	public void requestParameterFromRequestBodyFormData() throws Exception {
+	void requestParameterFromRequestBodyFormData() throws Exception {
 		String contentType = "application/x-www-form-urlencoded;charset=UTF-8";
 		String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3";
 
@@ -327,13 +320,13 @@ public void requestParameterFromRequestBodyFormData() throws Exception {
 				.contentType(contentType).content(body.getBytes(StandardCharsets.UTF_8))
 				.buildRequest(this.servletContext);
 
-		assertThat(request.getParameterMap().get("name 1")).isEqualTo(new String[] {"value 1"});
-		assertThat(request.getParameterMap().get("name 2")).isEqualTo(new String[] {"value A", "value B"});
-		assertThat(request.getParameterMap().get("name 3")).isEqualTo(new String[] {null});
+		assertThat(request.getParameterMap().get("name 1")).containsExactly("value 1");
+		assertThat(request.getParameterMap().get("name 2")).containsExactly("value A", "value B");
+		assertThat(request.getParameterMap().get("name 3")).containsExactly((String) null);
 	}
 
 	@Test
-	public void acceptHeader() {
+	void acceptHeader() {
 		this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML);
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -346,14 +339,14 @@ public void acceptHeader() {
 	}
 
 	@Test // gh-2079
-	public void acceptHeaderWithInvalidValues() {
+	void acceptHeaderWithInvalidValues() {
 		this.builder.accept("any", "any2");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getHeader("Accept")).isEqualTo("any, any2");
 	}
 
 	@Test
-	public void contentType() {
+	void contentType() {
 		this.builder.contentType(MediaType.TEXT_HTML);
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -366,7 +359,7 @@ public void contentType() {
 	}
 
 	@Test
-	public void contentTypeViaString() {
+	void contentTypeViaString() {
 		this.builder.contentType("text/html");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -379,14 +372,14 @@ public void contentTypeViaString() {
 	}
 
 	@Test // gh-2079
-	public void contentTypeWithInvalidValue() {
+	void contentTypeWithInvalidValue() {
 		this.builder.contentType("any");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getContentType()).isEqualTo("any");
 	}
 
 	@Test  // SPR-11308
-	public void contentTypeViaHeader() {
+	void contentTypeViaHeader() {
 		this.builder.header("Content-Type", MediaType.TEXT_HTML_VALUE);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		String contentType = request.getContentType();
@@ -395,14 +388,14 @@ public void contentTypeViaHeader() {
 	}
 
 	@Test // gh-2079
-	public void contentTypeViaHeaderWithInvalidValue() {
+	void contentTypeViaHeaderWithInvalidValue() {
 		this.builder.header("Content-Type", "yaml");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getContentType()).isEqualTo("yaml");
 	}
 
 	@Test  // SPR-11308
-	public void contentTypeViaMultipleHeaderValues() {
+	void contentTypeViaMultipleHeaderValues() {
 		this.builder.header("Content-Type", MediaType.TEXT_HTML_VALUE, MediaType.ALL_VALUE);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -410,7 +403,7 @@ public void contentTypeViaMultipleHeaderValues() {
 	}
 
 	@Test
-	public void body() throws IOException {
+	void body() throws IOException {
 		byte[] body = "Hello World".getBytes("UTF-8");
 		this.builder.content(body);
 
@@ -422,7 +415,7 @@ public void body() throws IOException {
 	}
 
 	@Test
-	public void header() {
+	void header() {
 		this.builder.header("foo", "bar", "baz");
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -434,7 +427,7 @@ public void header() {
 	}
 
 	@Test
-	public void headers() {
+	void headers() {
 		HttpHeaders httpHeaders = new HttpHeaders();
 		httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 		httpHeaders.put("foo", Arrays.asList("bar", "baz"));
@@ -450,7 +443,7 @@ public void headers() {
 	}
 
 	@Test
-	public void cookie() {
+	void cookie() {
 		Cookie cookie1 = new Cookie("foo", "bar");
 		Cookie cookie2 = new Cookie("baz", "qux");
 		this.builder.cookie(cookie1, cookie2);
@@ -466,13 +459,13 @@ public void cookie() {
 	}
 
 	@Test
-	public void noCookies() {
+	void noCookies() {
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		assertThat(request.getCookies()).isNull();
 	}
 
 	@Test
-	public void locale() {
+	void locale() {
 		Locale locale = new Locale("nl", "nl");
 		this.builder.locale(locale);
 
@@ -482,7 +475,7 @@ public void locale() {
 	}
 
 	@Test
-	public void characterEncoding() {
+	void characterEncoding() {
 		String encoding = "UTF-8";
 		this.builder.characterEncoding(encoding);
 
@@ -492,7 +485,7 @@ public void characterEncoding() {
 	}
 
 	@Test
-	public void requestAttribute() {
+	void requestAttribute() {
 		this.builder.requestAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -500,7 +493,7 @@ public void requestAttribute() {
 	}
 
 	@Test
-	public void sessionAttribute() {
+	void sessionAttribute() {
 		this.builder.sessionAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -508,7 +501,7 @@ public void sessionAttribute() {
 	}
 
 	@Test
-	public void sessionAttributes() {
+	void sessionAttributes() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("foo", "bar");
 		this.builder.sessionAttrs(map);
@@ -519,7 +512,7 @@ public void sessionAttributes() {
 	}
 
 	@Test
-	public void session() {
+	void session() {
 		MockHttpSession session = new MockHttpSession(this.servletContext);
 		session.setAttribute("foo", "bar");
 		this.builder.session(session);
@@ -533,7 +526,7 @@ public void session() {
 	}
 
 	@Test
-	public void flashAttribute() {
+	void flashAttribute() {
 		this.builder.flashAttr("foo", "bar");
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 
@@ -543,7 +536,7 @@ public void flashAttribute() {
 	}
 
 	@Test
-	public void principal() {
+	void principal() {
 		User user = new User();
 		this.builder.principal(user);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
@@ -552,7 +545,7 @@ public void principal() {
 	}
 
 	@Test  // SPR-12945
-	public void mergeInvokesDefaultRequestPostProcessorFirst() {
+	void mergeInvokesDefaultRequestPostProcessorFirst() {
 		final String ATTR = "ATTR";
 		final String EXPECTED = "override";
 
@@ -570,7 +563,7 @@ public void mergeInvokesDefaultRequestPostProcessorFirst() {
 	}
 
 	@Test  // SPR-13719
-	public void arbitraryMethod() {
+	void arbitraryMethod() {
 		String httpMethod = "REPort";
 		URI url = UriComponentsBuilder.fromPath("/foo/{bar}").buildAndExpand(42).toUri();
 		this.builder = new MockHttpServletRequestBuilder(httpMethod, url);
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
index 65d0ede06ca9..3b2c8347fa5d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,12 @@
 
 package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -37,6 +35,7 @@
  * the character encoding.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  *
  * @see JsonPathAssertionTests
  * @see XmlContentAssertionTests
@@ -44,15 +43,11 @@
  */
 public class ContentAssertionTests {
 
-	private MockMvc mockMvc;
+	private final MockMvc mockMvc = standaloneSetup(new SimpleController()).alwaysExpect(status().isOk()).build();
 
-	@BeforeEach
-	public void setup() {
-		this.mockMvc = standaloneSetup(new SimpleController()).alwaysExpect(status().isOk()).build();
-	}
 
 	@Test
-	public void testContentType() throws Exception {
+	void contentType() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().contentType(MediaType.valueOf("text/plain;charset=ISO-8859-1")))
 			.andExpect(content().contentType("text/plain;charset=ISO-8859-1"))
@@ -67,8 +62,7 @@ public void testContentType() throws Exception {
 	}
 
 	@Test
-	public void testContentAsString() throws Exception {
-
+	void contentAsString() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().string("Hello world!"));
 
@@ -81,8 +75,7 @@ public void testContentAsString() throws Exception {
 	}
 
 	@Test
-	public void testContentAsBytes() throws Exception {
-
+	void contentAsBytes() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().bytes("Hello world!".getBytes("ISO-8859-1")));
 
@@ -91,14 +84,13 @@ public void testContentAsBytes() throws Exception {
 	}
 
 	@Test
-	public void testContentStringMatcher() throws Exception {
+	void contentStringMatcher() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().string(containsString("world")));
 	}
 
 	@Test
-	public void testCharacterEncoding() throws Exception {
-
+	void characterEncoding() throws Exception {
 		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
 			.andExpect(content().encoding("ISO-8859-1"))
 			.andExpect(content().string(containsString("world")));
@@ -109,18 +101,16 @@ public void testCharacterEncoding() throws Exception {
 	}
 
 
-	@Controller
+	@RestController
 	private static class SimpleController {
 
-		@RequestMapping(value="/handle", produces="text/plain")
-		@ResponseBody
-		public String handle() {
+		@GetMapping(path="/handle", produces="text/plain")
+		String handle() {
 			return "Hello world!";
 		}
 
-		@RequestMapping(value="/handleUtf8", produces="text/plain;charset=UTF-8")
-		@ResponseBody
-		public String handleWithCharset() {
+		@GetMapping(path="/handleUtf8", produces="text/plain;charset=UTF-8")
+		String handleWithCharset() {
 			return "\u3053\u3093\u306b\u3061\u306f\u4e16\u754c\uff01";	// "Hello world! (Japanese)
 		}
 	}

From bd1f5bd9fcd04874fec2c791add3616e9a69b9ce Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 30 Jul 2021 15:24:47 +0200
Subject: [PATCH 028/140] Support Charset for character encoding in MockMvc

To improve the developer experience and avoid the use of String
literals, this commit provides overloaded support via Charset for
character encoding in MockHttpServletRequestBuilder and
ContentResultMatchers.

Closes gh-27231
---
 .../request/MockHttpServletRequestBuilder.java     | 14 +++++++++++++-
 .../web/servlet/result/ContentResultMatchers.java  | 14 +++++++++++++-
 .../MockHttpServletRequestBuilderTests.java        |  7 +++++--
 .../samples/standalone/ResponseBodyTests.java      |  4 ++--
 .../resultmatchers/ContentAssertionTests.java      | 10 ++++++++++
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index 7a73e731f5e0..c4ec1cd91733 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -243,6 +244,17 @@ public MockHttpServletRequestBuilder secure(boolean secure){
 		return this;
 	}
 
+	/**
+	 * Set the character encoding of the request.
+	 * @param encoding the character encoding
+	 * @since 5.3.10
+	 * @see StandardCharsets
+	 * @see #characterEncoding(String)
+	 */
+	public MockHttpServletRequestBuilder characterEncoding(Charset encoding) {
+		return this.characterEncoding(encoding.name());
+	}
+
 	/**
 	 * Set the character encoding of the request.
 	 * @param encoding the character encoding
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index 87232ae45bc6..f2d9360107f1 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet.result;
 
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
@@ -43,6 +44,7 @@
  * {@link MockMvcResultMatchers#content}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  * @since 3.2
  */
 public class ContentResultMatchers {
@@ -107,6 +109,16 @@ public ResultMatcher contentTypeCompatibleWith(MediaType contentType) {
 		};
 	}
 
+	/**
+	 * Assert the character encoding in the ServletResponse.
+	 * @since 5.3.10
+	 * @see StandardCharsets
+	 * @see #encoding(String)
+	 */
+	public ResultMatcher encoding(Charset characterEncoding) {
+		return encoding(characterEncoding.name());
+	}
+
 	/**
 	 * Assert the character encoding in the ServletResponse.
 	 * @see HttpServletResponse#getCharacterEncoding()
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
index 734e24c26fc4..b493cbbca4d0 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
@@ -477,11 +477,14 @@ void locale() {
 	@Test
 	void characterEncoding() {
 		String encoding = "UTF-8";
-		this.builder.characterEncoding(encoding);
 
+		this.builder.characterEncoding(encoding);
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
-
 		assertThat(request.getCharacterEncoding()).isEqualTo(encoding);
+
+		this.builder.characterEncoding(StandardCharsets.ISO_8859_1);
+		request = this.builder.buildRequest(this.servletContext);
+		assertThat(request.getCharacterEncoding()).isEqualTo(StandardCharsets.ISO_8859_1.name());
 	}
 
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
index e6cbe17338e6..26b90936dfdc 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java
@@ -44,10 +44,10 @@ class ResponseBodyTests {
 	void json() throws Exception {
 		standaloneSetup(new PersonController()).defaultResponseCharacterEncoding(UTF_8).build()
 				// We use a name containing an umlaut to test UTF-8 encoding for the request and the response.
-				.perform(get("/person/Jürgen").characterEncoding(UTF_8.name()).accept(MediaType.APPLICATION_JSON))
+				.perform(get("/person/Jürgen").characterEncoding(UTF_8).accept(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
 				.andExpect(content().contentType("application/json"))
-				.andExpect(content().encoding(UTF_8.name()))
+				.andExpect(content().encoding(UTF_8))
 				.andExpect(content().string(containsString("Jürgen")))
 				.andExpect(jsonPath("$.name").value("Jürgen"))
 				.andExpect(jsonPath("$.age").value(42))
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
index 3b2c8347fa5d..2efc51e4afb5 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
@@ -95,9 +97,17 @@ void characterEncoding() throws Exception {
 			.andExpect(content().encoding("ISO-8859-1"))
 			.andExpect(content().string(containsString("world")));
 
+		this.mockMvc.perform(get("/handle").accept(MediaType.TEXT_PLAIN))
+			.andExpect(content().encoding(StandardCharsets.ISO_8859_1))
+			.andExpect(content().string(containsString("world")));
+
 		this.mockMvc.perform(get("/handleUtf8"))
 			.andExpect(content().encoding("UTF-8"))
 			.andExpect(content().bytes("\u3053\u3093\u306b\u3061\u306f\u4e16\u754c\uff01".getBytes("UTF-8")));
+
+		this.mockMvc.perform(get("/handleUtf8"))
+			.andExpect(content().encoding(StandardCharsets.UTF_8))
+			.andExpect(content().bytes("\u3053\u3093\u306b\u3061\u306f\u4e16\u754c\uff01".getBytes("UTF-8")));
 	}
 
 

From 01c8de0111806d8f9346f332b22ece9dd9fef618 Mon Sep 17 00:00:00 2001
From: Anton Lyxell <lyxell@users.noreply.github.com>
Date: Sat, 31 Jul 2021 16:27:43 +0200
Subject: [PATCH 029/140] Simplify getInternalBeanFactoryForBean

This commit simplifies getInternalBeanFactoryForBean() in
AbstractBeanFactoryBasedTargetSourceCreator via
Map::computeIfAbsent.

Closes gh-27234
---
 .../AbstractBeanFactoryBasedTargetSourceCreator.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
index 4fd173f2893e..c18899db28f4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -125,12 +125,7 @@ public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
 	 */
 	protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) {
 		synchronized (this.internalBeanFactories) {
-			DefaultListableBeanFactory internalBeanFactory = this.internalBeanFactories.get(beanName);
-			if (internalBeanFactory == null) {
-				internalBeanFactory = buildInternalBeanFactory(this.beanFactory);
-				this.internalBeanFactories.put(beanName, internalBeanFactory);
-			}
-			return internalBeanFactory;
+			return this.internalBeanFactories.computeIfAbsent(beanName, k -> buildInternalBeanFactory(this.beanFactory));
 		}
 	}
 

From ce94f69e525282b418f801e9d734070ad5cbfc45 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sat, 31 Jul 2021 16:30:39 +0200
Subject: [PATCH 030/140] Polish contribution

See gh-27234
---
 .../target/AbstractBeanFactoryBasedTargetSourceCreator.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
index c18899db28f4..fcef74b56ef4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,7 +125,8 @@ public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
 	 */
 	protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) {
 		synchronized (this.internalBeanFactories) {
-			return this.internalBeanFactories.computeIfAbsent(beanName, k -> buildInternalBeanFactory(this.beanFactory));
+			return this.internalBeanFactories.computeIfAbsent(beanName,
+					name -> buildInternalBeanFactory(this.beanFactory));
 		}
 	}
 

From 86ef0236e6581ca609091f3295e88f208e8f85d8 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Wed, 4 Aug 2021 14:12:40 +0900
Subject: [PATCH 031/140] Polish
 printMvcResultsToWriterWithFailingGlobalResultMatcher()

See gh-27238
---
 .../resulthandlers/PrintingResultHandlerIntegrationTests.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
index d2a66f5178ba..9d47134e0fb6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerIntegrationTests.java
@@ -28,6 +28,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -70,6 +71,7 @@ void printMvcResultsToWriterWithFailingGlobalResultMatcher() throws Exception {
 				.alwaysExpect(content().string("Boom!"))
 				.build()
 				.perform(get("/").content("Hello Request".getBytes()).characterEncoding("ISO-8859-1"));
+			fail("AssertionError is expected to be thrown.");
 		}
 		catch (AssertionError error) {
 			assertThat(error).hasMessageContaining("Boom!");

From e290ae285cfc8d8e48b0685ce580262bef1a2688 Mon Sep 17 00:00:00 2001
From: Alexej Timonin <alexejtimonin@gmail.com>
Date: Fri, 30 Jul 2021 21:32:36 +0200
Subject: [PATCH 032/140] Improve Javadoc for ClientRequest#from

See gh-27220
---
 .../function/client/ClientRequest.java        |  6 ++--
 .../DefaultClientRequestBuilderTests.java     | 35 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
index 9e7cc31ba6b4..dc28e2bf7538 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,8 +125,8 @@ default Optional<Object> attribute(String name) {
 	// Static builder methods
 
 	/**
-	 * Create a builder with the method, URI, headers, and cookies of the given request.
-	 * @param other the request to copy the method, URI, headers, and cookies from
+	 * Create a builder with the method, URI, headers, cookies, attributes, and body of the given request.
+	 * @param other the request to copy the method, URI, headers, cookies, attributes, and body from
 	 * @return the created builder
 	 */
 	static Builder from(ClientRequest other) {
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
index 47fdfdf430f8..0788264acf7f 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,8 @@ public void from() throws URISyntaxException {
 		ClientRequest other = ClientRequest.create(GET, URI.create("https://example.com"))
 				.header("foo", "bar")
 				.cookie("baz", "qux")
+				.attribute("attributeKey", "attributeValue")
+				.attribute("anotherAttributeKey", "anotherAttributeValue")
 				.httpRequest(request -> {})
 				.build();
 		ClientRequest result = ClientRequest.from(other)
@@ -69,6 +71,37 @@ public void from() throws URISyntaxException {
 		assertThat(result.cookies().size()).isEqualTo(1);
 		assertThat(result.cookies().getFirst("baz")).isEqualTo("quux");
 		assertThat(result.httpRequest()).isNotNull();
+		assertThat(result.attributes().get("attributeKey")).isEqualTo("attributeValue");
+		assertThat(result.attributes().get("anotherAttributeKey")).isEqualTo("anotherAttributeValue");
+	}
+
+	@Test
+	public void fromCopiesBody() {
+		String body = "foo";
+		BodyInserter<String, ClientHttpRequest> inserter = (response, strategies) -> {
+			byte[] bodyBytes = body.getBytes(UTF_8);
+			DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
+
+			return response.writeWith(Mono.just(buffer));
+		};
+
+		ClientRequest other = ClientRequest.create(POST, URI.create("https://example.com"))
+				.body(inserter).build();
+
+		ClientRequest result = ClientRequest.from(other).build();
+
+		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
+		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
+
+		ExchangeStrategies strategies = mock(ExchangeStrategies.class);
+		given(strategies.messageWriters()).willReturn(messageWriters);
+
+		MockClientHttpRequest request = new MockClientHttpRequest(POST, "/");
+		result.writeTo(request, strategies).block();
+
+		String copiedBody = request.getBodyAsString().block();
+
+		assertThat(copiedBody).isEqualTo("foo");
 	}
 
 	@Test

From ce6217be8536944201a1215679870a57c414381d Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 3 Aug 2021 10:31:13 +0100
Subject: [PATCH 033/140] Polishing contribution

Closes gh-27220
---
 .../function/client/ClientRequest.java        | 11 ++--
 .../DefaultClientRequestBuilderTests.java     | 59 ++++++++-----------
 2 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
index dc28e2bf7538..2b61dba1836a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
@@ -125,16 +125,17 @@ default Optional<Object> attribute(String name) {
 	// Static builder methods
 
 	/**
-	 * Create a builder with the method, URI, headers, cookies, attributes, and body of the given request.
-	 * @param other the request to copy the method, URI, headers, cookies, attributes, and body from
-	 * @return the created builder
+	 * Create a builder initialized with the HTTP method, url, headers, cookies,
+	 * attributes, and body of the given request.
+	 * @param other the request to copy from
+	 * @return the builder instance
 	 */
 	static Builder from(ClientRequest other) {
 		return new DefaultClientRequestBuilder(other);
 	}
 
 	/**
-	 * Create a builder with the given method and url.
+	 * Create a builder with the given HTTP method and url.
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param url the url (as a URI instance)
 	 * @return the created builder
@@ -146,7 +147,7 @@ static Builder method(HttpMethod method, URI url) {
 	}
 
 	/**
-	 * Create a request builder with the given method and url.
+	 * Create a request builder with the given HTTP method and url.
 	 * @param method the HTTP method (GET, POST, etc)
 	 * @param url the url (as a URI instance)
 	 * @return the created builder
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
index 0788264acf7f..5bff972bdd2e 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
@@ -51,20 +51,24 @@
  */
 public class DefaultClientRequestBuilderTests {
 
+	private static final URI DEFAULT_URL = URI.create("https://example.com");
+
 	@Test
-	public void from() throws URISyntaxException {
-		ClientRequest other = ClientRequest.create(GET, URI.create("https://example.com"))
+	public void from() {
+		ClientRequest other = ClientRequest.create(GET, DEFAULT_URL)
 				.header("foo", "bar")
 				.cookie("baz", "qux")
 				.attribute("attributeKey", "attributeValue")
 				.attribute("anotherAttributeKey", "anotherAttributeValue")
 				.httpRequest(request -> {})
 				.build();
+
 		ClientRequest result = ClientRequest.from(other)
 				.headers(httpHeaders -> httpHeaders.set("foo", "baar"))
 				.cookies(cookies -> cookies.set("baz", "quux"))
 				.build();
-		assertThat(result.url()).isEqualTo(new URI("https://example.com"));
+
+		assertThat(result.url()).isEqualTo(DEFAULT_URL);
 		assertThat(result.method()).isEqualTo(GET);
 		assertThat(result.headers().size()).isEqualTo(1);
 		assertThat(result.headers().getFirst("foo")).isEqualTo("baar");
@@ -81,13 +85,10 @@ public void fromCopiesBody() {
 		BodyInserter<String, ClientHttpRequest> inserter = (response, strategies) -> {
 			byte[] bodyBytes = body.getBytes(UTF_8);
 			DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
-
 			return response.writeWith(Mono.just(buffer));
 		};
 
-		ClientRequest other = ClientRequest.create(POST, URI.create("https://example.com"))
-				.body(inserter).build();
-
+		ClientRequest other = ClientRequest.create(POST, DEFAULT_URL).body(inserter).build();
 		ClientRequest result = ClientRequest.from(other).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
@@ -105,9 +106,8 @@ public void fromCopiesBody() {
 	}
 
 	@Test
-	public void method() throws URISyntaxException {
-		URI url = new URI("https://example.com");
-		ClientRequest.Builder builder = ClientRequest.create(DELETE, url);
+	public void method() {
+		ClientRequest.Builder builder = ClientRequest.create(DELETE, DEFAULT_URL);
 		assertThat(builder.build().method()).isEqualTo(DELETE);
 
 		builder.method(OPTIONS);
@@ -127,18 +127,17 @@ public void url() throws URISyntaxException {
 
 	@Test
 	public void cookie() {
-		ClientRequest result = ClientRequest.create(GET, URI.create("https://example.com"))
-				.cookie("foo", "bar").build();
+		ClientRequest result = ClientRequest.create(GET, DEFAULT_URL).cookie("foo", "bar").build();
 		assertThat(result.cookies().getFirst("foo")).isEqualTo("bar");
 	}
 
 	@Test
 	public void build() {
-		ClientRequest result = ClientRequest.create(GET, URI.create("https://example.com"))
+		ClientRequest result = ClientRequest.create(GET, DEFAULT_URL)
 				.header("MyKey", "MyValue")
 				.cookie("foo", "bar")
 				.httpRequest(request -> {
-					MockClientHttpRequest nativeRequest = (MockClientHttpRequest) request.getNativeRequest();
+					MockClientHttpRequest nativeRequest = request.getNativeRequest();
 					nativeRequest.getHeaders().add("MyKey2", "MyValue2");
 				})
 				.build();
@@ -158,16 +157,14 @@ public void build() {
 	@Test
 	public void bodyInserter() {
 		String body = "foo";
-		BodyInserter<String, ClientHttpRequest> inserter =
-				(response, strategies) -> {
-					byte[] bodyBytes = body.getBytes(UTF_8);
-					DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
+		BodyInserter<String, ClientHttpRequest> inserter = (response, strategies) -> {
+			byte[] bodyBytes = body.getBytes(UTF_8);
+			DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bodyBytes);
 
-					return response.writeWith(Mono.just(buffer));
-				};
+			return response.writeWith(Mono.just(buffer));
+		};
 
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
-				.body(inserter).build();
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(inserter).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -179,17 +176,14 @@ public void bodyInserter() {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
-				.expectNextCount(1)
-				.verifyComplete();
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
 	}
 
 	@Test
 	public void bodyClass() {
 		String body = "foo";
 		Publisher<String> publisher = Mono.just(body);
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
-				.body(publisher, String.class).build();
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(publisher, String.class).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -201,9 +195,7 @@ public void bodyClass() {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
-				.expectNextCount(1)
-				.verifyComplete();
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
 	}
 
 	@Test
@@ -211,8 +203,7 @@ public void bodyParameterizedTypeReference() {
 		String body = "foo";
 		Publisher<String> publisher = Mono.just(body);
 		ParameterizedTypeReference<String> typeReference = new ParameterizedTypeReference<String>() {};
-		ClientRequest result = ClientRequest.create(POST, URI.create("https://example.com"))
-				.body(publisher, typeReference).build();
+		ClientRequest result = ClientRequest.create(POST, DEFAULT_URL).body(publisher, typeReference).build();
 
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
 		messageWriters.add(new EncoderHttpMessageWriter<>(CharSequenceEncoder.allMimeTypes()));
@@ -224,9 +215,7 @@ public void bodyParameterizedTypeReference() {
 		result.writeTo(request, strategies).block();
 		assertThat(request.getBody()).isNotNull();
 
-		StepVerifier.create(request.getBody())
-				.expectNextCount(1)
-				.verifyComplete();
+		StepVerifier.create(request.getBody()).expectNextCount(1).verifyComplete();
 	}
 
 }

From eaf9deedfd06f2f324c05503f787b41f37c537c4 Mon Sep 17 00:00:00 2001
From: Syuziko <syuzanna.eprikyan@gmail.com>
Date: Sat, 7 Aug 2021 16:10:08 +0400
Subject: [PATCH 034/140] Polish tests

See gh-27248
---
 .../beans/AbstractPropertyAccessorTests.java  | 155 +++++----
 .../beans/BeanWrapperGenericsTests.java       | 130 +++----
 .../DefaultListableBeanFactoryTests.java      |  34 +-
 .../support/BeanFactoryGenericsTests.java     | 170 ++++-----
 .../ClassNameBeanWiringInfoResolverTests.java |  10 +-
 .../propertyeditors/CustomEditorTests.java    | 322 +++++++++---------
 .../aop/aspectj/ProceedTests.java             |   4 +-
 .../AnnotationDrivenEventListenerTests.java   |  76 ++---
 .../jmx/export/MBeanExporterTests.java        |   8 +-
 .../assembler/AbstractJmxAssemblerTests.java  |  22 +-
 .../ScriptFactoryPostProcessorTests.java      |  27 +-
 .../DataBinderFieldAccessTests.java           |  20 +-
 .../validation/DataBinderTests.java           | 204 +++++------
 .../util/ObjectUtilsTests.java                |  28 +-
 .../expression/spel/IndexingTests.java        |  52 +--
 .../expression/spel/OperatorTests.java        |  68 ++--
 .../spel/SpelCompilationCoverageTests.java    | 166 ++++-----
 .../expression/spel/SpelReproTests.java       | 220 ++++++------
 .../adapter/MessageListenerAdapterTests.java  |  55 ++-
 .../MappingJackson2MessageConverterTests.java |  41 +--
 .../web/bind/EscapedErrorsTests.java          |   2 +-
 .../web/bind/ServletRequestUtilsTests.java    |  24 +-
 .../web/cors/CorsConfigurationTests.java      |  48 +--
 .../method/annotation/CrossOriginTests.java   |   8 +-
 .../RedirectAttributesModelMapTests.java      |  24 +-
 .../web/servlet/tags/BindTagTests.java        |  78 ++---
 .../servlet/tags/form/CheckboxTagTests.java   |  58 ++--
 .../tags/form/HiddenInputTagTests.java        |  16 +-
 .../web/servlet/tags/form/InputTagTests.java  |   2 +-
 .../web/servlet/tags/form/OptionTagTests.java |  52 +--
 .../servlet/tags/form/OptionsTagTests.java    |  46 +--
 .../tags/form/RadioButtonTagTests.java        |  28 +-
 .../web/servlet/tags/form/SelectTagTests.java |   8 +-
 .../servlet/tags/form/SimpleFloatEditor.java  |   4 +-
 .../servlet/tags/form/TextareaTagTests.java   |   2 +-
 .../view/RedirectViewUriTemplateTests.java    |  24 +-
 36 files changed, 1115 insertions(+), 1121 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
index 0bb5febde05f..b0a3d012591d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -296,10 +296,10 @@ public void setNestedPropertyPolymorphic() throws Exception {
 		accessor.setPropertyValue("spouse.age", 35);
 		accessor.setPropertyValue("spouse.name", "Kerry");
 		accessor.setPropertyValue("spouse.company", "Lewisham");
-		assertThat(kerry.getName().equals("Kerry")).as("kerry name is Kerry").isTrue();
+		assertThat(kerry.getName()).as("kerry name is Kerry").isEqualTo("Kerry");
 
 		assertThat(target.getSpouse() == kerry).as("nested set worked").isTrue();
-		assertThat(kerry.getSpouse() == null).as("no back relation").isTrue();
+		assertThat(kerry.getSpouse()).as("no back relation").isNull();
 		accessor.setPropertyValue(new PropertyValue("spouse.spouse", target));
 		assertThat(kerry.getSpouse() == target).as("nested set worked").isTrue();
 
@@ -316,7 +316,7 @@ public void setAnotherNestedProperty() throws Exception {
 		accessor.setPropertyValue("spouse", kerry);
 
 		assertThat(target.getSpouse() == kerry).as("nested set worked").isTrue();
-		assertThat(kerry.getSpouse() == null).as("no back relation").isTrue();
+		assertThat(kerry.getSpouse()).as("no back relation").isNull();
 		accessor.setPropertyValue(new PropertyValue("spouse.spouse", target));
 		assertThat(kerry.getSpouse() == target).as("nested set worked").isTrue();
 		assertThat(kerry.getAge() == 0).as("kerry age not set").isTrue();
@@ -357,8 +357,7 @@ public void testErrorMessageOfNestedProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		try {
 			accessor.getPropertyValue("spouse.bla");
-		}
-		catch (NotReadablePropertyException ex) {
+		} catch (NotReadablePropertyException ex) {
 			assertThat(ex.getMessage().contains(TestBean.class.getName())).isTrue();
 		}
 	}
@@ -478,8 +477,8 @@ public void setIndividualValidPropertyValues() {
 		accessor.setPropertyValue("age", newAge);
 		accessor.setPropertyValue(new PropertyValue("name", newName));
 		accessor.setPropertyValue(new PropertyValue("touchy", newTouchy));
-		assertThat(target.getName().equals(newName)).as("Name property should have changed").isTrue();
-		assertThat(target.getTouchy().equals(newTouchy)).as("Touchy property should have changed").isTrue();
+		assertThat(target.getName()).as("Name property should have changed").isEqualTo(newName);
+		assertThat(target.getTouchy()).as("Touchy property should have changed").isEqualTo(newTouchy);
 		assertThat(target.getAge() == newAge).as("Age property should have changed").isTrue();
 	}
 
@@ -490,7 +489,7 @@ public void setPropertyIsReflectedImmediately() {
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		target.setAge(newAge);
 		Object bwAge = accessor.getPropertyValue("age");
-		assertThat(bwAge instanceof Integer).as("Age is an integer").isTrue();
+		assertThat(bwAge).as("Age is an integer").isInstanceOf(Integer.class);
 		assertThat(bwAge).as("Bean wrapper must pick up changes").isEqualTo(newAge);
 	}
 
@@ -500,13 +499,13 @@ public void setPropertyToNull() {
 		target.setName("Frank");    // we need to change it back
 		target.setSpouse(target);
 		AbstractPropertyAccessor accessor = createAccessor(target);
-		assertThat(target.getName() != null).as("name is not null to start off").isTrue();
+		assertThat(target.getName()).as("name is not null to start off").isNotNull();
 		accessor.setPropertyValue("name", null);
-		assertThat(target.getName() == null).as("name is now null").isTrue();
+		assertThat(target.getName()).as("name is now null").isNull();
 		// now test with non-string
-		assertThat(target.getSpouse() != null).as("spouse is not null to start off").isTrue();
+		assertThat(target.getSpouse()).as("spouse is not null to start off").isNotNull();
 		accessor.setPropertyValue("spouse", null);
-		assertThat(target.getSpouse() == null).as("spouse is now null").isTrue();
+		assertThat(target.getSpouse()).as("spouse is now null").isNull();
 	}
 
 	@Test
@@ -591,20 +590,20 @@ public void setNumberProperties() {
 		accessor.setPropertyValue("float2", "8.1");
 		accessor.setPropertyValue("double2", "6.1");
 		accessor.setPropertyValue("bigDecimal", "4.0");
-		assertThat(new Short("2").equals(accessor.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
-		assertThat(new Short("2").equals(target.getShort2())).as("Correct short2 value").isTrue();
-		assertThat(new Integer("8").equals(accessor.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
-		assertThat(new Integer("8").equals(target.getInt2())).as("Correct int2 value").isTrue();
-		assertThat(new Long("6").equals(accessor.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(new Long("6").equals(target.getLong2())).as("Correct long2 value").isTrue();
-		assertThat(new BigInteger("3").equals(accessor.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
-		assertThat(new BigInteger("3").equals(target.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(new Float("8.1").equals(accessor.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
-		assertThat(new Float("8.1").equals(target.getFloat2())).as("Correct float2 value").isTrue();
-		assertThat(new Double("6.1").equals(accessor.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
-		assertThat(new Double("6.1").equals(target.getDouble2())).as("Correct double2 value").isTrue();
-		assertThat(new BigDecimal("4.0").equals(accessor.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
-		assertThat(new BigDecimal("4.0").equals(target.getBigDecimal())).as("Correct bigDecimal value").isTrue();
+		assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(accessor.getPropertyValue("short2"));
+		assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(target.getShort2());
+		assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(accessor.getPropertyValue("int2"));
+		assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(target.getInt2());
+		assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(accessor.getPropertyValue("long2"));
+		assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(target.getLong2());
+		assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(accessor.getPropertyValue("bigInteger"));
+		assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(target.getBigInteger());
+		assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(accessor.getPropertyValue("float2"));
+		assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(target.getFloat2());
+		assertThat(Double.valueOf("6.1").equals(accessor.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
+		assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(target.getDouble2());
+		assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(accessor.getPropertyValue("bigDecimal"));
+		assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(target.getBigDecimal());
 	}
 
 	@Test
@@ -616,22 +615,22 @@ public void setNumberPropertiesWithCoercion() {
 		accessor.setPropertyValue("long2", new BigInteger("6"));
 		accessor.setPropertyValue("bigInteger", 3L);
 		accessor.setPropertyValue("float2", 8.1D);
-		accessor.setPropertyValue("double2", new BigDecimal(6.1));
+		accessor.setPropertyValue("double2", new BigDecimal("6.1"));
 		accessor.setPropertyValue("bigDecimal", 4.0F);
-		assertThat(new Short("2").equals(accessor.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
-		assertThat(new Short("2").equals(target.getShort2())).as("Correct short2 value").isTrue();
-		assertThat(new Integer("8").equals(accessor.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
-		assertThat(new Integer("8").equals(target.getInt2())).as("Correct int2 value").isTrue();
-		assertThat(new Long("6").equals(accessor.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(new Long("6").equals(target.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(accessor.getPropertyValue("short2"));
+		assertThat(Short.valueOf("2")).as("Correct short2 value").isEqualTo(target.getShort2());
+		assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(accessor.getPropertyValue("int2"));
+		assertThat(Integer.valueOf("8")).as("Correct int2 value").isEqualTo(target.getInt2());
+		assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(accessor.getPropertyValue("long2"));
+		assertThat(Long.valueOf("6")).as("Correct long2 value").isEqualTo(target.getLong2());
 		assertThat(new BigInteger("3").equals(accessor.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
-		assertThat(new BigInteger("3").equals(target.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(new Float("8.1").equals(accessor.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
-		assertThat(new Float("8.1").equals(target.getFloat2())).as("Correct float2 value").isTrue();
-		assertThat(new Double("6.1").equals(accessor.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
-		assertThat(new Double("6.1").equals(target.getDouble2())).as("Correct double2 value").isTrue();
-		assertThat(new BigDecimal("4.0").equals(accessor.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
-		assertThat(new BigDecimal("4.0").equals(target.getBigDecimal())).as("Correct bigDecimal value").isTrue();
+		assertThat(new BigInteger("3")).as("Correct bigInteger value").isEqualTo(target.getBigInteger());
+		assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(accessor.getPropertyValue("float2"));
+		assertThat(Float.valueOf("8.1")).as("Correct float2 value").isEqualTo(target.getFloat2());
+		assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(accessor.getPropertyValue("double2"));
+		assertThat(Double.valueOf("6.1")).as("Correct double2 value").isEqualTo(target.getDouble2());
+		assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(accessor.getPropertyValue("bigDecimal"));
+		assertThat(new BigDecimal("4.0")).as("Correct bigDecimal value").isEqualTo(target.getBigDecimal());
 	}
 
 	@Test
@@ -724,11 +723,11 @@ public void setPropertiesProperty() throws Exception {
 		String ps = "peace=war\nfreedom=slavery";
 		accessor.setPropertyValue("properties", ps);
 
-		assertThat(target.name.equals("ptest")).as("name was set").isTrue();
-		assertThat(target.properties != null).as("properties non null").isTrue();
+		assertThat(target.name).as("name was set").isEqualTo("ptest");
+		assertThat(target.properties).as("properties non null").isNotNull();
 		String freedomVal = target.properties.getProperty("freedom");
 		String peaceVal = target.properties.getProperty("peace");
-		assertThat(peaceVal.equals("war")).as("peace==war").isTrue();
+		assertThat(peaceVal).as("peace==war").isEqualTo("war");
 		assertThat(freedomVal.equals("slavery")).as("Freedom==slavery").isTrue();
 	}
 
@@ -737,7 +736,7 @@ public void setStringArrayProperty() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
-		accessor.setPropertyValue("stringArray", new String[] {"foo", "fi", "fi", "fum"});
+		accessor.setPropertyValue("stringArray", new String[]{"foo", "fi", "fi", "fum"});
 		assertThat(target.stringArray.length == 4).as("stringArray length = 4").isTrue();
 		assertThat(target.stringArray[0].equals("foo") && target.stringArray[1].equals("fi") &&
 		target.stringArray[2].equals("fi") && target.stringArray[3].equals("fum")).as("correct values").isTrue();
@@ -763,10 +762,10 @@ public void setStringArrayProperty() throws Exception {
 
 		accessor.setPropertyValue("stringArray", "one");
 		assertThat(target.stringArray.length == 1).as("stringArray length = 1").isTrue();
-		assertThat(target.stringArray[0].equals("one")).as("stringArray elt is ok").isTrue();
+		assertThat(target.stringArray[0]).as("stringArray elt is ok").isEqualTo("one");
 
 		accessor.setPropertyValue("stringArray", null);
-		assertThat(target.stringArray == null).as("stringArray is null").isTrue();
+		assertThat(target.stringArray).as("stringArray is null").isNull();
 	}
 
 	@Test
@@ -836,10 +835,10 @@ public void setStringArrayWithAutoGrow() throws Exception {
 		accessor.setAutoGrowNestedPaths(true);
 
 		accessor.setPropertyValue("array[0]", "Test0");
-		assertThat(target.getArray().length).isEqualTo(1);
+		assertThat(target.getArray()).hasSize(1);
 
 		accessor.setPropertyValue("array[2]", "Test2");
-		assertThat(target.getArray().length).isEqualTo(3);
+		assertThat(target.getArray()).hasSize(3);
 		assertThat(target.getArray()[0].equals("Test0") && target.getArray()[1] == null &&
 		target.getArray()[2].equals("Test2")).as("correct values").isTrue();
 	}
@@ -849,7 +848,7 @@ public void setIntArrayProperty() {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
-		accessor.setPropertyValue("intArray", new int[] {4, 5, 2, 3});
+		accessor.setPropertyValue("intArray", new int[]{4, 5, 2, 3});
 		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
 		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
@@ -910,21 +909,21 @@ public void setAsText(String text) {
 			}
 		});
 
-		accessor.setPropertyValue("intArray", new int[] {4, 5, 2, 3});
+		accessor.setPropertyValue("intArray", new int[]{4, 5, 2, 3});
 		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+				target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
 
-		accessor.setPropertyValue("intArray", new String[] {"3", "4", "1", "2"});
+		accessor.setPropertyValue("intArray", new String[]{"3", "4", "1", "2"});
 		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+				target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
 
 		accessor.setPropertyValue("intArray", 1);
 		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
 
-		accessor.setPropertyValue("intArray", new String[] {"0"});
+		accessor.setPropertyValue("intArray", new String[]{"0"});
 		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
 
@@ -947,8 +946,8 @@ public void setIntArrayPropertyWithStringSplitting() throws Exception {
 	public void setPrimitiveArrayProperty() {
 		PrimitiveArrayBean target = new PrimitiveArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
-		accessor.setPropertyValue("array", new String[] {"1", "2"});
-		assertThat(target.getArray().length).isEqualTo(2);
+		accessor.setPropertyValue("array", new String[]{"1", "2"});
+		assertThat(target.getArray()).hasSize(2);
 		assertThat(target.getArray()[0]).isEqualTo(1);
 		assertThat(target.getArray()[1]).isEqualTo(2);
 	}
@@ -967,7 +966,7 @@ public void setValue(Object value) {
 		});
 		int[] input = new int[1024];
 		accessor.setPropertyValue("array", input);
-		assertThat(target.getArray().length).isEqualTo(1024);
+		assertThat(target.getArray()).hasSize(1024);
 		assertThat(target.getArray()[0]).isEqualTo(1);
 		assertThat(target.getArray()[1]).isEqualTo(1);
 	}
@@ -986,8 +985,8 @@ public void setValue(Object value) {
 		});
 		int[] input = new int[1024];
 		accessor.setPropertyValue("array", input);
-		assertThat(target.getArray().length).isEqualTo(1024);
-		assertThat(target.getArray()[0]).isEqualTo(0);
+		assertThat(target.getArray()).hasSize(1024);
+		assertThat(target.getArray()[0]).isZero();
 		assertThat(target.getArray()[1]).isEqualTo(1);
 	}
 
@@ -998,12 +997,12 @@ public void setPrimitiveArrayPropertyWithAutoGrow() throws Exception {
 		accessor.setAutoGrowNestedPaths(true);
 
 		accessor.setPropertyValue("array[0]", 1);
-		assertThat(target.getArray().length).isEqualTo(1);
+		assertThat(target.getArray()).hasSize(1);
 
 		accessor.setPropertyValue("array[2]", 3);
-		assertThat(target.getArray().length).isEqualTo(3);
+		assertThat(target.getArray()).hasSize(3);
 		assertThat(target.getArray()[0] == 1 && target.getArray()[1] == 0 &&
-		target.getArray()[2] == 3).as("correct values").isTrue();
+				target.getArray()[2] == 3).as("correct values").isTrue();
 	}
 
 	@Test
@@ -1018,7 +1017,7 @@ public void setGenericArrayProperty() {
 		values.add("4");
 		accessor.setPropertyValue("items", values);
 		Object[] result = target.items;
-		assertThat(result.length).isEqualTo(4);
+		assertThat(result).hasSize(4);
 		assertThat(result[0]).isEqualTo("1");
 		assertThat(result[1]).isEqualTo("2");
 		assertThat(result[2]).isEqualTo("3");
@@ -1078,7 +1077,7 @@ public void setCollectionPropertyNonMatchingType() {
 		Set<String> list = new HashSet<>();
 		list.add("list1");
 		accessor.setPropertyValue("list", list);
-		assertThat(target.getCollection().size()).isEqualTo(1);
+		assertThat(target.getCollection()).hasSize(1);
 		assertThat(target.getCollection().containsAll(coll)).isTrue();
 		assertThat(target.getSet().size()).isEqualTo(1);
 		assertThat(target.getSet().containsAll(set)).isTrue();
@@ -1105,7 +1104,7 @@ public void setCollectionPropertyWithArrayValue() {
 		Set<String> list = new HashSet<>();
 		list.add("list1");
 		accessor.setPropertyValue("list", list.toArray());
-		assertThat(target.getCollection().size()).isEqualTo(1);
+		assertThat(target.getCollection()).hasSize(1);
 		assertThat(target.getCollection().containsAll(coll)).isTrue();
 		assertThat(target.getSet().size()).isEqualTo(1);
 		assertThat(target.getSet().containsAll(set)).isTrue();
@@ -1122,17 +1121,17 @@ public void setCollectionPropertyWithIntArrayValue() {
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<Integer> coll = new HashSet<>();
 		coll.add(0);
-		accessor.setPropertyValue("collection", new int[] {0});
+		accessor.setPropertyValue("collection", new int[]{0});
 		List<Integer> set = new ArrayList<>();
 		set.add(1);
-		accessor.setPropertyValue("set", new int[] {1});
+		accessor.setPropertyValue("set", new int[]{1});
 		List<Integer> sortedSet = new ArrayList<>();
 		sortedSet.add(2);
-		accessor.setPropertyValue("sortedSet", new int[] {2});
+		accessor.setPropertyValue("sortedSet", new int[]{2});
 		Set<Integer> list = new HashSet<>();
 		list.add(3);
-		accessor.setPropertyValue("list", new int[] {3});
-		assertThat(target.getCollection().size()).isEqualTo(1);
+		accessor.setPropertyValue("list", new int[]{3});
+		assertThat(target.getCollection()).hasSize(1);
 		assertThat(target.getCollection().containsAll(coll)).isTrue();
 		assertThat(target.getSet().size()).isEqualTo(1);
 		assertThat(target.getSet().containsAll(set)).isTrue();
@@ -1159,7 +1158,7 @@ public void setCollectionPropertyWithIntegerValue() {
 		Set<Integer> list = new HashSet<>();
 		list.add(3);
 		accessor.setPropertyValue("list", 3);
-		assertThat(target.getCollection().size()).isEqualTo(1);
+		assertThat(target.getCollection()).hasSize(1);
 		assertThat(target.getCollection().containsAll(coll)).isTrue();
 		assertThat(target.getSet().size()).isEqualTo(1);
 		assertThat(target.getSet().containsAll(set)).isTrue();
@@ -1236,7 +1235,7 @@ public void setMapPropertyNonMatchingType() {
 		Map<String, String> sortedMap = new TreeMap<>();
 		sortedMap.put("sortedKey", "sortedValue");
 		accessor.setPropertyValue("sortedMap", sortedMap);
-		assertThat(target.getMap().size()).isEqualTo(1);
+		assertThat(target.getMap()).hasSize(1);
 		assertThat(target.getMap().get("key")).isEqualTo("value");
 		assertThat(target.getSortedMap().size()).isEqualTo(1);
 		assertThat(target.getSortedMap().get("sortedKey")).isEqualTo("sortedValue");
@@ -1268,7 +1267,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 		badValues.add("map[key2]", "");
 		assertThatExceptionOfType(PropertyBatchUpdateException.class).isThrownBy(() ->
 				accessor.setPropertyValues(badValues))
-			.satisfies(ex -> assertThat(ex.getPropertyAccessException("map[key2]")).isInstanceOf(TypeMismatchException.class));
+				.satisfies(ex -> assertThat(ex.getPropertyAccessException("map[key2]")).isInstanceOf(TypeMismatchException.class));
 	}
 
 	@Test
@@ -1319,7 +1318,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 		assertThat(((TestBean) target.getMap().get(2)).getName()).isEqualTo("rob");
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" }) // must work with raw map in this test
+	@SuppressWarnings({"unchecked", "rawtypes"}) // must work with raw map in this test
 	@Test
 	public void setRawMapPropertyWithNoEditorRegistered() {
 		IndexedTestBean target = new IndexedTestBean();
@@ -1527,7 +1526,7 @@ public void getAndSetIndexedPropertiesWithDirectAccess() {
 		assertThat((target.getList().get(0))).isEqualTo(tb3);
 		assertThat((target.getList().get(1))).isEqualTo(tb2);
 		assertThat((target.getList().get(2))).isEqualTo(tb0);
-		assertThat((target.getList().get(3))).isEqualTo(null);
+		assertThat((target.getList().get(3))).isNull();
 		assertThat((target.getList().get(4))).isEqualTo(tb1);
 		assertThat((target.getMap().get("key1"))).isEqualTo(tb1);
 		assertThat((target.getMap().get("key2"))).isEqualTo(tb0);
@@ -1538,7 +1537,7 @@ public void getAndSetIndexedPropertiesWithDirectAccess() {
 		assertThat(accessor.getPropertyValue("list[0]")).isEqualTo(tb3);
 		assertThat(accessor.getPropertyValue("list[1]")).isEqualTo(tb2);
 		assertThat(accessor.getPropertyValue("list[2]")).isEqualTo(tb0);
-		assertThat(accessor.getPropertyValue("list[3]")).isEqualTo(null);
+		assertThat(accessor.getPropertyValue("list[3]")).isNull();
 		assertThat(accessor.getPropertyValue("list[4]")).isEqualTo(tb1);
 		assertThat(accessor.getPropertyValue("map[\"key1\"]")).isEqualTo(tb1);
 		assertThat(accessor.getPropertyValue("map['key2']")).isEqualTo(tb0);
@@ -1582,7 +1581,7 @@ public void propertyTypeDescriptorUnknownProperty() {
 	public void propertyTypeIndexedProperty() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
-		assertThat(accessor.getPropertyType("map[key0]")).isEqualTo(null);
+		assertThat(accessor.getPropertyType("map[key0]")).isNull();
 
 		accessor = createAccessor(target);
 		accessor.setPropertyValue("map[key0]", "my String");
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index be0c2cc5953a..f5fef0b04a84 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,10 +46,10 @@
  * @author Chris Beams
  * @since 18.01.2006
  */
-public class BeanWrapperGenericsTests {
+class BeanWrapperGenericsTests {
 
 	@Test
-	public void testGenericSet() {
+	void testGenericSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<String> input = new HashSet<>();
@@ -61,7 +61,7 @@ public void testGenericSet() {
 	}
 
 	@Test
-	public void testGenericLowerBoundedSet() {
+	void testGenericLowerBoundedSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, true));
@@ -74,7 +74,7 @@ public void testGenericLowerBoundedSet() {
 	}
 
 	@Test
-	public void testGenericSetWithConversionFailure() {
+	void testGenericSetWithConversionFailure() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<TestBean> input = new HashSet<>();
@@ -85,7 +85,7 @@ public void testGenericSetWithConversionFailure() {
 	}
 
 	@Test
-	public void testGenericList() throws MalformedURLException {
+	void testGenericList() throws MalformedURLException {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		List<String> input = new ArrayList<>();
@@ -97,7 +97,7 @@ public void testGenericList() throws MalformedURLException {
 	}
 
 	@Test
-	public void testGenericListElement() throws MalformedURLException {
+	void testGenericListElement() throws MalformedURLException {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setResourceList(new ArrayList<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -106,29 +106,29 @@ public void testGenericListElement() throws MalformedURLException {
 	}
 
 	@Test
-	public void testGenericMap() {
+	void testGenericMap() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
 		input.put("4", "5");
 		input.put("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapElement() {
+	void testGenericMapElement() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setShortMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("shortMap[4]", "5");
 		assertThat(bw.getPropertyValue("shortMap[4]")).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
 	}
 
 	@Test
-	public void testGenericMapWithKeyType() {
+	void testGenericMapWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
@@ -140,17 +140,17 @@ public void testGenericMapWithKeyType() {
 	}
 
 	@Test
-	public void testGenericMapElementWithKeyType() {
+	void testGenericMapElementWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setLongMap(new HashMap<Long, Integer>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("longMap[4]", "5");
-		assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
+		assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5");
 		assertThat(bw.getPropertyValue("longMap[4]")).isEqualTo("5");
 	}
 
 	@Test
-	public void testGenericMapWithCollectionValue() {
+	void testGenericMapWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
@@ -169,7 +169,7 @@ public void testGenericMapWithCollectionValue() {
 	}
 
 	@Test
-	public void testGenericMapElementWithCollectionValue() {
+	void testGenericMapElementWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setCollectionMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -182,19 +182,19 @@ public void testGenericMapElementWithCollectionValue() {
 	}
 
 	@Test
-	public void testGenericMapFromProperties() {
+	void testGenericMapFromProperties() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Properties input = new Properties();
 		input.setProperty("4", "5");
 		input.setProperty("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericListOfLists() throws MalformedURLException {
+	void testGenericListOfLists() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -206,7 +206,7 @@ public void testGenericListOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	public void testGenericListOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfListsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -218,7 +218,7 @@ public void testGenericListOfListsWithElementConversion() throws MalformedURLExc
 	}
 
 	@Test
-	public void testGenericListOfArrays() throws MalformedURLException {
+	void testGenericListOfArrays() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -230,7 +230,7 @@ public void testGenericListOfArrays() throws MalformedURLException {
 	}
 
 	@Test
-	public void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
+	void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -243,55 +243,55 @@ public void testGenericListOfArraysWithElementConversion() throws MalformedURLEx
 	}
 
 	@Test
-	public void testGenericListOfMaps() throws MalformedURLException {
+	void testGenericListOfMaps() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("listOfMaps[0][10]", new Long(5));
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
+		bw.setPropertyValue("listOfMaps[0][10]", 5L);
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericListOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfMapsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("listOfMaps[0][10]", "5");
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfMaps() throws MalformedURLException {
+	void testGenericMapOfMaps() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("mapOfMaps[mykey][10]", new Long(5));
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
+		bw.setPropertyValue("mapOfMaps[mykey][10]", 5L);
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(5L);
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("mapOfMaps[mykey][10]", "5");
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(Long.valueOf(5));
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfLists() throws MalformedURLException {
+	void testGenericMapOfLists() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -303,7 +303,7 @@ public void testGenericMapOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	public void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -315,7 +315,7 @@ public void testGenericMapOfListsWithElementConversion() throws MalformedURLExce
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfInteger() throws Exception {
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "100");
 
@@ -329,9 +329,9 @@ public void testGenericTypeNestingMapOfInteger() throws Exception {
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfInteger() throws Exception {
 		Map<String, List<String>> map = new HashMap<>();
-		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
+		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", list);
 
 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -345,7 +345,7 @@ public void testGenericTypeNestingMapOfListOfInteger() throws Exception {
 	}
 
 	@Test
-	public void testGenericTypeNestingListOfMapOfInteger() throws Exception {
+	void testGenericTypeNestingListOfMapOfInteger() throws Exception {
 		List<Map<String, String>> list = new ArrayList<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "5");
@@ -362,9 +362,9 @@ public void testGenericTypeNestingListOfMapOfInteger() throws Exception {
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
 		Map<String, List<List<String>>> map = new HashMap<>();
-		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
+		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", Collections.singletonList(list));
 
 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -378,7 +378,7 @@ public void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
 	}
 
 	@Test
-	public void testComplexGenericMap() {
+	void testComplexGenericMap() {
 		Map<List<String>, List<String>> inputMap = new HashMap<>();
 		List<String> inputKey = new ArrayList<>();
 		inputKey.add("1");
@@ -391,11 +391,11 @@ public void testComplexGenericMap() {
 		bw.setPropertyValue("genericMap", inputMap);
 
 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericMapWithCollectionConversion() {
+	void testComplexGenericMapWithCollectionConversion() {
 		Map<Set<String>, Set<String>> inputMap = new HashMap<>();
 		Set<String> inputKey = new HashSet<>();
 		inputKey.add("1");
@@ -408,11 +408,11 @@ public void testComplexGenericMapWithCollectionConversion() {
 		bw.setPropertyValue("genericMap", inputMap);
 
 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericIndexedMapEntry() {
+	void testComplexGenericIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");
 
@@ -421,11 +421,11 @@ public void testComplexGenericIndexedMapEntry() {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);
 
 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericIndexedMapEntryWithCollectionConversion() {
+	void testComplexGenericIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");
 
@@ -434,11 +434,11 @@ public void testComplexGenericIndexedMapEntryWithCollectionConversion() {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);
 
 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexDerivedIndexedMapEntry() {
+	void testComplexDerivedIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");
 
@@ -447,11 +447,11 @@ public void testComplexDerivedIndexedMapEntry() {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
 
 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
+	void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");
 
@@ -460,11 +460,11 @@ public void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
 
 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testGenericallyTypedIntegerBean() throws Exception {
+	void testGenericallyTypedIntegerBean() {
 		GenericIntegerBean gb = new GenericIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -475,7 +475,7 @@ public void testGenericallyTypedIntegerBean() throws Exception {
 	}
 
 	@Test
-	public void testGenericallyTypedSetOfIntegerBean() throws Exception {
+	void testGenericallyTypedSetOfIntegerBean() {
 		GenericSetOfIntegerBean gb = new GenericSetOfIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -486,23 +486,23 @@ public void testGenericallyTypedSetOfIntegerBean() throws Exception {
 	}
 
 	@Test
-	public void testSettingGenericPropertyWithReadOnlyInterface() {
+	void testSettingGenericPropertyWithReadOnlyInterface() {
 		Bar bar = new Bar();
 		BeanWrapper bw = new BeanWrapperImpl(bar);
 		bw.setPropertyValue("version", "10");
-		assertThat(bar.getVersion()).isEqualTo(new Double(10.0));
+		assertThat(bar.getVersion()).isEqualTo(Double.valueOf(10.0));
 	}
 
 	@Test
-	public void testSettingLongPropertyWithGenericInterface() {
+	void testSettingLongPropertyWithGenericInterface() {
 		Promotion bean = new Promotion();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("id", "10");
-		assertThat(bean.getId()).isEqualTo(new Long(10));
+		assertThat(bean.getId()).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testUntypedPropertyWithMapAtRuntime() {
+	void testUntypedPropertyWithMapAtRuntime() {
 		class Holder<D> {
 			private final D data;
 			public Holder(D data) {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 13321a7e9a2e..8d6f823a7583 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -182,9 +182,9 @@ void prototypeFactoryBeanIgnoredByNonEagerTypeMatching() {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -216,9 +216,9 @@ void singletonFactoryBeanIgnoredByNonEagerTypeMatching() {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -249,9 +249,9 @@ void nonInitializedFactoryBeanIgnoredByNonEagerTypeMatching() {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -283,7 +283,7 @@ void initializedFactoryBeanFoundByNonEagerTypeMatching() {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isTrue();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -337,7 +337,7 @@ void staticFactoryMethodFoundByNonEagerTypeMatching() {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -349,7 +349,7 @@ void staticFactoryMethodFoundByNonEagerTypeMatching() {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -362,7 +362,7 @@ void staticPrototypeFactoryMethodFoundByNonEagerTypeMatching() {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -374,7 +374,7 @@ void staticPrototypeFactoryMethodFoundByNonEagerTypeMatching() {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -389,7 +389,7 @@ void nonStaticFactoryMethodFoundByNonEagerTypeMatching() {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -401,7 +401,7 @@ void nonStaticFactoryMethodFoundByNonEagerTypeMatching() {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -417,7 +417,7 @@ void nonStaticPrototypeFactoryMethodFoundByNonEagerTypeMatching() {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -450,7 +450,7 @@ void nonStaticPrototypeFactoryMethodFoundByNonEagerTypeMatching() {
 		assertThat(lbf.isTypeMatch("x2", Object.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x2", Object.class)).isFalse();
 		assertThat(lbf.getType("x2")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x2")).isEqualTo(null);
+		assertThat(lbf.getType("&x2")).isNull();
 		assertThat(lbf.getAliases("x1").length).isEqualTo(1);
 		assertThat(lbf.getAliases("x1")[0]).isEqualTo("x2");
 		assertThat(lbf.getAliases("&x1").length).isEqualTo(1);
@@ -3030,7 +3030,7 @@ public CustomTypeConverter(NumberFormat numberFormat) {
 		public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
 			if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
 				try {
-					return new Float(this.numberFormat.parse((String) value).floatValue());
+					return this.numberFormat.parse((String) value).floatValue();
 				}
 				catch (ParseException ex) {
 					throw new TypeMismatchException(value, requiredType, ex);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index e3ba7b5d93f1..5a981f91e54c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,10 +64,10 @@
  * @author Sam Brannen
  * @since 20.01.2006
  */
-public class BeanFactoryGenericsTests {
+class BeanFactoryGenericsTests {
 
 	@Test
-	public void testGenericSetProperty() {
+	void testGenericSetProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -84,7 +84,7 @@ public void testGenericSetProperty() {
 	}
 
 	@Test
-	public void testGenericListProperty() throws Exception {
+	void testGenericListProperty() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -101,7 +101,7 @@ public void testGenericListProperty() throws Exception {
 	}
 
 	@Test
-	public void testGenericListPropertyWithAutowiring() throws Exception {
+	void testGenericListPropertyWithAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
@@ -116,7 +116,7 @@ public void testGenericListPropertyWithAutowiring() throws Exception {
 	}
 
 	@Test
-	public void testGenericListPropertyWithInvalidElementType() {
+	void testGenericListPropertyWithInvalidElementType() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericIntegerBean.class);
 
@@ -134,7 +134,7 @@ public void testGenericListPropertyWithInvalidElementType() {
 	}
 
 	@Test
-	public void testGenericListPropertyWithOptionalAutowiring() {
+	void testGenericListPropertyWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
@@ -146,7 +146,7 @@ public void testGenericListPropertyWithOptionalAutowiring() {
 	}
 
 	@Test
-	public void testGenericMapProperty() {
+	void testGenericMapProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -158,12 +158,12 @@ public void testGenericMapProperty() {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericListOfArraysProperty() {
+	void testGenericListOfArraysProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -171,14 +171,14 @@ public void testGenericListOfArraysProperty() {
 
 		assertThat(gb.getListOfArrays().size()).isEqualTo(1);
 		String[] array = gb.getListOfArrays().get(0);
-		assertThat(array.length).isEqualTo(2);
+		assertThat(array).hasSize(2);
 		assertThat(array[0]).isEqualTo("value1");
 		assertThat(array[1]).isEqualTo("value2");
 	}
 
 
 	@Test
-	public void testGenericSetConstructor() {
+	void testGenericSetConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -195,7 +195,7 @@ public void testGenericSetConstructor() {
 	}
 
 	@Test
-	public void testGenericSetConstructorWithAutowiring() {
+	void testGenericSetConstructorWithAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("integer1", 4);
 		bf.registerSingleton("integer2", 5);
@@ -210,7 +210,7 @@ public void testGenericSetConstructorWithAutowiring() {
 	}
 
 	@Test
-	public void testGenericSetConstructorWithOptionalAutowiring() {
+	void testGenericSetConstructorWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
@@ -222,7 +222,7 @@ public void testGenericSetConstructorWithOptionalAutowiring() {
 	}
 
 	@Test
-	public void testGenericSetListConstructor() throws Exception {
+	void testGenericSetListConstructor() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -245,7 +245,7 @@ public void testGenericSetListConstructor() throws Exception {
 	}
 
 	@Test
-	public void testGenericSetListConstructorWithAutowiring() throws Exception {
+	void testGenericSetListConstructorWithAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("integer1", 4);
 		bf.registerSingleton("integer2", 5);
@@ -264,7 +264,7 @@ public void testGenericSetListConstructorWithAutowiring() throws Exception {
 	}
 
 	@Test
-	public void testGenericSetListConstructorWithOptionalAutowiring() throws Exception {
+	void testGenericSetListConstructorWithOptionalAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
@@ -279,7 +279,7 @@ public void testGenericSetListConstructorWithOptionalAutowiring() throws Excepti
 	}
 
 	@Test
-	public void testGenericSetMapConstructor() {
+	void testGenericSetMapConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -297,12 +297,12 @@ public void testGenericSetMapConstructor() {
 
 		assertThat(gb.getIntegerSet().contains(4)).isTrue();
 		assertThat(gb.getIntegerSet().contains(5)).isTrue();
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapResourceConstructor() throws Exception {
+	void testGenericMapResourceConstructor() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -315,13 +315,13 @@ public void testGenericMapResourceConstructor() throws Exception {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 		assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
 	}
 
 	@Test
-	public void testGenericMapMapConstructor() {
+	void testGenericMapMapConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -338,16 +338,16 @@ public void testGenericMapMapConstructor() {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
 		assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
-		assertThat(gb.getPlainMap().size()).isEqualTo(2);
+		assertThat(gb.getPlainMap()).hasSize(2);
 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
 		assertThat(gb.getShortMap().size()).isEqualTo(2);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapMapConstructorWithSameRefAndConversion() {
+	void testGenericMapMapConstructorWithSameRefAndConversion() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -361,22 +361,22 @@ public void testGenericMapMapConstructorWithSameRefAndConversion() {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
 		assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
-		assertThat(gb.getPlainMap().size()).isEqualTo(2);
+		assertThat(gb.getPlainMap()).hasSize(2);
 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
 		assertThat(gb.getShortMap().size()).isEqualTo(2);
-		assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(0);
-		assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(3);
+		assertThat(gb.getShortMap().get(Short.valueOf("1"))).isEqualTo(0);
+		assertThat(gb.getShortMap().get(Short.valueOf("2"))).isEqualTo(3);
 	}
 
 	@Test
-	public void testGenericMapMapConstructorWithSameRefAndNoConversion() {
+	void testGenericMapMapConstructorWithSameRefAndNoConversion() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
 		Map<Short, Integer> input = new HashMap<>();
-		input.put(new Short((short) 1), 0);
-		input.put(new Short((short) 2), 3);
+		input.put((short) 1, 0);
+		input.put((short) 2, 3);
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(input);
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(input);
 
@@ -384,13 +384,13 @@ public void testGenericMapMapConstructorWithSameRefAndNoConversion() {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
 		assertThat(gb.getShortMap()).isSameAs(gb.getPlainMap());
-		assertThat(gb.getShortMap().size()).isEqualTo(2);
-		assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(0);
-		assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(3);
+		assertThat(gb.getShortMap()).hasSize(2);
+		assertThat(gb.getShortMap().get(Short.valueOf("1"))).isEqualTo(0);
+		assertThat(gb.getShortMap().get(Short.valueOf("2"))).isEqualTo(3);
 	}
 
 	@Test
-	public void testGenericMapWithKeyTypeConstructor() {
+	void testGenericMapWithKeyTypeConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 
@@ -407,7 +407,7 @@ public void testGenericMapWithKeyTypeConstructor() {
 	}
 
 	@Test
-	public void testGenericMapWithCollectionValueConstructor() {
+	void testGenericMapWithCollectionValueConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
 			@Override
@@ -438,7 +438,7 @@ public void registerCustomEditors(PropertyEditorRegistry registry) {
 
 
 	@Test
-	public void testGenericSetFactoryMethod() {
+	void testGenericSetFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -456,7 +456,7 @@ public void testGenericSetFactoryMethod() {
 	}
 
 	@Test
-	public void testGenericSetListFactoryMethod() throws Exception {
+	void testGenericSetListFactoryMethod() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -480,7 +480,7 @@ public void testGenericSetListFactoryMethod() throws Exception {
 	}
 
 	@Test
-	public void testGenericSetMapFactoryMethod() {
+	void testGenericSetMapFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -499,12 +499,12 @@ public void testGenericSetMapFactoryMethod() {
 
 		assertThat(gb.getIntegerSet().contains(4)).isTrue();
 		assertThat(gb.getIntegerSet().contains(5)).isTrue();
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapResourceFactoryMethod() throws Exception {
+	void testGenericMapResourceFactoryMethod() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -518,13 +518,13 @@ public void testGenericMapResourceFactoryMethod() throws Exception {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 		assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
 	}
 
 	@Test
-	public void testGenericMapMapFactoryMethod() {
+	void testGenericMapMapFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -543,12 +543,12 @@ public void testGenericMapMapFactoryMethod() {
 
 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapWithKeyTypeFactoryMethod() {
+	void testGenericMapWithKeyTypeFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -561,12 +561,12 @@ public void testGenericMapWithKeyTypeFactoryMethod() {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");
 
-		assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
-		assertThat(gb.getLongMap().get(new Long("6"))).isEqualTo("7");
+		assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5");
+		assertThat(gb.getLongMap().get(Long.valueOf("6"))).isEqualTo("7");
 	}
 
 	@Test
-	public void testGenericMapWithCollectionValueFactoryMethod() {
+	void testGenericMapWithCollectionValueFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
 			@Override
@@ -597,7 +597,7 @@ public void registerCustomEditors(PropertyEditorRegistry registry) {
 	}
 
 	@Test
-	public void testGenericListBean() throws Exception {
+	void testGenericListBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -607,7 +607,7 @@ public void testGenericListBean() throws Exception {
 	}
 
 	@Test
-	public void testGenericSetBean() throws Exception {
+	void testGenericSetBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -617,18 +617,18 @@ public void testGenericSetBean() throws Exception {
 	}
 
 	@Test
-	public void testGenericMapBean() throws Exception {
+	void testGenericMapBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
 		Map<?, ?> map = (Map<?, ?>) bf.getBean("map");
-		assertThat(map.size()).isEqualTo(1);
+		assertThat(map).hasSize(1);
 		assertThat(map.keySet().iterator().next()).isEqualTo(10);
 		assertThat(map.values().iterator().next()).isEqualTo(new URL("http://localhost:8080"));
 	}
 
 	@Test
-	public void testGenericallyTypedIntegerBean() {
+	void testGenericallyTypedIntegerBean() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -639,7 +639,7 @@ public void testGenericallyTypedIntegerBean() {
 	}
 
 	@Test
-	public void testGenericallyTypedSetOfIntegerBean() {
+	void testGenericallyTypedSetOfIntegerBean() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -651,7 +651,7 @@ public void testGenericallyTypedSetOfIntegerBean() {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	public void testSetBean() throws Exception {
+	void testSetBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -671,7 +671,7 @@ public void testSetBean() throws Exception {
 	 * <p>See SPR-9493
 	 */
 	@Test
-	public void parameterizedStaticFactoryMethod() {
+	void parameterizedStaticFactoryMethod() {
 		RootBeanDefinition rbd = new RootBeanDefinition(Mockito.class);
 		rbd.setFactoryMethodName("mock");
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
@@ -682,7 +682,7 @@ public void parameterizedStaticFactoryMethod() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	/**
@@ -697,7 +697,7 @@ public void parameterizedStaticFactoryMethod() {
 	 * <p>See SPR-10411
 	 */
 	@Test
-	public void parameterizedInstanceFactoryMethod() {
+	void parameterizedInstanceFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -714,11 +714,11 @@ public void parameterizedInstanceFactoryMethod() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	@Test
-	public void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
+	void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -735,11 +735,11 @@ public void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	@Test
-	public void parameterizedInstanceFactoryMethodWithWrappedClassName() {
+	void parameterizedInstanceFactoryMethodWithWrappedClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition();
@@ -754,11 +754,11 @@ public void parameterizedInstanceFactoryMethodWithWrappedClassName() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	@Test
-	public void parameterizedInstanceFactoryMethodWithInvalidClassName() {
+	void parameterizedInstanceFactoryMethodWithInvalidClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -775,11 +775,11 @@ public void parameterizedInstanceFactoryMethodWithInvalidClassName() {
 		assertThat(bf.getType("mock")).isNull();
 		assertThat(bf.getType("mock")).isNull();
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(0);
+		assertThat(beans).hasSize(0);
 	}
 
 	@Test
-	public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
+	void parameterizedInstanceFactoryMethodWithIndexedArgument() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -796,11 +796,11 @@ public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	@Test  // SPR-16720
-	public void parameterizedInstanceFactoryMethodWithTempClassLoader() {
+	void parameterizedInstanceFactoryMethodWithTempClassLoader() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setTempClassLoader(new OverridingClassLoader(getClass().getClassLoader()));
 
@@ -818,11 +818,11 @@ public void parameterizedInstanceFactoryMethodWithTempClassLoader() {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans.size()).isEqualTo(1);
+		assertThat(beans).hasSize(1);
 	}
 
 	@Test
-	public void testGenericMatchingWithBeanNameDifferentiation() {
+	void testGenericMatchingWithBeanNameDifferentiation() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());
 
@@ -838,15 +838,15 @@ public void testGenericMatchingWithBeanNameDifferentiation() {
 		String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
 		String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
 		String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
-		assertThat(numberStoreNames.length).isEqualTo(2);
+		assertThat(numberStoreNames).hasSize(2);
 		assertThat(numberStoreNames[0]).isEqualTo("doubleStore");
 		assertThat(numberStoreNames[1]).isEqualTo("floatStore");
-		assertThat(doubleStoreNames.length).isEqualTo(0);
-		assertThat(floatStoreNames.length).isEqualTo(0);
+		assertThat(doubleStoreNames).hasSize(0);
+		assertThat(floatStoreNames).hasSize(0);
 	}
 
 	@Test
-	public void testGenericMatchingWithFullTypeDifferentiation() {
+	void testGenericMatchingWithFullTypeDifferentiation() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());
@@ -867,12 +867,12 @@ public void testGenericMatchingWithFullTypeDifferentiation() {
 		String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
 		String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
 		String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
-		assertThat(numberStoreNames.length).isEqualTo(2);
+		assertThat(numberStoreNames).hasSize(2);
 		assertThat(numberStoreNames[0]).isEqualTo("store1");
 		assertThat(numberStoreNames[1]).isEqualTo("store2");
-		assertThat(doubleStoreNames.length).isEqualTo(1);
+		assertThat(doubleStoreNames).hasSize(1);
 		assertThat(doubleStoreNames[0]).isEqualTo("store1");
-		assertThat(floatStoreNames.length).isEqualTo(1);
+		assertThat(floatStoreNames).hasSize(1);
 		assertThat(floatStoreNames[0]).isEqualTo("store2");
 
 		ObjectProvider<NumberStore<?>> numberStoreProvider = bf.getBeanProvider(ResolvableType.forClass(NumberStore.class));
@@ -938,7 +938,7 @@ public void testGenericMatchingWithFullTypeDifferentiation() {
 	}
 
 	@Test
-	public void testGenericMatchingWithUnresolvedOrderedStream() {
+	void testGenericMatchingWithUnresolvedOrderedStream() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
index 67cef6f11665..becb7961f2a3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,18 +26,18 @@
  *
  * @author Rick Evans
  */
-public class ClassNameBeanWiringInfoResolverTests {
+class ClassNameBeanWiringInfoResolverTests {
 
 	@Test
-	public void resolveWiringInfoWithNullBeanInstance() throws Exception {
+	void resolveWiringInfoWithNullBeanInstance() throws Exception {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new ClassNameBeanWiringInfoResolver().resolveWiringInfo(null));
 	}
 
 	@Test
-	public void resolveWiringInfo() {
+	void resolveWiringInfo() {
 		ClassNameBeanWiringInfoResolver resolver = new ClassNameBeanWiringInfoResolver();
-		Long beanInstance = new Long(1);
+		Long beanInstance = 1L;
 		BeanWiringInfo info = resolver.resolveWiringInfo(beanInstance);
 		assertThat(info).isNotNull();
 		assertThat(info.getBeanName()).as("Not resolving bean name to the class name of the supplied bean instance as per class contract.").isEqualTo(beanInstance.getClass().getName());
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
index 0de98a10f002..36fc01ddc649 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.beans.propertyeditors;
 
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.*;
+import org.springframework.beans.testfixture.beans.*;
+
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
 import java.beans.PropertyVetoException;
@@ -64,10 +68,10 @@
  * @author Chris Beams
  * @since 10.06.2003
  */
-public class CustomEditorTests {
+class CustomEditorTests {
 
 	@Test
-	public void testComplexObject() {
+	void testComplexObject() {
 		TestBean tb = new TestBean();
 		String newName = "Rod";
 		String tbString = "Kerry_34";
@@ -80,12 +84,12 @@ public void testComplexObject() {
 		pvs.addPropertyValue(new PropertyValue("touchy", "valid"));
 		pvs.addPropertyValue(new PropertyValue("spouse", tbString));
 		bw.setPropertyValues(pvs);
-		assertThat(tb.getSpouse() != null).as("spouse is non-null").isTrue();
+		assertThat(tb.getSpouse()).as("spouse is non-null").isNotNull();
 		assertThat(tb.getSpouse().getName().equals("Kerry") && tb.getSpouse().getAge() == 34).as("spouse name is Kerry and age is 34").isTrue();
 	}
 
 	@Test
-	public void testComplexObjectWithOldValueAccess() {
+	void testComplexObjectWithOldValueAccess() {
 		TestBean tb = new TestBean();
 		String newName = "Rod";
 		String tbString = "Kerry_34";
@@ -100,7 +104,7 @@ public void testComplexObjectWithOldValueAccess() {
 		pvs.addPropertyValue(new PropertyValue("spouse", tbString));
 
 		bw.setPropertyValues(pvs);
-		assertThat(tb.getSpouse() != null).as("spouse is non-null").isTrue();
+		assertThat(tb.getSpouse()).as("spouse is non-null").isNotNull();
 		assertThat(tb.getSpouse().getName().equals("Kerry") && tb.getSpouse().getAge() == 34).as("spouse name is Kerry and age is 34").isTrue();
 		ITestBean spouse = tb.getSpouse();
 
@@ -109,7 +113,7 @@ public void testComplexObjectWithOldValueAccess() {
 	}
 
 	@Test
-	public void testCustomEditorForSingleProperty() {
+	void testCustomEditorForSingleProperty() {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
@@ -127,7 +131,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testCustomEditorForAllStringProperties() {
+	void testCustomEditorForAllStringProperties() {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -145,7 +149,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testCustomEditorForSingleNestedProperty() {
+	void testCustomEditorForSingleNestedProperty() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -164,7 +168,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testCustomEditorForAllNestedStringProperties() {
+	void testCustomEditorForAllNestedStringProperties() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -183,7 +187,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testDefaultBooleanEditorForPrimitiveType() {
+	void testDefaultBooleanEditorForPrimitiveType() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 
@@ -229,7 +233,7 @@ public void testDefaultBooleanEditorForPrimitiveType() {
 	}
 
 	@Test
-	public void testDefaultBooleanEditorForWrapperType() {
+	void testDefaultBooleanEditorForWrapperType() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 
@@ -239,28 +243,28 @@ public void testDefaultBooleanEditorForWrapperType() {
 
 		bw.setPropertyValue("bool2", "false");
 		assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
-		boolean condition3 = !tb.getBool2().booleanValue();
+		boolean condition3 = !tb.getBool2();
 		assertThat(condition3).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "on");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "off");
-		boolean condition2 = !tb.getBool2().booleanValue();
+		boolean condition2 = !tb.getBool2();
 		assertThat(condition2).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "yes");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "no");
-		boolean condition1 = !tb.getBool2().booleanValue();
+		boolean condition1 = !tb.getBool2();
 		assertThat(condition1).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "1");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "0");
-		boolean condition = !tb.getBool2().booleanValue();
+		boolean condition = !tb.getBool2();
 		assertThat(condition).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "");
@@ -268,7 +272,7 @@ public void testDefaultBooleanEditorForWrapperType() {
 	}
 
 	@Test
-	public void testCustomBooleanEditorWithAllowEmpty() {
+	void testCustomBooleanEditorWithAllowEmpty() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(Boolean.class, new CustomBooleanEditor(true));
@@ -279,37 +283,37 @@ public void testCustomBooleanEditorWithAllowEmpty() {
 
 		bw.setPropertyValue("bool2", "false");
 		assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
-		boolean condition3 = !tb.getBool2().booleanValue();
+		boolean condition3 = !tb.getBool2();
 		assertThat(condition3).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "on");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "off");
-		boolean condition2 = !tb.getBool2().booleanValue();
+		boolean condition2 = !tb.getBool2();
 		assertThat(condition2).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "yes");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "no");
-		boolean condition1 = !tb.getBool2().booleanValue();
+		boolean condition1 = !tb.getBool2();
 		assertThat(condition1).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "1");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "0");
-		boolean condition = !tb.getBool2().booleanValue();
+		boolean condition = !tb.getBool2();
 		assertThat(condition).as("Correct bool2 value").isTrue();
 
 		bw.setPropertyValue("bool2", "");
-		assertThat(bw.getPropertyValue("bool2") == null).as("Correct bool2 value").isTrue();
-		assertThat(tb.getBool2() == null).as("Correct bool2 value").isTrue();
+		assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isNull();
+		assertThat(tb.getBool2()).as("Correct bool2 value").isNull();
 	}
 
 	@Test
-	public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
+	void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
 		String trueString = "pechorin";
 		String falseString = "nash";
 
@@ -333,7 +337,7 @@ public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Excep
 	}
 
 	@Test
-	public void testDefaultNumberEditor() {
+	void testDefaultNumberEditor() {
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 
@@ -350,34 +354,34 @@ public void testDefaultNumberEditor() {
 		bw.setPropertyValue("double2", "6.1");
 		bw.setPropertyValue("bigDecimal", "4.5");
 
-		assertThat(new Short("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
+		assertThat(Short.valueOf("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
 		assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
-		assertThat(new Short("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
-		assertThat(new Short("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
-		assertThat(new Integer("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
+		assertThat(Short.valueOf("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
+		assertThat(Short.valueOf("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
+		assertThat(Integer.valueOf("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
 		assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
-		assertThat(new Integer("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
-		assertThat(new Integer("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
-		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
+		assertThat(Integer.valueOf("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
+		assertThat(Integer.valueOf("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
+		assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
+		assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
 		assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
 		assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(new Float("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
-		assertThat(new Float("7.1").equals(new Float(tb.getFloat1()))).as("Correct float1 value").isTrue();
-		assertThat(new Float("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
-		assertThat(new Float("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
-		assertThat(new Double("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
+		assertThat(Float.valueOf("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
+		assertThat(Float.valueOf("7.1").equals(tb.getFloat1())).as("Correct float1 value").isTrue();
+		assertThat(Float.valueOf("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
+		assertThat(Float.valueOf("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
+		assertThat(Double.valueOf("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
 		assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
-		assertThat(new Double("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
-		assertThat(new Double("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
+		assertThat(Double.valueOf("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
+		assertThat(Double.valueOf("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
 	}
 
 	@Test
-	public void testCustomNumberEditorWithoutAllowEmpty() {
+	void testCustomNumberEditorWithoutAllowEmpty() {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -407,34 +411,34 @@ public void testCustomNumberEditorWithoutAllowEmpty() {
 		bw.setPropertyValue("double2", "6,1");
 		bw.setPropertyValue("bigDecimal", "4,5");
 
-		assertThat(new Short("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
+		assertThat(bw.getPropertyValue("short1")).as("Correct short1 value").isEqualTo(Short.valueOf("1"));
 		assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
-		assertThat(new Short("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
-		assertThat(new Short("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
-		assertThat(new Integer("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
+		assertThat(bw.getPropertyValue("short2")).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
+		assertThat(tb.getShort2()).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
+		assertThat(bw.getPropertyValue("int1")).as("Correct int1 value").isEqualTo(Integer.valueOf("7"));
 		assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
-		assertThat(new Integer("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
-		assertThat(new Integer("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
-		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
+		assertThat(bw.getPropertyValue("int2")).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
+		assertThat(tb.getInt2()).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
+		assertThat(bw.getPropertyValue("long1")).as("Correct long1 value").isEqualTo(Long.valueOf("5"));
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(bw.getPropertyValue("long2")).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
+		assertThat(tb.getLong2()).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
 		assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
 		assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(new Float("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
-		assertThat(new Float("7.1").equals(new Float(tb.getFloat1()))).as("Correct float1 value").isTrue();
-		assertThat(new Float("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
-		assertThat(new Float("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
-		assertThat(new Double("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
+		assertThat(bw.getPropertyValue("float1")).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
+		assertThat(Float.valueOf(tb.getFloat1())).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
+		assertThat(bw.getPropertyValue("float2")).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
+		assertThat(tb.getFloat2()).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
+		assertThat(bw.getPropertyValue("double1")).as("Correct double1 value").isEqualTo(Double.valueOf("5.1"));
 		assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
-		assertThat(new Double("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
-		assertThat(new Double("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
+		assertThat(bw.getPropertyValue("double2")).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
+		assertThat(tb.getDouble2()).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
 		assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
 	}
 
 	@Test
-	public void testCustomNumberEditorWithAllowEmpty() {
+	void testCustomNumberEditorWithAllowEmpty() {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -443,10 +447,10 @@ public void testCustomNumberEditorWithAllowEmpty() {
 
 		bw.setPropertyValue("long1", "5");
 		bw.setPropertyValue("long2", "6");
-		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
+		assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
+		assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
 
 		bw.setPropertyValue("long2", "");
 		assertThat(bw.getPropertyValue("long2") == null).as("Correct long2 value").isTrue();
@@ -458,7 +462,7 @@ public void testCustomNumberEditorWithAllowEmpty() {
 	}
 
 	@Test
-	public void testCustomNumberEditorWithFrenchBigDecimal() throws Exception {
+	void testCustomNumberEditorWithFrenchBigDecimal() throws Exception {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.FRENCH);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -475,14 +479,14 @@ public void testCustomNumberEditorWithFrenchBigDecimal() throws Exception {
 	}
 
 	@Test
-	public void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
+	void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
 		CustomNumberEditor editor = new CustomNumberEditor(Short.class, true);
 		assertThatExceptionOfType(NumberFormatException.class).as("greater than Short.MAX_VALUE + 1").isThrownBy(() ->
 			editor.setAsText(String.valueOf(Short.MAX_VALUE + 1)));
 	}
 
 	@Test
-	public void testByteArrayPropertyEditor() {
+	void testByteArrayPropertyEditor() {
 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("byteArray", "myvalue");
@@ -490,7 +494,7 @@ public void testByteArrayPropertyEditor() {
 	}
 
 	@Test
-	public void testCharArrayPropertyEditor() {
+	void testCharArrayPropertyEditor() {
 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("charArray", "myvalue");
@@ -498,7 +502,7 @@ public void testCharArrayPropertyEditor() {
 	}
 
 	@Test
-	public void testCharacterEditor() {
+	void testCharacterEditor() {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);
 
@@ -520,78 +524,78 @@ public void testCharacterEditor() {
 	}
 
 	@Test
-	public void testCharacterEditorWithAllowEmpty() {
+	void testCharacterEditorWithAllowEmpty() {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);
 		bw.registerCustomEditor(Character.class, new CharacterEditor(true));
 
-		bw.setPropertyValue("myCharacter", new Character('c'));
-		assertThat(cb.getMyCharacter()).isEqualTo(new Character('c'));
+		bw.setPropertyValue("myCharacter", 'c');
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));
 
 		bw.setPropertyValue("myCharacter", "c");
-		assertThat(cb.getMyCharacter()).isEqualTo(new Character('c'));
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));
 
 		bw.setPropertyValue("myCharacter", "\u0041");
-		assertThat(cb.getMyCharacter()).isEqualTo(new Character('A'));
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('A'));
 
 		bw.setPropertyValue("myCharacter", " ");
-		assertThat(cb.getMyCharacter()).isEqualTo(new Character(' '));
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf(' '));
 
 		bw.setPropertyValue("myCharacter", "");
 		assertThat(cb.getMyCharacter()).isNull();
 	}
 
 	@Test
-	public void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
+	void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				charEditor.setAsText("ColdWaterCanyon"));
 	}
 
 	@Test
-	public void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
+	void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
-		assertThat(charEditor.getAsText()).isEqualTo("");
+		assertThat(charEditor.getAsText()).isEmpty();
 		charEditor = new CharacterEditor(true);
 		charEditor.setAsText(null);
-		assertThat(charEditor.getAsText()).isEqualTo("");
+		assertThat(charEditor.getAsText()).isEmpty();
 		charEditor.setAsText("");
-		assertThat(charEditor.getAsText()).isEqualTo("");
+		assertThat(charEditor.getAsText()).isEmpty();
 		charEditor.setAsText(" ");
 		assertThat(charEditor.getAsText()).isEqualTo(" ");
 	}
 
 	@Test
-	public void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
+	void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				charEditor.setAsText(null));
 	}
 
 	@Test
-	public void testClassEditor() {
+	void testClassEditor() {
 		PropertyEditor classEditor = new ClassEditor();
 		classEditor.setAsText(TestBean.class.getName());
 		assertThat(classEditor.getValue()).isEqualTo(TestBean.class);
 		assertThat(classEditor.getAsText()).isEqualTo(TestBean.class.getName());
 
 		classEditor.setAsText(null);
-		assertThat(classEditor.getAsText()).isEqualTo("");
+		assertThat(classEditor.getAsText()).isEmpty();
 		classEditor.setAsText("");
-		assertThat(classEditor.getAsText()).isEqualTo("");
+		assertThat(classEditor.getAsText()).isEmpty();
 		classEditor.setAsText("\t  ");
-		assertThat(classEditor.getAsText()).isEqualTo("");
+		assertThat(classEditor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testClassEditorWithNonExistentClass() throws Exception {
+	void testClassEditorWithNonExistentClass() throws Exception {
 		PropertyEditor classEditor = new ClassEditor();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				classEditor.setAsText("hairdresser.on.Fire"));
 	}
 
 	@Test
-	public void testClassEditorWithArray() {
+	void testClassEditorWithArray() {
 		PropertyEditor classEditor = new ClassEditor();
 		classEditor.setAsText("org.springframework.beans.testfixture.beans.TestBean[]");
 		assertThat(classEditor.getValue()).isEqualTo(TestBean[].class);
@@ -602,7 +606,7 @@ public void testClassEditorWithArray() {
 	* SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
 	*/
 	@Test
-	public void testGetAsTextWithTwoDimensionalArray() throws Exception {
+	void testGetAsTextWithTwoDimensionalArray() throws Exception {
 		String[][] chessboard = new String[8][8];
 		ClassEditor editor = new ClassEditor();
 		editor.setValue(chessboard.getClass());
@@ -613,7 +617,7 @@ public void testGetAsTextWithTwoDimensionalArray() throws Exception {
 	 * SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
 	 */
 	@Test
-	public void testGetAsTextWithRidiculousMultiDimensionalArray() throws Exception {
+	void testGetAsTextWithRidiculousMultiDimensionalArray() throws Exception {
 		String[][][][][] ridiculousChessboard = new String[8][4][0][1][3];
 		ClassEditor editor = new ClassEditor();
 		editor.setValue(ridiculousChessboard.getClass());
@@ -621,7 +625,7 @@ public void testGetAsTextWithRidiculousMultiDimensionalArray() throws Exception
 	}
 
 	@Test
-	public void testFileEditor() {
+	void testFileEditor() {
 		PropertyEditor fileEditor = new FileEditor();
 		fileEditor.setAsText("file:myfile.txt");
 		assertThat(fileEditor.getValue()).isEqualTo(new File("myfile.txt"));
@@ -629,7 +633,7 @@ public void testFileEditor() {
 	}
 
 	@Test
-	public void testFileEditorWithRelativePath() {
+	void testFileEditorWithRelativePath() {
 		PropertyEditor fileEditor = new FileEditor();
 		try {
 			fileEditor.setAsText("myfile.txt");
@@ -641,7 +645,7 @@ public void testFileEditorWithRelativePath() {
 	}
 
 	@Test
-	public void testFileEditorWithAbsolutePath() {
+	void testFileEditorWithAbsolutePath() {
 		PropertyEditor fileEditor = new FileEditor();
 		// testing on Windows
 		if (new File("C:/myfile.txt").isAbsolute()) {
@@ -656,18 +660,18 @@ public void testFileEditorWithAbsolutePath() {
 	}
 
 	@Test
-	public void testLocaleEditor() {
+	void testLocaleEditor() {
 		PropertyEditor localeEditor = new LocaleEditor();
 		localeEditor.setAsText("en_CA");
 		assertThat(localeEditor.getValue()).isEqualTo(Locale.CANADA);
 		assertThat(localeEditor.getAsText()).isEqualTo("en_CA");
 
 		localeEditor = new LocaleEditor();
-		assertThat(localeEditor.getAsText()).isEqualTo("");
+		assertThat(localeEditor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testPatternEditor() {
+	void testPatternEditor() {
 		final String REGEX = "a.*";
 
 		PropertyEditor patternEditor = new PatternEditor();
@@ -676,15 +680,15 @@ public void testPatternEditor() {
 		assertThat(patternEditor.getAsText()).isEqualTo(REGEX);
 
 		patternEditor = new PatternEditor();
-		assertThat(patternEditor.getAsText()).isEqualTo("");
+		assertThat(patternEditor.getAsText()).isEmpty();
 
 		patternEditor = new PatternEditor();
 		patternEditor.setAsText(null);
-		assertThat(patternEditor.getAsText()).isEqualTo("");
+		assertThat(patternEditor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCustomBooleanEditor() {
+	void testCustomBooleanEditor() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(false);
 
 		editor.setAsText("true");
@@ -696,15 +700,15 @@ public void testCustomBooleanEditor() {
 		assertThat(editor.getAsText()).isEqualTo("false");
 
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				editor.setAsText(null));
 	}
 
 	@Test
-	public void testCustomBooleanEditorWithEmptyAsNull() {
+	void testCustomBooleanEditorWithEmptyAsNull() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(true);
 
 		editor.setAsText("true");
@@ -716,76 +720,76 @@ public void testCustomBooleanEditorWithEmptyAsNull() {
 		assertThat(editor.getAsText()).isEqualTo("false");
 
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCustomDateEditor() {
+	void testCustomDateEditor() {
 		CustomDateEditor editor = new CustomDateEditor(null, false);
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCustomDateEditorWithEmptyAsNull() {
+	void testCustomDateEditorWithEmptyAsNull() {
 		CustomDateEditor editor = new CustomDateEditor(null, true);
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCustomDateEditorWithExactDateLength() {
+	void testCustomDateEditorWithExactDateLength() {
 		int maxLength = 10;
 		String validDate = "01/01/2005";
 		String invalidDate = "01/01/05";
 
-		assertThat(validDate.length() == maxLength).isTrue();
-		assertThat(invalidDate.length() == maxLength).isFalse();
+		assertThat(validDate).hasSize(maxLength);
+		assertThat(invalidDate.length()).isNotEqualTo(maxLength);
 
 		CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), true, maxLength);
 		editor.setAsText(validDate);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				editor.setAsText(invalidDate))
-			.withMessageContaining("10");
+				.withMessageContaining("10");
 	}
 
 	@Test
-	public void testCustomNumberEditor() {
+	void testCustomNumberEditor() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
 		editor.setAsText("5");
 		assertThat(editor.getValue()).isEqualTo(5);
 		assertThat(editor.getAsText()).isEqualTo("5");
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCustomNumberEditorWithHex() {
+	void testCustomNumberEditorWithHex() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
 		editor.setAsText("0x" + Integer.toHexString(64));
 		assertThat(editor.getValue()).isEqualTo(64);
 	}
 
 	@Test
-	public void testCustomNumberEditorWithEmptyAsNull() {
+	void testCustomNumberEditorWithEmptyAsNull() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, true);
 		editor.setAsText("5");
 		assertThat(editor.getValue()).isEqualTo(5);
 		assertThat(editor.getAsText()).isEqualTo("5");
 		editor.setAsText("");
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setValue(null);
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testStringTrimmerEditor() {
+	void testStringTrimmerEditor() {
 		StringTrimmerEditor editor = new StringTrimmerEditor(false);
 		editor.setAsText("test");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -795,15 +799,15 @@ public void testStringTrimmerEditor() {
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("");
 		assertThat(editor.getValue()).isEqualTo("");
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setAsText(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testStringTrimmerEditorWithEmptyAsNull() {
+	void testStringTrimmerEditorWithEmptyAsNull() {
 		StringTrimmerEditor editor = new StringTrimmerEditor(true);
 		editor.setAsText("test");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -812,14 +816,14 @@ public void testStringTrimmerEditorWithEmptyAsNull() {
 		assertThat(editor.getValue()).isEqualTo("test");
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("  ");
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testStringTrimmerEditorWithCharsToDelete() {
+	void testStringTrimmerEditorWithCharsToDelete() {
 		StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", false);
 		editor.setAsText("te\ns\ft");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -829,13 +833,13 @@ public void testStringTrimmerEditorWithCharsToDelete() {
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("");
 		assertThat(editor.getValue()).isEqualTo("");
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
+	void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
 		StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", true);
 		editor.setAsText("te\ns\ft");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -844,14 +848,14 @@ public void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
 		assertThat(editor.getValue()).isEqualTo("test");
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText(" \n\f ");
-		assertThat(editor.getValue()).isEqualTo(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getValue()).isNull();
+		assertThat(editor.getAsText()).isEmpty();
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testIndexedPropertiesWithCustomEditorForType() {
+	void testIndexedPropertiesWithCustomEditorForType() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -904,7 +908,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testIndexedPropertiesWithCustomEditorForProperty() {
+	void testIndexedPropertiesWithCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
@@ -971,7 +975,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testIndexedPropertiesWithIndividualCustomEditorForProperty() {
+	void testIndexedPropertiesWithIndividualCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() {
@@ -1056,7 +1060,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testNestedIndexedPropertiesWithCustomEditorForProperty() {
+	void testNestedIndexedPropertiesWithCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean();
 		TestBean tb0 = bean.getArray()[0];
 		TestBean tb1 = bean.getArray()[1];
@@ -1140,7 +1144,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testNestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
+	void testNestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean();
 		TestBean tb0 = bean.getArray()[0];
 		TestBean tb1 = bean.getArray()[1];
@@ -1191,7 +1195,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testIndexedPropertiesWithDirectAccessAndPropertyEditors() {
+	void testIndexedPropertiesWithDirectAccessAndPropertyEditors() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
@@ -1245,7 +1249,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testIndexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
+	void testIndexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() {
@@ -1332,7 +1336,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testIndexedPropertiesWithListPropertyEditor() {
+	void testIndexedPropertiesWithListPropertyEditor() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() {
@@ -1350,7 +1354,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testConversionToOldCollections() throws PropertyVetoException {
+	void testConversionToOldCollections() throws PropertyVetoException {
 		OldCollectionsBean tb = new OldCollectionsBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(Vector.class, new CustomCollectionEditor(Vector.class));
@@ -1367,7 +1371,7 @@ public void testConversionToOldCollections() throws PropertyVetoException {
 	}
 
 	@Test
-	public void testUninitializedArrayPropertyWithCustomEditor() {
+	void testUninitializedArrayPropertyWithCustomEditor() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		PropertyEditor pe = new CustomNumberEditor(Integer.class, true);
@@ -1383,7 +1387,7 @@ public void testUninitializedArrayPropertyWithCustomEditor() {
 	}
 
 	@Test
-	public void testArrayToArrayConversion() throws PropertyVetoException {
+	void testArrayToArrayConversion() throws PropertyVetoException {
 		IndexedTestBean tb = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
@@ -1399,7 +1403,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testArrayToStringConversion() throws PropertyVetoException {
+	void testArrayToStringConversion() throws PropertyVetoException {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -1408,16 +1412,16 @@ public void setAsText(String text) throws IllegalArgumentException {
 				setValue("-" + text + "-");
 			}
 		});
-		bw.setPropertyValue("name", new String[] {"a", "b"});
+		bw.setPropertyValue("name", new String[]{"a", "b"});
 		assertThat(tb.getName()).isEqualTo("-a,b-");
 	}
 
 	@Test
-	public void testClassArrayEditorSunnyDay() throws Exception {
+	void testClassArrayEditorSunnyDay() throws Exception {
 		ClassArrayEditor classArrayEditor = new ClassArrayEditor();
 		classArrayEditor.setAsText("java.lang.String,java.util.HashMap");
 		Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
-		assertThat(classes.length).isEqualTo(2);
+		assertThat(classes).hasSize(2);
 		assertThat(classes[0]).isEqualTo(String.class);
 		assertThat(classes[1]).isEqualTo(HashMap.class);
 		assertThat(classArrayEditor.getAsText()).isEqualTo("java.lang.String,java.util.HashMap");
@@ -1426,11 +1430,11 @@ public void testClassArrayEditorSunnyDay() throws Exception {
 	}
 
 	@Test
-	public void testClassArrayEditorSunnyDayWithArrayTypes() throws Exception {
+	void testClassArrayEditorSunnyDayWithArrayTypes() throws Exception {
 		ClassArrayEditor classArrayEditor = new ClassArrayEditor();
 		classArrayEditor.setAsText("java.lang.String[],java.util.Map[],int[],float[][][]");
 		Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
-		assertThat(classes.length).isEqualTo(4);
+		assertThat(classes).hasSize(4);
 		assertThat(classes[0]).isEqualTo(String[].class);
 		assertThat(classes[1]).isEqualTo(Map[].class);
 		assertThat(classes[2]).isEqualTo(int[].class);
@@ -1441,31 +1445,31 @@ public void testClassArrayEditorSunnyDayWithArrayTypes() throws Exception {
 	}
 
 	@Test
-	public void testClassArrayEditorSetAsTextWithNull() throws Exception {
+	void testClassArrayEditorSetAsTextWithNull() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText(null);
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testClassArrayEditorSetAsTextWithEmptyString() throws Exception {
+	void testClassArrayEditorSetAsTextWithEmptyString() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText("");
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testClassArrayEditorSetAsTextWithWhitespaceString() throws Exception {
+	void testClassArrayEditorSetAsTextWithWhitespaceString() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText("\n");
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEqualTo("");
+		assertThat(editor.getAsText()).isEmpty();
 	}
 
 	@Test
-	public void testCharsetEditor() throws Exception {
+	void testCharsetEditor() throws Exception {
 		CharsetEditor editor = new CharsetEditor();
 		String name = "UTF-8";
 		editor.setAsText(name);
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
index 895e40eee17c..da16e07c3660 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
@@ -162,13 +162,13 @@ public Object capitalize(ProceedingJoinPoint pjp, String value) throws Throwable
 
 	public Object doubleOrQuits(ProceedingJoinPoint pjp) throws Throwable {
 		int value = ((Integer) pjp.getArgs()[0]).intValue();
-		pjp.getArgs()[0] = new Integer(value * 2);
+		pjp.getArgs()[0] = Integer.valueOf(value * 2);
 		return pjp.proceed();
 	}
 
 	public Object addOne(ProceedingJoinPoint pjp, Float value) throws Throwable {
 		float fv = value.floatValue();
-		return pjp.proceed(new Object[] {new Float(fv + 1.0F)});
+		return pjp.proceed(new Object[] {Float.valueOf(fv + 1.0F)});
 	}
 
 	public void captureStringArgument(JoinPoint tjp, String arg) {
diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
index cd1e71a12d57..c493f075b1ae 100644
--- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
@@ -79,7 +79,7 @@
  * @author Stephane Nicoll
  * @author Juergen Hoeller
  */
-public class AnnotationDrivenEventListenerTests {
+class AnnotationDrivenEventListenerTests {
 
 	private ConfigurableApplicationContext context;
 
@@ -97,7 +97,7 @@ public void closeContext() {
 
 
 	@Test
-	public void simpleEventJavaConfig() {
+	void simpleEventJavaConfig() {
 		load(TestEventListener.class);
 		TestEvent event = new TestEvent(this, "test");
 		TestEventListener listener = this.context.getBean(TestEventListener.class);
@@ -120,7 +120,7 @@ public void simpleEventJavaConfig() {
 	}
 
 	@Test
-	public void simpleEventXmlConfig() {
+	void simpleEventXmlConfig() {
 		this.context = new ClassPathXmlApplicationContext(
 				"org/springframework/context/event/simple-event-configuration.xml");
 
@@ -141,7 +141,7 @@ public void simpleEventXmlConfig() {
 	}
 
 	@Test
-	public void metaAnnotationIsDiscovered() {
+	void metaAnnotationIsDiscovered() {
 		load(MetaAnnotationListenerTestBean.class);
 		MetaAnnotationListenerTestBean bean = this.context.getBean(MetaAnnotationListenerTestBean.class);
 		this.eventCollector.assertNoEventReceived(bean);
@@ -159,7 +159,7 @@ public void metaAnnotationIsDiscovered() {
 	}
 
 	@Test
-	public void contextEventsAreReceived() {
+	void contextEventsAreReceived() {
 		load(ContextEventListener.class);
 		ContextEventListener listener = this.context.getBean(ContextEventListener.class);
 
@@ -175,7 +175,7 @@ public void contextEventsAreReceived() {
 	}
 
 	@Test
-	public void methodSignatureNoEvent() {
+	void methodSignatureNoEvent() {
 		@SuppressWarnings("resource")
 		AnnotationConfigApplicationContext failingContext =
 				new AnnotationConfigApplicationContext();
@@ -189,7 +189,7 @@ public void methodSignatureNoEvent() {
 	}
 
 	@Test
-	public void simpleReply() {
+	void simpleReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, "dummy");
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -204,7 +204,7 @@ public void simpleReply() {
 	}
 
 	@Test
-	public void nullReplyIgnored() {
+	void nullReplyIgnored() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, null); // No response
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -219,7 +219,7 @@ public void nullReplyIgnored() {
 	}
 
 	@Test
-	public void arrayReply() {
+	void arrayReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, new String[]{"first", "second"});
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -234,7 +234,7 @@ public void arrayReply() {
 	}
 
 	@Test
-	public void collectionReply() {
+	void collectionReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		Set<Object> replies = new LinkedHashSet<>();
 		replies.add("first");
@@ -253,7 +253,7 @@ public void collectionReply() {
 	}
 
 	@Test
-	public void collectionReplyNullValue() {
+	void collectionReplyNullValue() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, Arrays.asList(null, "test"));
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -268,7 +268,7 @@ public void collectionReplyNullValue() {
 	}
 
 	@Test
-	public void listenableFutureReply() {
+	void listenableFutureReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		SettableListenableFuture<String> future = new SettableListenableFuture<>();
 		future.set("dummy");
@@ -285,7 +285,7 @@ public void listenableFutureReply() {
 	}
 
 	@Test
-	public void completableFutureReply() {
+	void completableFutureReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, CompletableFuture.completedFuture("dummy"));
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -300,7 +300,7 @@ public void completableFutureReply() {
 	}
 
 	@Test
-	public void monoReply() {
+	void monoReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, Mono.just("dummy"));
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -315,7 +315,7 @@ public void monoReply() {
 	}
 
 	@Test
-	public void fluxReply() {
+	void fluxReply() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, Flux.just("dummy1", "dummy2"));
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -330,7 +330,7 @@ public void fluxReply() {
 	}
 
 	@Test
-	public void eventListenerWorksWithSimpleInterfaceProxy() {
+	void eventListenerWorksWithSimpleInterfaceProxy() {
 		load(ScopedProxyTestBean.class);
 
 		SimpleService proxy = this.context.getBean(SimpleService.class);
@@ -347,7 +347,7 @@ public void eventListenerWorksWithSimpleInterfaceProxy() {
 	}
 
 	@Test
-	public void eventListenerWorksWithAnnotatedInterfaceProxy() {
+	void eventListenerWorksWithAnnotatedInterfaceProxy() {
 		load(AnnotatedProxyTestBean.class);
 
 		AnnotatedSimpleService proxy = this.context.getBean(AnnotatedSimpleService.class);
@@ -364,7 +364,7 @@ public void eventListenerWorksWithAnnotatedInterfaceProxy() {
 	}
 
 	@Test
-	public void eventListenerWorksWithCglibProxy() {
+	void eventListenerWorksWithCglibProxy() {
 		load(CglibProxyTestBean.class);
 
 		CglibProxyTestBean proxy = this.context.getBean(CglibProxyTestBean.class);
@@ -381,14 +381,14 @@ public void eventListenerWorksWithCglibProxy() {
 	}
 
 	@Test
-	public void privateMethodOnCglibProxyFails() {
+	void privateMethodOnCglibProxyFails() {
 		assertThatExceptionOfType(BeanInitializationException.class).isThrownBy(() ->
 				load(CglibProxyWithPrivateMethod.class))
 			.withCauseInstanceOf(IllegalStateException.class);
 	}
 
 	@Test
-	public void eventListenerWorksWithCustomScope() {
+	void eventListenerWorksWithCustomScope() {
 		load(CustomScopeTestBean.class);
 		CustomScope customScope = new CustomScope();
 		this.context.getBeanFactory().registerScope("custom", customScope);
@@ -417,7 +417,7 @@ public void eventListenerWorksWithCustomScope() {
 	}
 
 	@Test
-	public void asyncProcessingApplied() throws InterruptedException {
+	void asyncProcessingApplied() throws InterruptedException {
 		loadAsync(AsyncEventListener.class);
 
 		String threadName = Thread.currentThread().getName();
@@ -432,7 +432,7 @@ public void asyncProcessingApplied() throws InterruptedException {
 	}
 
 	@Test
-	public void asyncProcessingAppliedWithInterfaceProxy() throws InterruptedException {
+	void asyncProcessingAppliedWithInterfaceProxy() throws InterruptedException {
 		doLoad(AsyncConfigurationWithInterfaces.class, SimpleProxyTestBean.class);
 
 		String threadName = Thread.currentThread().getName();
@@ -447,7 +447,7 @@ public void asyncProcessingAppliedWithInterfaceProxy() throws InterruptedExcepti
 	}
 
 	@Test
-	public void asyncProcessingAppliedWithScopedProxy() throws InterruptedException {
+	void asyncProcessingAppliedWithScopedProxy() throws InterruptedException {
 		doLoad(AsyncConfigurationWithInterfaces.class, ScopedProxyTestBean.class);
 
 		String threadName = Thread.currentThread().getName();
@@ -462,7 +462,7 @@ public void asyncProcessingAppliedWithScopedProxy() throws InterruptedException
 	}
 
 	@Test
-	public void exceptionPropagated() {
+	void exceptionPropagated() {
 		load(ExceptionEventListener.class);
 		TestEvent event = new TestEvent(this, "fail");
 		ExceptionEventListener listener = this.context.getBean(ExceptionEventListener.class);
@@ -475,7 +475,7 @@ public void exceptionPropagated() {
 	}
 
 	@Test
-	public void exceptionNotPropagatedWithAsync() throws InterruptedException {
+	void exceptionNotPropagatedWithAsync() throws InterruptedException {
 		loadAsync(ExceptionEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, "fail");
 		ExceptionEventListener listener = this.context.getBean(ExceptionEventListener.class);
@@ -489,7 +489,7 @@ public void exceptionNotPropagatedWithAsync() throws InterruptedException {
 	}
 
 	@Test
-	public void listenerWithSimplePayload() {
+	void listenerWithSimplePayload() {
 		load(TestEventListener.class);
 		TestEventListener listener = this.context.getBean(TestEventListener.class);
 
@@ -500,7 +500,7 @@ public void listenerWithSimplePayload() {
 	}
 
 	@Test
-	public void listenerWithNonMatchingPayload() {
+	void listenerWithNonMatchingPayload() {
 		load(TestEventListener.class);
 		TestEventListener listener = this.context.getBean(TestEventListener.class);
 
@@ -511,7 +511,7 @@ public void listenerWithNonMatchingPayload() {
 	}
 
 	@Test
-	public void replyWithPayload() {
+	void replyWithPayload() {
 		load(TestEventListener.class, ReplyEventListener.class);
 		AnotherTestEvent event = new AnotherTestEvent(this, "String");
 		ReplyEventListener replyEventListener = this.context.getBean(ReplyEventListener.class);
@@ -527,7 +527,7 @@ public void replyWithPayload() {
 	}
 
 	@Test
-	public void listenerWithGenericApplicationEvent() {
+	void listenerWithGenericApplicationEvent() {
 		load(GenericEventListener.class);
 		GenericEventListener listener = this.context.getBean(GenericEventListener.class);
 
@@ -538,7 +538,7 @@ public void listenerWithGenericApplicationEvent() {
 	}
 
 	@Test
-	public void listenerWithResolvableTypeEvent() {
+	void listenerWithResolvableTypeEvent() {
 		load(ResolvableTypeEventListener.class);
 		ResolvableTypeEventListener listener = this.context.getBean(ResolvableTypeEventListener.class);
 
@@ -550,7 +550,7 @@ public void listenerWithResolvableTypeEvent() {
 	}
 
 	@Test
-	public void listenerWithResolvableTypeEventWrongGeneric() {
+	void listenerWithResolvableTypeEventWrongGeneric() {
 		load(ResolvableTypeEventListener.class);
 		ResolvableTypeEventListener listener = this.context.getBean(ResolvableTypeEventListener.class);
 
@@ -562,12 +562,12 @@ public void listenerWithResolvableTypeEventWrongGeneric() {
 	}
 
 	@Test
-	public void conditionMatch() {
+	void conditionMatch() {
 		validateConditionMatch(ConditionalEventListener.class);
 	}
 
 	@Test
-	public void conditionMatchWithProxy() {
+	void conditionMatchWithProxy() {
 		validateConditionMatch(ConditionalEventListener.class, MethodValidationPostProcessor.class);
 	}
 
@@ -600,7 +600,7 @@ private void validateConditionMatch(Class<?>... classes) {
 	}
 
 	@Test
-	public void conditionDoesNotMatch() {
+	void conditionDoesNotMatch() {
 		long maxLong = Long.MAX_VALUE;
 		load(ConditionalEventListener.class);
 		TestEvent event = new TestEvent(this, "KO");
@@ -625,7 +625,7 @@ public void conditionDoesNotMatch() {
 	}
 
 	@Test
-	public void orderedListeners() {
+	void orderedListeners() {
 		load(OrderedTestListener.class);
 		OrderedTestListener listener = this.context.getBean(OrderedTestListener.class);
 
@@ -635,7 +635,7 @@ public void orderedListeners() {
 	}
 
 	@Test @Disabled  // SPR-15122
-	public void listenersReceiveEarlyEvents() {
+	void listenersReceiveEarlyEvents() {
 		load(EventOnPostConstruct.class, OrderedTestListener.class);
 		OrderedTestListener listener = this.context.getBean(OrderedTestListener.class);
 
@@ -643,7 +643,7 @@ public void listenersReceiveEarlyEvents() {
 	}
 
 	@Test
-	public void missingListenerBeanIgnored() {
+	void missingListenerBeanIgnored() {
 		load(MissingEventListener.class);
 		context.getBean(UseMissingEventListener.class);
 		context.getBean(ApplicationEventMulticaster.class).multicastEvent(new TestEvent(this));
@@ -697,7 +697,7 @@ public TestConditionEvaluator conditionEvaluator() {
 		static class TestConditionEvaluator {
 
 			public boolean valid(Double ratio) {
-				return new Double(42).equals(ratio);
+				return Double.valueOf(42).equals(ratio);
 			}
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index adff3bb372d3..988e068a0b1b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -341,10 +341,10 @@ void testWithExposeClassLoader() throws Exception {
 
 		assertIsRegistered("Bean instance not registered", objectName);
 
-		Object result = server.invoke(objectName, "add", new Object[] {new Integer(2), new Integer(3)}, new String[] {
+		Object result = server.invoke(objectName, "add", new Object[] {2, 3}, new String[] {
 				int.class.getName(), int.class.getName()});
 
-		assertThat(new Integer(5)).as("Incorrect result return from add").isEqualTo(result);
+		assertThat(Integer.valueOf(5)).as("Incorrect result return from add").isEqualTo(result);
 		assertThat(server.getAttribute(objectName, "Name")).as("Incorrect attribute value").isEqualTo(name);
 
 		server.setAttribute(objectName, new Attribute("Name", otherName));
@@ -352,7 +352,7 @@ void testWithExposeClassLoader() throws Exception {
 	}
 
 	@Test
-	void testBonaFideMBeanIsNotExportedWhenAutodetectIsTotallyTurnedOff() throws Exception {
+	void testBonaFideMBeanIsNotExportedWhenAutodetectIsTotallyTurnedOff() {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(Person.class);
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		factory.registerBeanDefinition("^&_invalidObjectName_(*", builder.getBeanDefinition());
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
index 26a8b0defffa..c754af69ca15 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public void testRegisterOperations() throws Exception {
 		IJmxTestBean bean = getBean();
 		assertThat(bean).isNotNull();
 		MBeanInfo inf = getMBeanInfo();
-		assertThat(inf.getOperations().length).as("Incorrect number of operations registered").isEqualTo(getExpectedOperationCount());
+		assertThat(inf.getOperations()).as("Incorrect number of operations registered").hasSize(getExpectedOperationCount());
 	}
 
 	@Test
@@ -68,7 +68,7 @@ public void testRegisterAttributes() throws Exception {
 		IJmxTestBean bean = getBean();
 		assertThat(bean).isNotNull();
 		MBeanInfo inf = getMBeanInfo();
-		assertThat(inf.getAttributes().length).as("Incorrect number of attributes registered").isEqualTo(getExpectedAttributeCount());
+		assertThat(inf.getAttributes()).as("Incorrect number of attributes registered").hasSize(getExpectedAttributeCount());
 	}
 
 	@Test
@@ -81,7 +81,7 @@ public void testGetMBeanInfo() throws Exception {
 	public void testGetMBeanAttributeInfo() throws Exception {
 		ModelMBeanInfo info = getMBeanInfoFromAssembler();
 		MBeanAttributeInfo[] inf = info.getAttributes();
-		assertThat(inf.length).as("Invalid number of Attributes returned").isEqualTo(getExpectedAttributeCount());
+		assertThat(inf).as("Invalid number of Attributes returned").hasSize(getExpectedAttributeCount());
 
 		for (int x = 0; x < inf.length; x++) {
 			assertThat(inf[x]).as("MBeanAttributeInfo should not be null").isNotNull();
@@ -93,7 +93,7 @@ public void testGetMBeanAttributeInfo() throws Exception {
 	public void testGetMBeanOperationInfo() throws Exception {
 		ModelMBeanInfo info = getMBeanInfoFromAssembler();
 		MBeanOperationInfo[] inf = info.getOperations();
-		assertThat(inf.length).as("Invalid number of Operations returned").isEqualTo(getExpectedOperationCount());
+		assertThat(inf).as("Invalid number of Operations returned").hasSize(getExpectedOperationCount());
 
 		for (int x = 0; x < inf.length; x++) {
 			assertThat(inf[x]).as("MBeanOperationInfo should not be null").isNotNull();
@@ -128,8 +128,8 @@ public void testGetAttribute() throws Exception {
 	public void testOperationInvocation() throws Exception{
 		ObjectName objectName = ObjectNameManager.getInstance(getObjectName());
 		Object result = getServer().invoke(objectName, "add",
-				new Object[] {new Integer(20), new Integer(30)}, new String[] {"int", "int"});
-		assertThat(result).as("Incorrect result").isEqualTo(new Integer(50));
+				new Object[] {20, 30}, new String[] {"int", "int"});
+		assertThat(result).as("Incorrect result").isEqualTo(50);
 	}
 
 	@Test
@@ -150,12 +150,12 @@ public void testAttributeHasCorrespondingOperations() throws Exception {
 
 		ModelMBeanOperationInfo get = info.getOperation("getName");
 		assertThat(get).as("get operation should not be null").isNotNull();
-		assertThat(new Integer(4)).as("get operation should have visibility of four").isEqualTo(get.getDescriptor().getFieldValue("visibility"));
+		assertThat(Integer.valueOf(4)).as("get operation should have visibility of four").isEqualTo(get.getDescriptor().getFieldValue("visibility"));
 		assertThat(get.getDescriptor().getFieldValue("role")).as("get operation should have role \"getter\"").isEqualTo("getter");
 
 		ModelMBeanOperationInfo set = info.getOperation("setName");
 		assertThat(set).as("set operation should not be null").isNotNull();
-		assertThat(new Integer(4)).as("set operation should have visibility of four").isEqualTo(set.getDescriptor().getFieldValue("visibility"));
+		assertThat(Integer.valueOf(4)).as("set operation should have visibility of four").isEqualTo(set.getDescriptor().getFieldValue("visibility"));
 		assertThat(set.getDescriptor().getFieldValue("role")).as("set operation should have role \"setter\"").isEqualTo("setter");
 	}
 
@@ -163,12 +163,12 @@ public void testAttributeHasCorrespondingOperations() throws Exception {
 	public void testNotificationMetadata() throws Exception {
 		ModelMBeanInfo info = (ModelMBeanInfo) getMBeanInfo();
 		MBeanNotificationInfo[] notifications = info.getNotifications();
-		assertThat(notifications.length).as("Incorrect number of notifications").isEqualTo(1);
+		assertThat(notifications).as("Incorrect number of notifications").hasSize(1);
 		assertThat(notifications[0].getName()).as("Incorrect notification name").isEqualTo("My Notification");
 
 		String[] notifTypes = notifications[0].getNotifTypes();
 
-		assertThat(notifTypes.length).as("Incorrect number of notification types").isEqualTo(2);
+		assertThat(notifTypes).as("Incorrect number of notification types").hasSize(2);
 		assertThat(notifTypes[0]).as("Notification type.foo not found").isEqualTo("type.foo");
 		assertThat(notifTypes[1]).as("Notification type.bar not found").isEqualTo("type.bar");
 	}
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index 16253239fa74..d6702d317db7 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
  * @author Chris Beams
  */
 @EnabledForTestGroups(LONG_RUNNING)
-public class ScriptFactoryPostProcessorTests {
+class ScriptFactoryPostProcessorTests {
 
 	private static final String MESSAGE_TEXT = "Bingo";
 
@@ -79,18 +79,18 @@ public class ScriptFactoryPostProcessorTests {
 
 
 	@Test
-	public void testDoesNothingWhenPostProcessingNonScriptFactoryTypeBeforeInstantiation() throws Exception {
+	void testDoesNothingWhenPostProcessingNonScriptFactoryTypeBeforeInstantiation() {
 		assertThat(new ScriptFactoryPostProcessor().postProcessBeforeInstantiation(getClass(), "a.bean")).isNull();
 	}
 
 	@Test
-	public void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() throws Exception {
+	void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() {
 		assertThatIllegalStateException().isThrownBy(() ->
 				new ScriptFactoryPostProcessor().setBeanFactory(mock(BeanFactory.class)));
 	}
 
 	@Test
-	public void testChangeScriptWithRefreshableBeanFunctionality() throws Exception {
+	void testChangeScriptWithRefreshableBeanFunctionality() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
 
@@ -111,7 +111,7 @@ public void testChangeScriptWithRefreshableBeanFunctionality() throws Exception
 	}
 
 	@Test
-	public void testChangeScriptWithNoRefreshableBeanFunctionality() throws Exception {
+	void testChangeScriptWithNoRefreshableBeanFunctionality() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(false);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
 
@@ -131,7 +131,7 @@ public void testChangeScriptWithNoRefreshableBeanFunctionality() throws Exceptio
 	}
 
 	@Test
-	public void testRefreshedScriptReferencePropagatesToCollaborators() throws Exception {
+	void testRefreshedScriptReferencePropagatesToCollaborators() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
 		BeanDefinitionBuilder collaboratorBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultMessengerService.class);
@@ -159,7 +159,7 @@ public void testRefreshedScriptReferencePropagatesToCollaborators() throws Excep
 	}
 
 	@Test
-	public void testReferencesAcrossAContainerHierarchy() throws Exception {
+	void testReferencesAcrossAContainerHierarchy() throws Exception {
 		GenericApplicationContext businessContext = new GenericApplicationContext();
 		businessContext.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition());
 		businessContext.refresh();
@@ -175,13 +175,13 @@ public void testReferencesAcrossAContainerHierarchy() throws Exception {
 	}
 
 	@Test
-	public void testScriptHavingAReferenceToAnotherBean() throws Exception {
+	void testScriptHavingAReferenceToAnotherBean() throws Exception {
 		// just tests that the (singleton) script-backed bean is able to be instantiated with references to its collaborators
 		new ClassPathXmlApplicationContext("org/springframework/scripting/support/groovyReferences.xml");
 	}
 
 	@Test
-	public void testForRefreshedScriptHavingErrorPickedUpOnFirstCall() throws Exception {
+	void testForRefreshedScriptHavingErrorPickedUpOnFirstCall() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
 		BeanDefinitionBuilder collaboratorBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultMessengerService.class);
@@ -202,13 +202,12 @@ public void testForRefreshedScriptHavingErrorPickedUpOnFirstCall() throws Except
 		// needs The Sundays compiler; must NOT throw any exception here...
 		source.setScript("I keep hoping you are the same as me, and I'll send you letters and come to your house for tea");
 		Messenger refreshedMessenger = (Messenger) ctx.getBean(MESSENGER_BEAN_NAME);
-		assertThatExceptionOfType(FatalBeanException.class).isThrownBy(() ->
-				refreshedMessenger.getMessage())
+		assertThatExceptionOfType(FatalBeanException.class).isThrownBy(refreshedMessenger::getMessage)
 			.matches(ex -> ex.contains(ScriptCompilationException.class));
 	}
 
 	@Test
-	public void testPrototypeScriptedBean() throws Exception {
+	void testPrototypeScriptedBean() throws Exception {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition());
 
@@ -236,7 +235,7 @@ private static StaticScriptSource getScriptSource(GenericApplicationContext ctx)
 	private static BeanDefinition createScriptFactoryPostProcessor(boolean isRefreshable) {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ScriptFactoryPostProcessor.class);
 		if (isRefreshable) {
-			builder.addPropertyValue("defaultRefreshCheckDelay", new Long(1));
+			builder.addPropertyValue("defaultRefreshCheckDelay", 1L);
 		}
 		return builder.getBeanDefinition();
 	}
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index 602454760041..f8ffc26ab8ad 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,17 +36,17 @@
  * @author Stephane Nicoll
  * @since 07.03.2006
  */
-public class DataBinderFieldAccessTests {
+class DataBinderFieldAccessTests {
 
 	@Test
-	public void bindingNoErrors() throws Exception {
+	void bindingNoErrors() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		assertThat(binder.isIgnoreUnknownFields()).isTrue();
 		binder.initDirectFieldAccess();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.addPropertyValue(new PropertyValue("name", "Rod"));
-		pvs.addPropertyValue(new PropertyValue("age", new Integer(32)));
+		pvs.addPropertyValue(new PropertyValue("age", 32));
 		pvs.addPropertyValue(new PropertyValue("nonExisting", "someValue"));
 
 		binder.bind(pvs);
@@ -62,21 +62,21 @@ public void bindingNoErrors() throws Exception {
 	}
 
 	@Test
-	public void bindingNoErrorsNotIgnoreUnknown() throws Exception {
+	void bindingNoErrorsNotIgnoreUnknown() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.initDirectFieldAccess();
 		binder.setIgnoreUnknownFields(false);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.addPropertyValue(new PropertyValue("name", "Rod"));
-		pvs.addPropertyValue(new PropertyValue("age", new Integer(32)));
+		pvs.addPropertyValue(new PropertyValue("age", 32));
 		pvs.addPropertyValue(new PropertyValue("nonExisting", "someValue"));
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
 				binder.bind(pvs));
 	}
 
 	@Test
-	public void bindingWithErrors() throws Exception {
+	void bindingWithErrors() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.initDirectFieldAccess();
@@ -105,7 +105,7 @@ public void bindingWithErrors() throws Exception {
 	}
 
 	@Test
-	public void nestedBindingWithDefaultConversionNoErrors() throws Exception {
+	void nestedBindingWithDefaultConversionNoErrors() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		assertThat(binder.isIgnoreUnknownFields()).isTrue();
@@ -122,7 +122,7 @@ public void nestedBindingWithDefaultConversionNoErrors() throws Exception {
 	}
 
 	@Test
-	public void nestedBindingWithDisabledAutoGrow() throws Exception {
+	void nestedBindingWithDisabledAutoGrow() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.setAutoGrowNestedPaths(false);
@@ -135,7 +135,7 @@ public void nestedBindingWithDisabledAutoGrow() throws Exception {
 	}
 
 	@Test
-	public void bindingWithErrorsAndCustomEditors() throws Exception {
+	void bindingWithErrorsAndCustomEditors() throws Exception {
 		FieldAccessBean rod = new FieldAccessBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.initDirectFieldAccess();
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
index 420e17d9a3fa..a820d40a6a43 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,10 +77,10 @@
  * @author Rob Harrop
  * @author Kazuki Shimizu
  */
-public class DataBinderTests {
+class DataBinderTests {
 
 	@Test
-	public void testBindingNoErrors() throws BindException {
+	void testBindingNoErrors() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		assertThat(binder.isIgnoreUnknownFields()).isTrue();
@@ -115,7 +115,7 @@ public void testBindingNoErrors() throws BindException {
 	}
 
 	@Test
-	public void testBindingWithDefaultConversionNoErrors() throws BindException {
+	void testBindingWithDefaultConversionNoErrors() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		assertThat(binder.isIgnoreUnknownFields()).isTrue();
@@ -131,7 +131,7 @@ public void testBindingWithDefaultConversionNoErrors() throws BindException {
 	}
 
 	@Test
-	public void testNestedBindingWithDefaultConversionNoErrors() throws BindException {
+	void testNestedBindingWithDefaultConversionNoErrors() throws BindException {
 		TestBean rod = new TestBean(new TestBean());
 		DataBinder binder = new DataBinder(rod, "person");
 		assertThat(binder.isIgnoreUnknownFields()).isTrue();
@@ -147,7 +147,7 @@ public void testNestedBindingWithDefaultConversionNoErrors() throws BindExceptio
 	}
 
 	@Test
-	public void testBindingNoErrorsNotIgnoreUnknown() {
+	void testBindingNoErrorsNotIgnoreUnknown() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.setIgnoreUnknownFields(false);
@@ -160,7 +160,7 @@ public void testBindingNoErrorsNotIgnoreUnknown() {
 	}
 
 	@Test
-	public void testBindingNoErrorsWithInvalidField() {
+	void testBindingNoErrorsWithInvalidField() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -171,7 +171,7 @@ public void testBindingNoErrorsWithInvalidField() {
 	}
 
 	@Test
-	public void testBindingNoErrorsWithIgnoreInvalid() {
+	void testBindingNoErrorsWithIgnoreInvalid() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.setIgnoreInvalidFields(true);
@@ -183,7 +183,7 @@ public void testBindingNoErrorsWithIgnoreInvalid() {
 	}
 
 	@Test
-	public void testBindingWithErrors() {
+	void testBindingWithErrors() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -245,7 +245,7 @@ public void testBindingWithErrors() {
 	}
 
 	@Test
-	public void testBindingWithSystemFieldError() {
+	void testBindingWithSystemFieldError() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -257,7 +257,7 @@ public void testBindingWithSystemFieldError() {
 	}
 
 	@Test
-	public void testBindingWithErrorsAndCustomEditors() {
+	void testBindingWithErrorsAndCustomEditors() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.registerCustomEditor(String.class, "touchy", new PropertyEditorSupport() {
@@ -325,7 +325,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testBindingWithCustomEditorOnObjectField() {
+	void testBindingWithCustomEditorOnObjectField() {
 		BeanWithObjectProperty tb = new BeanWithObjectProperty();
 		DataBinder binder = new DataBinder(tb);
 		binder.registerCustomEditor(Integer.class, "object", new CustomNumberEditor(Integer.class, true));
@@ -336,7 +336,7 @@ public void testBindingWithCustomEditorOnObjectField() {
 	}
 
 	@Test
-	public void testBindingWithFormatter() {
+	void testBindingWithFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -349,18 +349,18 @@ public void testBindingWithFormatter() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(1.2));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(1.2f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1,2");
 
 			PropertyEditor editor = binder.getBindingResult().findEditor("myFloat", Float.class);
 			assertThat(editor).isNotNull();
-			editor.setValue(new Float(1.4));
+			editor.setValue(1.4f);
 			assertThat(editor.getAsText()).isEqualTo("1,4");
 
 			editor = binder.getBindingResult().findEditor("myFloat", null);
 			assertThat(editor).isNotNull();
 			editor.setAsText("1,6");
-			assertThat(editor.getValue()).isEqualTo(new Float(1.6));
+			assertThat(editor.getValue()).isEqualTo(1.6f);
 		}
 		finally {
 			LocaleContextHolder.resetLocaleContext();
@@ -368,7 +368,7 @@ public void testBindingWithFormatter() {
 	}
 
 	@Test
-	public void testBindingErrorWithFormatter() {
+	void testBindingErrorWithFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -381,7 +381,7 @@ public void testBindingErrorWithFormatter() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(0.0));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(0.0f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1x2");
 			assertThat(binder.getBindingResult().hasFieldErrors("myFloat")).isTrue();
 		}
@@ -391,7 +391,7 @@ public void testBindingErrorWithFormatter() {
 	}
 
 	@Test
-	public void testBindingErrorWithParseExceptionFromFormatter() {
+	void testBindingErrorWithParseExceptionFromFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -419,7 +419,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testBindingErrorWithRuntimeExceptionFromFormatter() {
+	void testBindingErrorWithRuntimeExceptionFromFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -447,7 +447,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testBindingWithFormatterAgainstList() {
+	void testBindingWithFormatterAgainstList() {
 		BeanWithIntegerList tb = new BeanWithIntegerList();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -469,7 +469,7 @@ public void testBindingWithFormatterAgainstList() {
 	}
 
 	@Test
-	public void testBindingErrorWithFormatterAgainstList() {
+	void testBindingErrorWithFormatterAgainstList() {
 		BeanWithIntegerList tb = new BeanWithIntegerList();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -492,7 +492,7 @@ public void testBindingErrorWithFormatterAgainstList() {
 	}
 
 	@Test
-	public void testBindingWithFormatterAgainstFields() {
+	void testBindingWithFormatterAgainstFields() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
@@ -506,18 +506,18 @@ public void testBindingWithFormatterAgainstFields() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(1.2));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(1.2f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1,2");
 
 			PropertyEditor editor = binder.getBindingResult().findEditor("myFloat", Float.class);
 			assertThat(editor).isNotNull();
-			editor.setValue(new Float(1.4));
+			editor.setValue(1.4f);
 			assertThat(editor.getAsText()).isEqualTo("1,4");
 
 			editor = binder.getBindingResult().findEditor("myFloat", null);
 			assertThat(editor).isNotNull();
 			editor.setAsText("1,6");
-			assertThat(editor.getValue()).isEqualTo(new Float(1.6));
+			assertThat(editor.getValue()).isEqualTo(1.6f);
 		}
 		finally {
 			LocaleContextHolder.resetLocaleContext();
@@ -525,7 +525,7 @@ public void testBindingWithFormatterAgainstFields() {
 	}
 
 	@Test
-	public void testBindingErrorWithFormatterAgainstFields() {
+	void testBindingErrorWithFormatterAgainstFields() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		binder.initDirectFieldAccess();
@@ -539,7 +539,7 @@ public void testBindingErrorWithFormatterAgainstFields() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(0.0));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(0.0f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1x2");
 			assertThat(binder.getBindingResult().hasFieldErrors("myFloat")).isTrue();
 		}
@@ -549,7 +549,7 @@ public void testBindingErrorWithFormatterAgainstFields() {
 	}
 
 	@Test
-	public void testBindingWithCustomFormatter() {
+	void testBindingWithCustomFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		binder.addCustomFormatter(new NumberStyleFormatter(), Float.class);
@@ -559,12 +559,12 @@ public void testBindingWithCustomFormatter() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(1.2));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(1.2f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1,2");
 
 			PropertyEditor editor = binder.getBindingResult().findEditor("myFloat", Float.class);
 			assertThat(editor).isNotNull();
-			editor.setValue(new Float(1.4));
+			editor.setValue(1.4f);
 			assertThat(editor.getAsText()).isEqualTo("1,4");
 
 			editor = binder.getBindingResult().findEditor("myFloat", null);
@@ -578,7 +578,7 @@ public void testBindingWithCustomFormatter() {
 	}
 
 	@Test
-	public void testBindingErrorWithCustomFormatter() {
+	void testBindingErrorWithCustomFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		binder.addCustomFormatter(new NumberStyleFormatter());
@@ -588,7 +588,7 @@ public void testBindingErrorWithCustomFormatter() {
 		LocaleContextHolder.setLocale(Locale.GERMAN);
 		try {
 			binder.bind(pvs);
-			assertThat(tb.getMyFloat()).isEqualTo(new Float(0.0));
+			assertThat(tb.getMyFloat()).isEqualTo(Float.valueOf(0.0f));
 			assertThat(binder.getBindingResult().getFieldValue("myFloat")).isEqualTo("1x2");
 			assertThat(binder.getBindingResult().hasFieldErrors("myFloat")).isTrue();
 			assertThat(binder.getBindingResult().getFieldError("myFloat").getCode()).isEqualTo("typeMismatch");
@@ -599,7 +599,7 @@ public void testBindingErrorWithCustomFormatter() {
 	}
 
 	@Test
-	public void testBindingErrorWithParseExceptionFromCustomFormatter() {
+	void testBindingErrorWithParseExceptionFromCustomFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 
@@ -624,7 +624,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testBindingErrorWithRuntimeExceptionFromCustomFormatter() {
+	void testBindingErrorWithRuntimeExceptionFromCustomFormatter() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 
@@ -649,7 +649,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testConversionWithInappropriateStringEditor() {
+	void testConversionWithInappropriateStringEditor() {
 		DataBinder dataBinder = new DataBinder(null);
 		DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
 		dataBinder.setConversionService(conversionService);
@@ -662,7 +662,7 @@ public void testConversionWithInappropriateStringEditor() {
 	}
 
 	@Test
-	public void testBindingWithAllowedFields() throws BindException {
+	void testBindingWithAllowedFields() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
 		binder.setAllowedFields("name", "myparam");
@@ -677,7 +677,7 @@ public void testBindingWithAllowedFields() throws BindException {
 	}
 
 	@Test
-	public void testBindingWithDisallowedFields() throws BindException {
+	void testBindingWithDisallowedFields() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
 		binder.setDisallowedFields("age");
@@ -695,7 +695,7 @@ public void testBindingWithDisallowedFields() throws BindException {
 	}
 
 	@Test
-	public void testBindingWithAllowedAndDisallowedFields() throws BindException {
+	void testBindingWithAllowedAndDisallowedFields() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
 		binder.setAllowedFields("name", "myparam");
@@ -709,12 +709,12 @@ public void testBindingWithAllowedAndDisallowedFields() throws BindException {
 		assertThat(rod.getName().equals("Rod")).as("changed name correctly").isTrue();
 		assertThat(rod.getAge() == 0).as("did not change age").isTrue();
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
-		assertThat(disallowedFields.length).isEqualTo(1);
+		assertThat(disallowedFields).hasSize(1);
 		assertThat(disallowedFields[0]).isEqualTo("age");
 	}
 
 	@Test
-	public void testBindingWithOverlappingAllowedAndDisallowedFields() throws BindException {
+	void testBindingWithOverlappingAllowedAndDisallowedFields() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
 		binder.setAllowedFields("name", "age");
@@ -728,12 +728,12 @@ public void testBindingWithOverlappingAllowedAndDisallowedFields() throws BindEx
 		assertThat(rod.getName().equals("Rod")).as("changed name correctly").isTrue();
 		assertThat(rod.getAge() == 0).as("did not change age").isTrue();
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
-		assertThat(disallowedFields.length).isEqualTo(1);
+		assertThat(disallowedFields).hasSize(1);
 		assertThat(disallowedFields[0]).isEqualTo("age");
 	}
 
 	@Test
-	public void testBindingWithAllowedFieldsUsingAsterisks() throws BindException {
+	void testBindingWithAllowedFieldsUsingAsterisks() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.setAllowedFields("nam*", "*ouchy");
@@ -750,7 +750,7 @@ public void testBindingWithAllowedFieldsUsingAsterisks() throws BindException {
 		assertThat("Rod".equals(rod.getTouchy())).as("changed touchy correctly").isTrue();
 		assertThat(rod.getAge() == 0).as("did not change age").isTrue();
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
-		assertThat(disallowedFields.length).isEqualTo(1);
+		assertThat(disallowedFields).hasSize(1);
 		assertThat(disallowedFields[0]).isEqualTo("age");
 
 		Map<?,?> m = binder.getBindingResult().getModel();
@@ -760,7 +760,7 @@ public void testBindingWithAllowedFieldsUsingAsterisks() throws BindException {
 	}
 
 	@Test
-	public void testBindingWithAllowedAndDisallowedMapFields() throws BindException {
+	void testBindingWithAllowedAndDisallowedMapFields() throws BindException {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod);
 		binder.setAllowedFields("someMap[key1]", "someMap[key2]");
@@ -779,7 +779,7 @@ public void testBindingWithAllowedAndDisallowedMapFields() throws BindException
 		assertThat(rod.getSomeMap().get("key3")).isNull();
 		assertThat(rod.getSomeMap().get("key4")).isNull();
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
-		assertThat(disallowedFields.length).isEqualTo(2);
+		assertThat(disallowedFields).hasSize(2);
 		assertThat(ObjectUtils.containsElement(disallowedFields, "someMap[key3]")).isTrue();
 		assertThat(ObjectUtils.containsElement(disallowedFields, "someMap[key4]")).isTrue();
 	}
@@ -788,7 +788,7 @@ public void testBindingWithAllowedAndDisallowedMapFields() throws BindException
 	 * Tests for required field, both null, non-existing and empty strings.
 	 */
 	@Test
-	public void testBindingWithRequiredFields() {
+	void testBindingWithRequiredFields() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 
@@ -819,7 +819,7 @@ public void testBindingWithRequiredFields() {
 	}
 
 	@Test
-	public void testBindingWithRequiredMapFields() {
+	void testBindingWithRequiredMapFields() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 
@@ -839,7 +839,7 @@ public void testBindingWithRequiredMapFields() {
 	}
 
 	@Test
-	public void testBindingWithNestedObjectCreation() {
+	void testBindingWithNestedObjectCreation() {
 		TestBean tb = new TestBean();
 
 		DataBinder binder = new DataBinder(tb, "person");
@@ -860,7 +860,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testCustomEditorWithOldValueAccess() {
+	void testCustomEditorWithOldValueAccess() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 
@@ -885,7 +885,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testCustomEditorForSingleProperty() {
+	void testCustomEditorForSingleProperty() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
@@ -925,7 +925,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testCustomEditorForPrimitiveProperty() {
+	void testCustomEditorForPrimitiveProperty() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 
@@ -949,7 +949,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testCustomEditorForAllStringProperties() {
+	void testCustomEditorForAllStringProperties() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 
@@ -981,7 +981,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testCustomFormatterForSingleProperty() {
+	void testCustomFormatterForSingleProperty() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
@@ -1021,7 +1021,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testCustomFormatterForPrimitiveProperty() {
+	void testCustomFormatterForPrimitiveProperty() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 
@@ -1045,7 +1045,7 @@ public String print(Integer object, Locale locale) {
 	}
 
 	@Test
-	public void testCustomFormatterForAllStringProperties() {
+	void testCustomFormatterForAllStringProperties() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 
@@ -1077,7 +1077,7 @@ public String print(String object, Locale locale) {
 	}
 
 	@Test
-	public void testJavaBeanPropertyConventions() {
+	void testJavaBeanPropertyConventions() {
 		Book book = new Book();
 		DataBinder binder = new DataBinder(book);
 
@@ -1101,7 +1101,7 @@ public void testJavaBeanPropertyConventions() {
 	}
 
 	@Test
-	public void testOptionalProperty() {
+	void testOptionalProperty() {
 		OptionalHolder bean = new OptionalHolder();
 		DataBinder binder = new DataBinder(bean);
 		binder.setConversionService(new DefaultConversionService());
@@ -1111,7 +1111,7 @@ public void testOptionalProperty() {
 		pvs.add("name", null);
 		binder.bind(pvs);
 		assertThat(bean.getId()).isEqualTo("1");
-		assertThat(bean.getName().isPresent()).isFalse();
+		assertThat(bean.getName()).isEmpty();
 
 		pvs = new MutablePropertyValues();
 		pvs.add("id", "2");
@@ -1122,7 +1122,7 @@ public void testOptionalProperty() {
 	}
 
 	@Test
-	public void testValidatorNoErrors() throws Exception {
+	void testValidatorNoErrors() throws Exception {
 		TestBean tb = new TestBean();
 		tb.setAge(33);
 		tb.setName("Rod");
@@ -1183,7 +1183,7 @@ public void testValidatorNoErrors() throws Exception {
 	}
 
 	@Test
-	public void testValidatorWithErrors() {
+	void testValidatorWithErrors() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 
@@ -1252,7 +1252,7 @@ public void testValidatorWithErrors() {
 	}
 
 	@Test
-	public void testValidatorWithErrorsAndCodesPrefix() {
+	void testValidatorWithErrorsAndCodesPrefix() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 
@@ -1324,7 +1324,7 @@ public void testValidatorWithErrorsAndCodesPrefix() {
 	}
 
 	@Test
-	public void testValidatorWithNestedObjectNull() {
+	void testValidatorWithNestedObjectNull() {
 		TestBean tb = new TestBean();
 		Errors errors = new BeanPropertyBindingResult(tb, "tb");
 		Validator testValidator = new TestBeanValidator();
@@ -1343,7 +1343,7 @@ public void testValidatorWithNestedObjectNull() {
 	}
 
 	@Test
-	public void testNestedValidatorWithoutNestedPath() {
+	void testNestedValidatorWithoutNestedPath() {
 		TestBean tb = new TestBean();
 		tb.setName("XXX");
 		Errors errors = new BeanPropertyBindingResult(tb, "tb");
@@ -1357,13 +1357,13 @@ public void testNestedValidatorWithoutNestedPath() {
 	}
 
 	@Test
-	public void testBindingStringArrayToIntegerSet() {
+	void testBindingStringArrayToIntegerSet() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(Set.class, new CustomCollectionEditor(TreeSet.class) {
 			@Override
 			protected Object convertElement(Object element) {
-				return new Integer(element.toString());
+				return Integer.valueOf(element.toString());
 			}
 		});
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -1386,7 +1386,7 @@ protected Object convertElement(Object element) {
 	}
 
 	@Test
-	public void testBindingNullToEmptyCollection() {
+	void testBindingNullToEmptyCollection() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(Set.class, new CustomCollectionEditor(TreeSet.class, true));
@@ -1400,7 +1400,7 @@ public void testBindingNullToEmptyCollection() {
 	}
 
 	@Test
-	public void testBindingToIndexedField() {
+	void testBindingToIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
@@ -1439,7 +1439,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testBindingToNestedIndexedField() {
+	void testBindingToNestedIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		tb.getArray()[0].setNestedIndexedBean(new IndexedTestBean());
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
@@ -1470,7 +1470,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testEditorForNestedIndexedField() {
+	void testEditorForNestedIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		tb.getArray()[0].setNestedIndexedBean(new IndexedTestBean());
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
@@ -1496,7 +1496,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testSpecificEditorForNestedIndexedField() {
+	void testSpecificEditorForNestedIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		tb.getArray()[0].setNestedIndexedBean(new IndexedTestBean());
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
@@ -1522,7 +1522,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testInnerSpecificEditorForNestedIndexedField() {
+	void testInnerSpecificEditorForNestedIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		tb.getArray()[0].setNestedIndexedBean(new IndexedTestBean());
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
@@ -1548,7 +1548,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testDirectBindingToIndexedField() {
+	void testDirectBindingToIndexedField() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
@@ -1601,7 +1601,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testDirectBindingToEmptyIndexedFieldWithRegisteredSpecificEditor() {
+	void testDirectBindingToEmptyIndexedFieldWithRegisteredSpecificEditor() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "map[key0]", new PropertyEditorSupport() {
@@ -1632,7 +1632,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testDirectBindingToEmptyIndexedFieldWithRegisteredGenericEditor() {
+	void testDirectBindingToEmptyIndexedFieldWithRegisteredGenericEditor() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
@@ -1663,7 +1663,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testCustomEditorWithSubclass() {
+	void testCustomEditorWithSubclass() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
@@ -1697,7 +1697,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void testBindToStringArrayWithArrayEditor() {
+	void testBindToStringArrayWithArrayEditor() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String[].class, "stringArray", new PropertyEditorSupport() {
@@ -1717,7 +1717,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testBindToStringArrayWithComponentEditor() {
+	void testBindToStringArrayWithComponentEditor() {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() {
@@ -1737,7 +1737,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void testBindingErrors() {
+	void testBindingErrors() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -1764,7 +1764,7 @@ public void testBindingErrors() {
 	}
 
 	@Test
-	public void testAddAllErrors() {
+	void testAddAllErrors() {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -1784,7 +1784,7 @@ public void testAddAllErrors() {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void testBindingWithResortedList() {
+	void testBindingWithResortedList() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -1802,7 +1802,7 @@ public void testBindingWithResortedList() {
 	}
 
 	@Test
-	public void testRejectWithoutDefaultMessage() {
+	void testRejectWithoutDefaultMessage() {
 		TestBean tb = new TestBean();
 		tb.setName("myName");
 		tb.setAge(99);
@@ -1820,7 +1820,7 @@ public void testRejectWithoutDefaultMessage() {
 	}
 
 	@Test
-	public void testBindExceptionSerializable() throws Exception {
+	void testBindExceptionSerializable() throws Exception {
 		SerializablePerson tb = new SerializablePerson();
 		tb.setName("myName");
 		tb.setAge(99);
@@ -1849,7 +1849,7 @@ public void testBindExceptionSerializable() throws Exception {
 	}
 
 	@Test
-	public void testTrackDisallowedFields() {
+	void testTrackDisallowedFields() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.setAllowedFields("name", "age");
@@ -1864,12 +1864,12 @@ public void testTrackDisallowedFields() {
 
 		assertThat(testBean.getName()).isEqualTo(name);
 		String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
-		assertThat(disallowedFields.length).isEqualTo(1);
+		assertThat(disallowedFields).hasSize(1);
 		assertThat(disallowedFields[0]).isEqualTo("beanName");
 	}
 
 	@Test
-	public void testAutoGrowWithinDefaultLimit() {
+	void testAutoGrowWithinDefaultLimit() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 
@@ -1877,11 +1877,11 @@ public void testAutoGrowWithinDefaultLimit() {
 		mpvs.add("friends[4]", "");
 		binder.bind(mpvs);
 
-		assertThat(testBean.getFriends().size()).isEqualTo(5);
+		assertThat(testBean.getFriends()).hasSize(5);
 	}
 
 	@Test
-	public void testAutoGrowBeyondDefaultLimit() {
+	void testAutoGrowBeyondDefaultLimit() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 
@@ -1894,7 +1894,7 @@ public void testAutoGrowBeyondDefaultLimit() {
 	}
 
 	@Test
-	public void testAutoGrowWithinCustomLimit() {
+	void testAutoGrowWithinCustomLimit() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.setAutoGrowCollectionLimit(10);
@@ -1903,11 +1903,11 @@ public void testAutoGrowWithinCustomLimit() {
 		mpvs.add("friends[4]", "");
 		binder.bind(mpvs);
 
-		assertThat(testBean.getFriends().size()).isEqualTo(5);
+		assertThat(testBean.getFriends()).hasSize(5);
 	}
 
 	@Test
-	public void testAutoGrowBeyondCustomLimit() {
+	void testAutoGrowBeyondCustomLimit() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.setAutoGrowCollectionLimit(10);
@@ -1921,7 +1921,7 @@ public void testAutoGrowBeyondCustomLimit() {
 	}
 
 	@Test
-	public void testNestedGrowingList() {
+	void testNestedGrowingList() {
 		Form form = new Form();
 		DataBinder binder = new DataBinder(form, "form");
 		MutablePropertyValues mpv = new MutablePropertyValues();
@@ -1937,7 +1937,7 @@ public void testNestedGrowingList() {
 	}
 
 	@Test
-	public void testFieldErrorAccessVariations() {
+	void testFieldErrorAccessVariations() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		assertThat(binder.getBindingResult().getGlobalError()).isNull();
@@ -1958,7 +1958,7 @@ public void testFieldErrorAccessVariations() {
 	}
 
 	@Test  // SPR-14888
-	public void testSetAutoGrowCollectionLimit() {
+	void testSetAutoGrowCollectionLimit() {
 		BeanWithIntegerList tb = new BeanWithIntegerList();
 		DataBinder binder = new DataBinder(tb);
 		binder.setAutoGrowCollectionLimit(257);
@@ -1968,11 +1968,11 @@ public void testSetAutoGrowCollectionLimit() {
 		binder.bind(pvs);
 		assertThat(tb.getIntegerList().size()).isEqualTo(257);
 		assertThat(tb.getIntegerList().get(256)).isEqualTo(Integer.valueOf(1));
-		assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(Integer.valueOf(1));
+		assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(1);
 	}
 
 	@Test  // SPR-14888
-	public void testSetAutoGrowCollectionLimitAfterInitialization() {
+	void testSetAutoGrowCollectionLimitAfterInitialization() {
 		DataBinder binder = new DataBinder(new BeanWithIntegerList());
 		binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
 		assertThatIllegalStateException().isThrownBy(() ->
@@ -1981,7 +1981,7 @@ public void testSetAutoGrowCollectionLimitAfterInitialization() {
 	}
 
 	@Test // SPR-15009
-	public void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForBeanPropertyAccess() {
+	void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForBeanPropertyAccess() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		DefaultMessageCodesResolver messageCodesResolver = new DefaultMessageCodesResolver();
@@ -1998,7 +1998,7 @@ public void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForBea
 	}
 
 	@Test // SPR-15009
-	public void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForDirectFieldAccess() {
+	void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForDirectFieldAccess() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		DefaultMessageCodesResolver messageCodesResolver = new DefaultMessageCodesResolver();
@@ -2013,7 +2013,7 @@ public void testSetCustomMessageCodesResolverBeforeInitializeBindingResultForDir
 	}
 
 	@Test  // SPR-15009
-	public void testSetCustomMessageCodesResolverAfterInitializeBindingResult() {
+	void testSetCustomMessageCodesResolverAfterInitializeBindingResult() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.initBeanPropertyAccess();
@@ -2028,7 +2028,7 @@ public void testSetCustomMessageCodesResolverAfterInitializeBindingResult() {
 	}
 
 	@Test  // SPR-15009
-	public void testSetMessageCodesResolverIsNullAfterInitializeBindingResult() {
+	void testSetMessageCodesResolverIsNullAfterInitializeBindingResult() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.initBeanPropertyAccess();
@@ -2042,7 +2042,7 @@ public void testSetMessageCodesResolverIsNullAfterInitializeBindingResult() {
 	}
 
 	@Test  // SPR-15009
-	public void testCallSetMessageCodesResolverTwice() {
+	void testCallSetMessageCodesResolverTwice() {
 
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
@@ -2053,7 +2053,7 @@ public void testCallSetMessageCodesResolverTwice() {
 	}
 
 	@Test // gh-24347
-	public void overrideBindingResultType() {
+	void overrideBindingResultType() {
 		TestBean testBean = new TestBean();
 		DataBinder binder = new DataBinder(testBean, "testBean");
 		binder.initDirectFieldAccess();
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index aa6cf358117f..68a1cc018da1 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ void isEmptyCollection() {
 		Set<String> set = new HashSet<>();
 		set.add("foo");
 		assertThat(isEmpty(set)).isFalse();
-		assertThat(isEmpty(Arrays.asList("foo"))).isFalse();
+		assertThat(isEmpty(Collections.singletonList("foo"))).isFalse();
 	}
 
 	@Test
@@ -159,7 +159,7 @@ void toObjectArrayWithNull() {
 	void toObjectArrayWithEmptyPrimitiveArray() {
 		Object[] objects = ObjectUtils.toObjectArray(new byte[] {});
 		assertThat(objects).isNotNull();
-		assertThat(objects.length).isEqualTo(0);
+		assertThat(objects).hasSize(0);
 	}
 
 	@Test
@@ -179,7 +179,7 @@ void addObjectToArraySunnyDay() {
 		String[] array = new String[] {"foo", "bar"};
 		String newElement = "baz";
 		Object[] newArray = ObjectUtils.addObjectToArray(array, newElement);
-		assertThat(newArray.length).isEqualTo(3);
+		assertThat(newArray).hasSize(3);
 		assertThat(newArray[2]).isEqualTo(newElement);
 	}
 
@@ -188,7 +188,7 @@ void addObjectToArrayWhenEmpty() {
 		String[] array = new String[0];
 		String newElement = "foo";
 		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
-		assertThat(newArray.length).isEqualTo(1);
+		assertThat(newArray).hasSize(1);
 		assertThat(newArray[0]).isEqualTo(newElement);
 	}
 
@@ -198,7 +198,7 @@ void addObjectToSingleNonNullElementArray() {
 		String[] array = new String[] {existingElement};
 		String newElement = "bar";
 		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
-		assertThat(newArray.length).isEqualTo(2);
+		assertThat(newArray).hasSize(2);
 		assertThat(newArray[0]).isEqualTo(existingElement);
 		assertThat(newArray[1]).isEqualTo(newElement);
 	}
@@ -208,8 +208,8 @@ void addObjectToSingleNullElementArray() {
 		String[] array = new String[] {null};
 		String newElement = "bar";
 		String[] newArray = ObjectUtils.addObjectToArray(array, newElement);
-		assertThat(newArray.length).isEqualTo(2);
-		assertThat(newArray[0]).isEqualTo(null);
+		assertThat(newArray).hasSize(2);
+		assertThat(newArray[0]).isNull();
 		assertThat(newArray[1]).isEqualTo(newElement);
 	}
 
@@ -217,15 +217,15 @@ void addObjectToSingleNullElementArray() {
 	void addObjectToNullArray() throws Exception {
 		String newElement = "foo";
 		String[] newArray = ObjectUtils.addObjectToArray(null, newElement);
-		assertThat(newArray.length).isEqualTo(1);
+		assertThat(newArray).hasSize(1);
 		assertThat(newArray[0]).isEqualTo(newElement);
 	}
 
 	@Test
 	void addNullObjectToNullArray() throws Exception {
 		Object[] newArray = ObjectUtils.addObjectToArray(null, null);
-		assertThat(newArray.length).isEqualTo(1);
-		assertThat(newArray[0]).isEqualTo(null);
+		assertThat(newArray).hasSize(1);
+		assertThat(newArray[0]).isNull();
 	}
 
 	@Test
@@ -260,7 +260,7 @@ void hashCodeWithDouble() {
 	@Deprecated
 	void hashCodeWithFloat() {
 		float flt = 34.8f;
-		int expected = (new Float(flt)).hashCode();
+		int expected = (Float.valueOf(flt)).hashCode();
 		assertThat(ObjectUtils.hashCode(flt)).isEqualTo(expected);
 	}
 
@@ -268,7 +268,7 @@ void hashCodeWithFloat() {
 	@Deprecated
 	void hashCodeWithLong() {
 		long lng = 883L;
-		int expected = (new Long(lng)).hashCode();
+		int expected = (Long.valueOf(lng)).hashCode();
 		assertThat(ObjectUtils.hashCode(lng)).isEqualTo(expected);
 	}
 
@@ -282,7 +282,7 @@ void identityToString() {
 
 	@Test
 	void identityToStringWithNullObject() {
-		assertThat(ObjectUtils.identityToString(null)).isEqualTo("");
+		assertThat(ObjectUtils.identityToString(null)).isEmpty();
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
index 922ec4a51a02..69bfa4fb4f4c 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,11 +41,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SuppressWarnings("rawtypes")
-public class IndexingTests {
+class IndexingTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void indexIntoGenericPropertyContainingMap() {
+	void indexIntoGenericPropertyContainingMap() {
 		Map<String, String> property = new HashMap<>();
 		property.put("foo", "bar");
 		this.property = property;
@@ -63,7 +63,7 @@ public void indexIntoGenericPropertyContainingMap() {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void indexIntoGenericPropertyContainingMapObject() {
+	void indexIntoGenericPropertyContainingMapObject() {
 		Map<String, Map<String, String>> property = new HashMap<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("foo", "bar");
@@ -112,7 +112,7 @@ public Class<?>[] getSpecificTargetClasses() {
 	}
 
 	@Test
-	public void setGenericPropertyContainingMap() {
+	void setGenericPropertyContainingMap() {
 		Map<String, String> property = new HashMap<>();
 		property.put("foo", "bar");
 		this.property = property;
@@ -127,7 +127,7 @@ public void setGenericPropertyContainingMap() {
 	}
 
 	@Test
-	public void setPropertyContainingMap() {
+	void setPropertyContainingMap() {
 		Map<Integer, Integer> property = new HashMap<>();
 		property.put(9, 3);
 		this.parameterizedMap = property;
@@ -144,7 +144,7 @@ public void setPropertyContainingMap() {
 	public Map<Integer, Integer> parameterizedMap;
 
 	@Test
-	public void setPropertyContainingMapAutoGrow() {
+	void setPropertyContainingMapAutoGrow() {
 		SpelExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, false));
 		Expression expression = parser.parseExpression("parameterizedMap");
 		assertThat(expression.getValueTypeDescriptor(this).toString()).isEqualTo("java.util.Map<java.lang.Integer, java.lang.Integer>");
@@ -156,7 +156,7 @@ public void setPropertyContainingMapAutoGrow() {
 	}
 
 	@Test
-	public void indexIntoGenericPropertyContainingList() {
+	void indexIntoGenericPropertyContainingList() {
 		List<String> property = new ArrayList<>();
 		property.add("bar");
 		this.property = property;
@@ -169,7 +169,7 @@ public void indexIntoGenericPropertyContainingList() {
 	}
 
 	@Test
-	public void setGenericPropertyContainingList() {
+	void setGenericPropertyContainingList() {
 		List<Integer> property = new ArrayList<>();
 		property.add(3);
 		this.property = property;
@@ -184,7 +184,7 @@ public void setGenericPropertyContainingList() {
 	}
 
 	@Test
-	public void setGenericPropertyContainingListAutogrow() {
+	void setGenericPropertyContainingListAutogrow() {
 		List<Integer> property = new ArrayList<>();
 		this.property = property;
 		SpelExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
@@ -203,7 +203,7 @@ public void setGenericPropertyContainingListAutogrow() {
 	public List<BigDecimal> decimals;
 
 	@Test
-	public void autoGrowListOfElementsWithoutDefaultConstructor() {
+	void autoGrowListOfElementsWithoutDefaultConstructor() {
 		this.decimals = new ArrayList<>();
 		SpelExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
 		parser.parseExpression("decimals[0]").setValue(this, "123.4");
@@ -211,7 +211,7 @@ public void autoGrowListOfElementsWithoutDefaultConstructor() {
 	}
 
 	@Test
-	public void indexIntoPropertyContainingListContainingNullElement() {
+	void indexIntoPropertyContainingListContainingNullElement() {
 		this.decimals = new ArrayList<>();
 		this.decimals.add(null);
 		this.decimals.add(BigDecimal.ONE);
@@ -221,7 +221,7 @@ public void indexIntoPropertyContainingListContainingNullElement() {
 	}
 
 	@Test
-	public void indexIntoPropertyContainingList() {
+	void indexIntoPropertyContainingList() {
 		List<Integer> property = new ArrayList<>();
 		property.add(3);
 		this.parameterizedList = property;
@@ -236,7 +236,7 @@ public void indexIntoPropertyContainingList() {
 	public List<Integer> parameterizedList;
 
 	@Test
-	public void indexIntoPropertyContainingListOfList() {
+	void indexIntoPropertyContainingListOfList() {
 		List<List<Integer>> property = new ArrayList<>();
 		property.add(Arrays.asList(3));
 		this.parameterizedListOfList = property;
@@ -251,7 +251,7 @@ public void indexIntoPropertyContainingListOfList() {
 	public List<List<Integer>> parameterizedListOfList;
 
 	@Test
-	public void setPropertyContainingList() {
+	void setPropertyContainingList() {
 		List<Integer> property = new ArrayList<>();
 		property.add(3);
 		this.parameterizedList = property;
@@ -266,7 +266,7 @@ public void setPropertyContainingList() {
 	}
 
 	@Test
-	public void indexIntoGenericPropertyContainingNullList() {
+	void indexIntoGenericPropertyContainingNullList() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(true, true);
 		SpelExpressionParser parser = new SpelExpressionParser(configuration);
 		Expression expression = parser.parseExpression("property");
@@ -282,7 +282,7 @@ public void indexIntoGenericPropertyContainingNullList() {
 	}
 
 	@Test
-	public void indexIntoGenericPropertyContainingGrowingList() {
+	void indexIntoGenericPropertyContainingGrowingList() {
 		List<String> property = new ArrayList<>();
 		this.property = property;
 		SpelParserConfiguration configuration = new SpelParserConfiguration(true, true);
@@ -300,7 +300,7 @@ public void indexIntoGenericPropertyContainingGrowingList() {
 	}
 
 	@Test
-	public void indexIntoGenericPropertyContainingGrowingList2() {
+	void indexIntoGenericPropertyContainingGrowingList2() {
 		List<String> property2 = new ArrayList<>();
 		this.property2 = property2;
 		SpelParserConfiguration configuration = new SpelParserConfiguration(true, true);
@@ -320,7 +320,7 @@ public void indexIntoGenericPropertyContainingGrowingList2() {
 	public List property2;
 
 	@Test
-	public void indexIntoGenericPropertyContainingArray() {
+	void indexIntoGenericPropertyContainingArray() {
 		String[] property = new String[] { "bar" };
 		this.property = property;
 		SpelExpressionParser parser = new SpelExpressionParser();
@@ -332,7 +332,7 @@ public void indexIntoGenericPropertyContainingArray() {
 	}
 
 	@Test
-	public void emptyList() {
+	void emptyList() {
 		listOfScalarNotGeneric = new ArrayList();
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("listOfScalarNotGeneric");
@@ -342,7 +342,7 @@ public void emptyList() {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void resolveCollectionElementType() {
+	void resolveCollectionElementType() {
 		listNotGeneric = new ArrayList(2);
 		listNotGeneric.add(5);
 		listNotGeneric.add(6);
@@ -353,7 +353,7 @@ public void resolveCollectionElementType() {
 	}
 
 	@Test
-	public void resolveCollectionElementTypeNull() {
+	void resolveCollectionElementTypeNull() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("listNotGeneric");
 		assertThat(expression.getValueTypeDescriptor(this).toString()).isEqualTo("@org.springframework.expression.spel.IndexingTests$FieldAnnotation java.util.List<?>");
@@ -370,7 +370,7 @@ public void resolveCollectionElementTypeNull() {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void resolveMapKeyValueTypes() {
+	void resolveMapKeyValueTypes() {
 		mapNotGeneric = new HashMap();
 		mapNotGeneric.put("baseAmount", 3.11);
 		mapNotGeneric.put("bonusAmount", 7.17);
@@ -384,12 +384,12 @@ public void resolveMapKeyValueTypes() {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void testListOfScalar() {
+	void testListOfScalar() {
 		listOfScalarNotGeneric = new ArrayList(1);
 		listOfScalarNotGeneric.add("5");
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("listOfScalarNotGeneric[0]");
-		assertThat(expression.getValue(this, Integer.class)).isEqualTo(new Integer(5));
+		assertThat(expression.getValue(this, Integer.class)).isEqualTo(Integer.valueOf(5));
 	}
 
 	public List listOfScalarNotGeneric;
@@ -397,7 +397,7 @@ public void testListOfScalar() {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void testListsOfMap() {
+	void testListsOfMap() {
 		listOfMapsNotGeneric = new ArrayList();
 		Map map = new HashMap();
 		map.put("fruit", "apple");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
index 92fef3bec695..baef9bd558c9 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,10 @@
  * @author Juergen Hoeller
  * @author Giovanni Dall'Oglio Risso
  */
-public class OperatorTests extends AbstractExpressionTests {
+class OperatorTests extends AbstractExpressionTests {
 
 	@Test
-	public void testEqual() {
+	void testEqual() {
 		evaluate("3 == 5", false, Boolean.class);
 		evaluate("5 == 3", false, Boolean.class);
 		evaluate("6 == 6", true, Boolean.class);
@@ -85,7 +85,7 @@ public void testEqual() {
 	}
 
 	@Test
-	public void testNotEqual() {
+	void testNotEqual() {
 		evaluate("3 != 5", true, Boolean.class);
 		evaluate("5 != 3", true, Boolean.class);
 		evaluate("6 != 6", false, Boolean.class);
@@ -134,7 +134,7 @@ public void testNotEqual() {
 	}
 
 	@Test
-	public void testLessThan() {
+	void testLessThan() {
 		evaluate("5 < 5", false, Boolean.class);
 		evaluate("3 < 5", true, Boolean.class);
 		evaluate("5 < 3", false, Boolean.class);
@@ -176,7 +176,7 @@ public void testLessThan() {
 	}
 
 	@Test
-	public void testLessThanOrEqual() {
+	void testLessThanOrEqual() {
 		evaluate("3 <= 5", true, Boolean.class);
 		evaluate("5 <= 3", false, Boolean.class);
 		evaluate("6 <= 6", true, Boolean.class);
@@ -225,7 +225,7 @@ public void testLessThanOrEqual() {
 	}
 
 	@Test
-	public void testGreaterThan() {
+	void testGreaterThan() {
 		evaluate("3 > 5", false, Boolean.class);
 		evaluate("5 > 3", true, Boolean.class);
 		evaluate("3L > 5L", false, Boolean.class);
@@ -266,7 +266,7 @@ public void testGreaterThan() {
 	}
 
 	@Test
-	public void testGreaterThanOrEqual() {
+	void testGreaterThanOrEqual() {
 		evaluate("3 >= 5", false, Boolean.class);
 		evaluate("5 >= 3", true, Boolean.class);
 		evaluate("6 >= 6", true, Boolean.class);
@@ -315,27 +315,27 @@ public void testGreaterThanOrEqual() {
 	}
 
 	@Test
-	public void testIntegerLiteral() {
+	void testIntegerLiteral() {
 		evaluate("3", 3, Integer.class);
 	}
 
 	@Test
-	public void testRealLiteral() {
+	void testRealLiteral() {
 		evaluate("3.5", 3.5d, Double.class);
 	}
 
 	@Test
-	public void testMultiplyStringInt() {
+	void testMultiplyStringInt() {
 		evaluate("'a' * 5", "aaaaa", String.class);
 	}
 
 	@Test
-	public void testMultiplyDoubleDoubleGivesDouble() {
+	void testMultiplyDoubleDoubleGivesDouble() {
 		evaluate("3.0d * 5.0d", 15.0d, Double.class);
 	}
 
 	@Test
-	public void testMixedOperandsBigDecimal() {
+	void testMixedOperandsBigDecimal() {
 		evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
 		evaluate("3L * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
 		evaluate("3.0d * new java.math.BigDecimal('5')", new BigDecimal("15.0"), BigDecimal.class);
@@ -361,19 +361,19 @@ public void testMixedOperandsBigDecimal() {
 	}
 
 	@Test
-	public void testMathOperatorAdd02() {
+	void testMathOperatorAdd02() {
 		evaluate("'hello' + ' ' + 'world'", "hello world", String.class);
 	}
 
 	@Test
-	public void testMathOperatorsInChains() {
+	void testMathOperatorsInChains() {
 		evaluate("1+2+3",6,Integer.class);
 		evaluate("2*3*4",24,Integer.class);
 		evaluate("12-1-2",9,Integer.class);
 	}
 
 	@Test
-	public void testIntegerArithmetic() {
+	void testIntegerArithmetic() {
 		evaluate("2 + 4", "6", Integer.class);
 		evaluate("5 - 4", "1", Integer.class);
 		evaluate("3 * 5", 15, Integer.class);
@@ -388,7 +388,7 @@ public void testIntegerArithmetic() {
 	}
 
 	@Test
-	public void testPlus() throws Exception {
+	void testPlus() {
 		evaluate("7 + 2", "9", Integer.class);
 		evaluate("3.0f + 5.0f", 8.0f, Float.class);
 		evaluate("3.0d + 5.0d", 8.0d, Double.class);
@@ -419,7 +419,7 @@ public void testPlus() throws Exception {
 	}
 
 	@Test
-	public void testMinus() throws Exception {
+	void testMinus() {
 		evaluate("'c' - 2", "a", String.class);
 		evaluate("3.0f - 5.0f", -2.0f, Float.class);
 		evaluateAndCheckError("'ab' - 2", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
@@ -437,7 +437,7 @@ public void testMinus() throws Exception {
 	}
 
 	@Test
-	public void testModulus() {
+	void testModulus() {
 		evaluate("3%2",1,Integer.class);
 		evaluate("3L%2L",1L,Long.class);
 		evaluate("3.0f%2.0f",1f,Float.class);
@@ -448,7 +448,7 @@ public void testModulus() {
 	}
 
 	@Test
-	public void testDivide() {
+	void testDivide() {
 		evaluate("3.0f / 5.0f", 0.6f, Float.class);
 		evaluate("4L/2L",2L,Long.class);
 		evaluate("3.0f div 5.0f", 0.6f, Float.class);
@@ -461,17 +461,17 @@ public void testDivide() {
 	}
 
 	@Test
-	public void testMathOperatorDivide_ConvertToDouble() {
-		evaluateAndAskForReturnType("8/4", new Double(2.0), Double.class);
+	void testMathOperatorDivide_ConvertToDouble() {
+		evaluateAndAskForReturnType("8/4", 2.0, Double.class);
 	}
 
 	@Test
-	public void testMathOperatorDivide04_ConvertToFloat() {
-		evaluateAndAskForReturnType("8/4", new Float(2.0), Float.class);
+	void testMathOperatorDivide04_ConvertToFloat() {
+		evaluateAndAskForReturnType("8/4", 2.0F, Float.class);
 	}
 
 	@Test
-	public void testDoubles() {
+	void testDoubles() {
 		evaluate("3.0d == 5.0d", false, Boolean.class);
 		evaluate("3.0d == 3.0d", true, Boolean.class);
 		evaluate("3.0d != 5.0d", true, Boolean.class);
@@ -484,7 +484,7 @@ public void testDoubles() {
 	}
 
 	@Test
-	public void testBigDecimals() {
+	void testBigDecimals() {
 		evaluate("3 + new java.math.BigDecimal('5')", new BigDecimal("8"), BigDecimal.class);
 		evaluate("3 - new java.math.BigDecimal('5')", new BigDecimal("-2"), BigDecimal.class);
 		evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
@@ -495,7 +495,7 @@ public void testBigDecimals() {
 	}
 
 	@Test
-	public void testOperatorNames() throws Exception {
+	void testOperatorNames() {
 		Operator node = getOperatorNode((SpelExpression)parser.parseExpression("1==3"));
 		assertThat(node.getOperatorName()).isEqualTo("==");
 
@@ -534,13 +534,13 @@ public void testOperatorNames() throws Exception {
 	}
 
 	@Test
-	public void testOperatorOverloading() {
+	void testOperatorOverloading() {
 		evaluateAndCheckError("'a' * '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 		evaluateAndCheckError("'a' ^ '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 	}
 
 	@Test
-	public void testPower() {
+	void testPower() {
 		evaluate("3^2",9,Integer.class);
 		evaluate("3.0d^2.0d",9.0d,Double.class);
 		evaluate("3L^2L",9L,Long.class);
@@ -549,7 +549,7 @@ public void testPower() {
 	}
 
 	@Test
-	public void testMixedOperands_FloatsAndDoubles() {
+	void testMixedOperands_FloatsAndDoubles() {
 		evaluate("3.0d + 5.0f", 8.0d, Double.class);
 		evaluate("3.0D - 5.0f", -2.0d, Double.class);
 		evaluate("3.0f * 5.0d", 15.0d, Double.class);
@@ -558,7 +558,7 @@ public void testMixedOperands_FloatsAndDoubles() {
 	}
 
 	@Test
-	public void testMixedOperands_DoublesAndInts() {
+	void testMixedOperands_DoublesAndInts() {
 		evaluate("3.0d + 5", 8.0d, Double.class);
 		evaluate("3.0D - 5", -2.0d, Double.class);
 		evaluate("3.0f * 5", 15.0f, Float.class);
@@ -569,7 +569,7 @@ public void testMixedOperands_DoublesAndInts() {
 	}
 
 	@Test
-	public void testStrings() {
+	void testStrings() {
 		evaluate("'abc' == 'abc'", true, Boolean.class);
 		evaluate("'abc' == 'def'", false, Boolean.class);
 		evaluate("'abc' != 'abc'", false, Boolean.class);
@@ -577,7 +577,7 @@ public void testStrings() {
 	}
 
 	@Test
-	public void testLongs() {
+	void testLongs() {
 		evaluate("3L == 4L", false, Boolean.class);
 		evaluate("3L == 3L", true, Boolean.class);
 		evaluate("3L != 4L", true, Boolean.class);
@@ -588,7 +588,7 @@ public void testLongs() {
 	}
 
 	@Test
-	public void testBigIntegers() {
+	void testBigIntegers() {
 		evaluate("3 + new java.math.BigInteger('5')", new BigInteger("8"), BigInteger.class);
 		evaluate("3 - new java.math.BigInteger('5')", new BigInteger("-2"), BigInteger.class);
 		evaluate("3 * new java.math.BigInteger('5')", new BigInteger("15"), BigInteger.class);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
index 74af20b3f1ed..49fa8c182c44 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -128,7 +128,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 
 
 	@Test
-	public void typeReference() throws Exception {
+	void typeReference() {
 		expression = parse("T(String)");
 		assertThat(expression.getValue()).isEqualTo(String.class);
 		assertCanCompile(expression);
@@ -196,7 +196,7 @@ public void typeReference() throws Exception {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void operatorInstanceOf() throws Exception {
+	void operatorInstanceOf() {
 		expression = parse("'xyz' instanceof T(String)");
 		assertThat(expression.getValue()).isEqualTo(true);
 		assertCanCompile(expression);
@@ -245,7 +245,7 @@ public void operatorInstanceOf() throws Exception {
 	}
 
 	@Test
-	public void operatorInstanceOf_SPR14250() throws Exception {
+	void operatorInstanceOf_SPR14250() throws Exception {
 		// primitive left operand - should get boxed, return true
 		expression = parse("3 instanceof T(Integer)");
 		assertThat(expression.getValue()).isEqualTo(true);
@@ -292,7 +292,7 @@ public void operatorInstanceOf_SPR14250() throws Exception {
 	}
 
 	@Test
-	public void stringLiteral() throws Exception {
+	void stringLiteral() throws Exception {
 		expression = parser.parseExpression("'abcde'");
 		assertThat(expression.getValue(new TestClass1(), String.class)).isEqualTo("abcde");
 		assertCanCompile(expression);
@@ -307,18 +307,18 @@ public void stringLiteral() throws Exception {
 	}
 
 	@Test
-	public void nullLiteral() throws Exception {
+	void nullLiteral() throws Exception {
 		expression = parser.parseExpression("null");
 		Object resultI = expression.getValue(new TestClass1(), Object.class);
 		assertCanCompile(expression);
 		Object resultC = expression.getValue(new TestClass1(), Object.class);
-		assertThat(resultI).isEqualTo(null);
-		assertThat(resultC).isEqualTo(null);
-		assertThat(resultC).isEqualTo(null);
+		assertThat(resultI).isNull();
+		assertThat(resultC).isNull();
+		assertThat(resultC).isNull();
 	}
 
 	@Test
-	public void realLiteral() throws Exception {
+	void realLiteral() throws Exception {
 		expression = parser.parseExpression("3.4d");
 		double resultI = expression.getValue(new TestClass1(), Double.TYPE);
 		assertCanCompile(expression);
@@ -332,7 +332,7 @@ public void realLiteral() throws Exception {
 
 	@SuppressWarnings("rawtypes")
 	@Test
-	public void inlineList() throws Exception {
+	void inlineList() throws Exception {
 		expression = parser.parseExpression("'abcde'.substring({1,3,4}[0])");
 		Object o = expression.getValue();
 		assertThat(o).isEqualTo("bcde");
@@ -371,7 +371,7 @@ public void inlineList() throws Exception {
 
 	@SuppressWarnings("rawtypes")
 	@Test
-	public void nestedInlineLists() throws Exception {
+	void nestedInlineLists() throws Exception {
 		Object o = null;
 
 		expression = parser.parseExpression("{{1,2,3},{4,5,6},{7,8,9}}");
@@ -446,7 +446,7 @@ public void nestedInlineLists() throws Exception {
 	}
 
 	@Test
-	public void intLiteral() throws Exception {
+	void intLiteral() throws Exception {
 		expression = parser.parseExpression("42");
 		int resultI = expression.getValue(new TestClass1(), Integer.TYPE);
 		assertCanCompile(expression);
@@ -477,7 +477,7 @@ public void intLiteral() throws Exception {
 	}
 
 	@Test
-	public void longLiteral() throws Exception {
+	void longLiteral() throws Exception {
 		expression = parser.parseExpression("99L");
 		long resultI = expression.getValue(new TestClass1(), Long.TYPE);
 		assertCanCompile(expression);
@@ -487,24 +487,24 @@ public void longLiteral() throws Exception {
 	}
 
 	@Test
-	public void booleanLiteral() throws Exception {
+	void booleanLiteral() throws Exception {
 		expression = parser.parseExpression("true");
 		boolean resultI = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
+		assertThat(resultI).isTrue();
 		assertThat(SpelCompiler.compile(expression)).isTrue();
 		boolean resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultC).isTrue();
 
 		expression = parser.parseExpression("false");
 		resultI = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(false);
+		assertThat(resultI).isFalse();
 		assertThat(SpelCompiler.compile(expression)).isTrue();
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultC).isEqualTo(false);
+		assertThat(resultC).isFalse();
 	}
 
 	@Test
-	public void floatLiteral() throws Exception {
+	void floatLiteral() throws Exception {
 		expression = parser.parseExpression("3.4f");
 		float resultI = expression.getValue(new TestClass1(), Float.TYPE);
 		assertCanCompile(expression);
@@ -517,42 +517,42 @@ public void floatLiteral() throws Exception {
 	}
 
 	@Test
-	public void opOr() throws Exception {
+	void opOr() throws Exception {
 		Expression expression = parser.parseExpression("false or false");
 		boolean resultI = expression.getValue(1, Boolean.TYPE);
 		SpelCompiler.compile(expression);
 		boolean resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(false);
-		assertThat(resultC).isEqualTo(false);
+		assertThat(resultI).isFalse();
+		assertThat(resultC).isFalse();
 
 		expression = parser.parseExpression("false or true");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		assertCanCompile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultI).isTrue();
+		assertThat(resultC).isTrue();
 
 		expression = parser.parseExpression("true or false");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		assertCanCompile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultI).isTrue();
+		assertThat(resultC).isTrue();
 
 		expression = parser.parseExpression("true or true");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		assertCanCompile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultI).isTrue();
+		assertThat(resultC).isTrue();
 
 		TestClass4 tc = new TestClass4();
 		expression = parser.parseExpression("getfalse() or gettrue()");
 		resultI = expression.getValue(tc, Boolean.TYPE);
 		assertCanCompile(expression);
 		resultC = expression.getValue(tc, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultI).isTrue();
+		assertThat(resultC).isTrue();
 
 		// Can't compile this as we aren't going down the getfalse() branch in our evaluation
 		expression = parser.parseExpression("gettrue() or getfalse()");
@@ -584,29 +584,29 @@ public void opAnd() throws Exception {
 		boolean resultI = expression.getValue(1, Boolean.TYPE);
 		SpelCompiler.compile(expression);
 		boolean resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(false);
-		assertThat(resultC).isEqualTo(false);
+		assertThat(resultI).isFalse();
+		assertThat(resultC).isFalse();
 
 		expression = parser.parseExpression("false and true");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		SpelCompiler.compile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(false);
-		assertThat(resultC).isEqualTo(false);
+		assertThat(resultI).isFalse();
+		assertThat(resultC).isFalse();
 
 		expression = parser.parseExpression("true and false");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		SpelCompiler.compile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(false);
-		assertThat(resultC).isEqualTo(false);
+		assertThat(resultI).isFalse();
+		assertThat(resultC).isFalse();
 
 		expression = parser.parseExpression("true and true");
 		resultI = expression.getValue(1, Boolean.TYPE);
 		SpelCompiler.compile(expression);
 		resultC = expression.getValue(1, Boolean.TYPE);
-		assertThat(resultI).isEqualTo(true);
-		assertThat(resultC).isEqualTo(true);
+		assertThat(resultI).isTrue();
+		assertThat(resultC).isTrue();
 
 		TestClass4 tc = new TestClass4();
 
@@ -3481,7 +3481,7 @@ public void constructorReference() throws Exception {
 		assertThat(tc8.s).isEqualTo("123");
 		assertThat(tc8.d).isCloseTo(4.0d, within(0.5d));
 
-		assertThat(tc8.z).isEqualTo(true);
+		assertThat(tc8.z).isTrue();
 
 		// no-arg ctor
 		expression = parser.parseExpression("new " + testclass8 + "()");
@@ -3507,7 +3507,7 @@ public void constructorReference() throws Exception {
 	}
 
 	@Test
-	public void methodReferenceReflectiveMethodSelectionWithVarargs() throws Exception {
+	void methodReferenceReflectiveMethodSelectionWithVarargs() throws Exception {
 		TestClass10 tc = new TestClass10();
 
 		// Should call the non varargs version of concat
@@ -3526,11 +3526,11 @@ public void methodReferenceReflectiveMethodSelectionWithVarargs() throws Excepti
 		expression = parser.parseExpression("concat()");
 		assertCantCompile(expression);
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		assertCanCompile(expression);
 		tc.reset();
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		tc.reset();
 
 		// Should call the non varargs version of concat
@@ -3549,27 +3549,27 @@ public void methodReferenceReflectiveMethodSelectionWithVarargs() throws Excepti
 		expression = parser.parseExpression("concat2()");
 		assertCantCompile(expression);
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		assertCanCompile(expression);
 		tc.reset();
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		tc.reset();
 	}
 
 	@Test
-	public void methodReferenceVarargs() throws Exception {
+	void methodReferenceVarargs() {
 		TestClass5 tc = new TestClass5();
 
 		// varargs string
 		expression = parser.parseExpression("eleven()");
 		assertCantCompile(expression);
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		assertCanCompile(expression);
 		tc.reset();
 		expression.getValue(tc);
-		assertThat(tc.s).isEqualTo("");
+		assertThat(tc.s).isEmpty();
 		tc.reset();
 
 		// varargs string
@@ -3840,7 +3840,7 @@ public void methodReferenceVarargs() throws Exception {
 	}
 
 	@Test
-	public void methodReference() throws Exception {
+	void methodReference() {
 		TestClass5 tc = new TestClass5();
 
 		// non-static method, no args, void return
@@ -3985,7 +3985,7 @@ public void methodReference() throws Exception {
 	}
 
 	@Test
-	public void errorHandling() throws Exception {
+	void errorHandling() {
 		TestClass5 tc = new TestClass5();
 
 		// changing target
@@ -4040,7 +4040,7 @@ public void errorHandling() throws Exception {
 	}
 
 	@Test
-	public void methodReference_staticMethod() throws Exception {
+	void methodReference_staticMethod() {
 		Expression expression = parser.parseExpression("T(Integer).valueOf(42)");
 		int resultI = expression.getValue(new TestClass1(), Integer.TYPE);
 		assertCanCompile(expression);
@@ -4050,7 +4050,7 @@ public void methodReference_staticMethod() throws Exception {
 	}
 
 	@Test
-	public void methodReference_literalArguments_int() throws Exception {
+	void methodReference_literalArguments_int() {
 		Expression expression = parser.parseExpression("'abcd'.substring(1,3)");
 		String resultI = expression.getValue(new TestClass1(), String.class);
 		assertCanCompile(expression);
@@ -4060,7 +4060,7 @@ public void methodReference_literalArguments_int() throws Exception {
 	}
 
 	@Test
-	public void methodReference_simpleInstanceMethodNoArg() throws Exception {
+	void methodReference_simpleInstanceMethodNoArg() {
 		Expression expression = parser.parseExpression("toString()");
 		String resultI = expression.getValue(42, String.class);
 		assertCanCompile(expression);
@@ -4070,7 +4070,7 @@ public void methodReference_simpleInstanceMethodNoArg() throws Exception {
 	}
 
 	@Test
-	public void methodReference_simpleInstanceMethodNoArgReturnPrimitive() throws Exception {
+	void methodReference_simpleInstanceMethodNoArgReturnPrimitive() {
 		expression = parser.parseExpression("intValue()");
 		int resultI = expression.getValue(42, Integer.TYPE);
 		assertThat(resultI).isEqualTo(42);
@@ -4080,7 +4080,7 @@ public void methodReference_simpleInstanceMethodNoArgReturnPrimitive() throws Ex
 	}
 
 	@Test
-	public void methodReference_simpleInstanceMethodOneArgReturnPrimitive1() throws Exception {
+	void methodReference_simpleInstanceMethodOneArgReturnPrimitive1() {
 		Expression expression = parser.parseExpression("indexOf('b')");
 		int resultI = expression.getValue("abc", Integer.TYPE);
 		assertCanCompile(expression);
@@ -4090,7 +4090,7 @@ public void methodReference_simpleInstanceMethodOneArgReturnPrimitive1() throws
 	}
 
 	@Test
-	public void methodReference_simpleInstanceMethodOneArgReturnPrimitive2() throws Exception {
+	void methodReference_simpleInstanceMethodOneArgReturnPrimitive2() {
 		expression = parser.parseExpression("charAt(2)");
 		char resultI = expression.getValue("abc", Character.TYPE);
 		assertThat(resultI).isEqualTo('c');
@@ -4100,7 +4100,7 @@ public void methodReference_simpleInstanceMethodOneArgReturnPrimitive2() throws
 	}
 
 	@Test
-	public void compoundExpression() throws Exception {
+	void compoundExpression() {
 		Payload payload = new Payload();
 		expression = parser.parseExpression("DR[0]");
 		assertThat(expression.getValue(payload).toString()).isEqualTo("instanceof Two");
@@ -4137,7 +4137,7 @@ public void compoundExpression() throws Exception {
 	}
 
 	@Test
-	public void mixingItUp_indexerOpEqTernary() throws Exception {
+	void mixingItUp_indexerOpEqTernary() {
 		Map<String, String> m = new HashMap<>();
 		m.put("andy","778");
 
@@ -4150,7 +4150,7 @@ public void mixingItUp_indexerOpEqTernary() throws Exception {
 	}
 
 	@Test
-	public void propertyReference() throws Exception {
+	void propertyReference() {
 		TestClass6 tc = new TestClass6();
 
 		// non static field
@@ -4190,7 +4190,7 @@ public void propertyReference() throws Exception {
 	}
 
 	@Test
-	public void propertyReferenceVisibility_SPR12771() {
+	void propertyReferenceVisibility_SPR12771() {
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 		ctx.setVariable("httpServletRequest", HttpServlet3RequestFactory.getOne());
 		// Without a fix compilation was inserting a checkcast to a private type
@@ -4202,7 +4202,7 @@ public void propertyReferenceVisibility_SPR12771() {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void indexer() throws Exception {
+	void indexer() {
 		String[] sss = new String[] {"a","b","c"};
 		Number[] ns = new Number[] {2,8,9};
 		int[] is = new int[] {8,9,10};
@@ -4509,7 +4509,7 @@ public void indexer() throws Exception {
 	}
 
 	@Test
-	public void plusNeedingCheckcast_SPR12426() {
+	void plusNeedingCheckcast_SPR12426() {
 		expression = parser.parseExpression("object + ' world'");
 		Object v = expression.getValue(new FooObject());
 		assertThat(v).isEqualTo("hello world");
@@ -4524,7 +4524,7 @@ public void plusNeedingCheckcast_SPR12426() {
 	}
 
 	@Test
-	public void mixingItUp_propertyAccessIndexerOpLtTernaryRootNull() throws Exception {
+	void mixingItUp_propertyAccessIndexerOpLtTernaryRootNull() {
 		Payload payload = new Payload();
 
 		expression = parser.parseExpression("DR[0].three");
@@ -4552,7 +4552,7 @@ public void mixingItUp_propertyAccessIndexerOpLtTernaryRootNull() throws Excepti
 	}
 
 	@Test
-	public void variantGetter() throws Exception {
+	void variantGetter() throws Exception {
 		Payload2Holder holder = new Payload2Holder();
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 		ctx.addPropertyAccessor(new MyAccessor());
@@ -4566,7 +4566,7 @@ public void variantGetter() throws Exception {
 	}
 
 	@Test
-	public void compilerWithGenerics_12040() {
+	void compilerWithGenerics_12040() {
 		expression = parser.parseExpression("payload!=2");
 		assertThat(expression.getValue(new GenericMessageTestHelper<>(4), Boolean.class)).isTrue();
 		assertCanCompile(expression);
@@ -4675,7 +4675,7 @@ public void compilerWithGenerics_12040() {
 
 	// The new helper class here uses an upper bound on the generic
 	@Test
-	public void compilerWithGenerics_12040_2() {
+	void compilerWithGenerics_12040_2() {
 		expression = parser.parseExpression("payload/2");
 		assertThat(expression.getValue(new GenericMessageTestHelper2<>(4))).isEqualTo(2);
 		assertCanCompile(expression);
@@ -4719,7 +4719,7 @@ public void compilerWithGenerics_12040_2() {
 
 	// The other numeric operators
 	@Test
-	public void compilerWithGenerics_12040_3() {
+	void compilerWithGenerics_12040_3() {
 		expression = parser.parseExpression("payload >= 2");
 		assertThat(expression.getValue(new GenericMessageTestHelper2<>(4), Boolean.TYPE)).isTrue();
 		assertCanCompile(expression);
@@ -4762,7 +4762,7 @@ public void compilerWithGenerics_12040_3() {
 	}
 
 	@Test
-	public void indexerMapAccessor_12045() throws Exception {
+	void indexerMapAccessor_12045() throws Exception {
 		SpelParserConfiguration spc = new SpelParserConfiguration(
 				SpelCompilerMode.IMMEDIATE,getClass().getClassLoader());
 		SpelExpressionParser sep = new SpelExpressionParser(spc);
@@ -4791,7 +4791,7 @@ public void indexerMapAccessor_12045() throws Exception {
 	}
 
 	@Test
-	public void elvisOperator_SPR15192() {
+	void elvisOperator_SPR15192() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null);
 		Expression exp;
 
@@ -4875,7 +4875,7 @@ public void elvisOperator_SPR15192() {
 	}
 
 	@Test
-	public void elvisOperator_SPR17214() throws Exception {
+	void elvisOperator_SPR17214() {
 		SpelParserConfiguration spc = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null);
 		SpelExpressionParser sep = new SpelExpressionParser(spc);
 
@@ -4923,7 +4923,7 @@ public void elvisOperator_SPR17214() throws Exception {
 	}
 
 	@Test
-	public void testNullComparison_SPR22358() {
+	void testNullComparison_SPR22358() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(SpelCompilerMode.OFF, null);
 		SpelExpressionParser parser = new SpelExpressionParser(configuration);
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
@@ -5004,7 +5004,7 @@ private void verifyCompilationAndBehaviourWithNull2(String expressionText, SpelE
 	}
 
 	@Test
-	public void ternaryOperator_SPR15192() {
+	void ternaryOperator_SPR15192() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null);
 		Expression exp;
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -5048,9 +5048,9 @@ public void ternaryOperator_SPR15192() {
 
 		// null condition
 		exp = new SpelExpressionParser(configuration).parseExpression("3==3?null:4L");
-		assertThat(exp.getValue(context, new Foo(), String.class)).isEqualTo(null);
+		assertThat(exp.getValue(context, new Foo(), String.class)).isNull();
 		assertCanCompile(exp);
-		assertThat(exp.getValue(context, new Foo(), String.class)).isEqualTo(null);
+		assertThat(exp.getValue(context, new Foo(), String.class)).isNull();
 		assertIsCompiled(exp);
 
 		// variable access returning primitive
@@ -5078,7 +5078,7 @@ public void ternaryOperator_SPR15192() {
 	}
 
 	@Test
-	public void repeatedCompilation() throws Exception {
+	void repeatedCompilation() throws Exception {
 		// Verifying that after a number of compilations, the classloaders
 		// used to load the compiled expressions are discarded/replaced.
 		// See SpelCompiler.loadClass()
@@ -6204,9 +6204,9 @@ public class Reg {
 
 		public Reg(int v) {
 			this._value  = v;
-			this._valueL = new Long(v);
-			this._valueD = new Double(v);
-			this._valueF = new Float(v);
+			this._valueL = Long.valueOf(v);
+			this._valueD = (double) v;
+			this._valueF = (float) v;
 		}
 
 		public Integer getValue() {
@@ -6243,16 +6243,16 @@ public Float getValueF2() {
 
 		public void setValue(Integer value) {
 			_value  = value;
-			_valueL = value==null?null:new Long(value);
-			_valueD = value==null?null:new Double(value);
-			_valueF = value==null?null:new Float(value);
+			_valueL = value==null?null:Long.valueOf(value);
+			_valueD = value==null?null:Double.valueOf(value);
+			_valueF = value==null?null:Float.valueOf(value);
 		}
 
 		public void setValue2(Integer value) {
 			_value2  = value;
-			_valueL2 = value==null?null:new Long(value);
-			_valueD2 = value==null?null:new Double(value);
-			_valueF2 = value==null?null:new Float(value);
+			_valueL2 = value==null?null:Long.valueOf(value);
+			_valueD2 = value==null?null:Double.valueOf(value);
+			_valueF2 = value==null?null:Float.valueOf(value);
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
index b114826270b5..09e73591350e 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,35 +74,35 @@
  * @author Phillip Webb
  * @author Sam Brannen
  */
-public class SpelReproTests extends AbstractExpressionTests {
+class SpelReproTests extends AbstractExpressionTests {
 
 	@Test
-	public void NPE_SPR5661() {
+	void NPE_SPR5661() {
 		evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);
 	}
 
 	@Test
-	public void SWF1086() {
+	void SWF1086() {
 		evaluate("printDouble(T(java.math.BigDecimal).valueOf(14.35))", "14.35", String.class);
 	}
 
 	@Test
-	public void doubleCoercion() {
+	void doubleCoercion() {
 		evaluate("printDouble(14.35)", "14.35", String.class);
 	}
 
 	@Test
-	public void doubleArrayCoercion() {
+	void doubleArrayCoercion() {
 		evaluate("printDoubles(getDoublesAsStringList())", "{14.35, 15.45}", String.class);
 	}
 
 	@Test
-	public void SPR5899() {
+	void SPR5899() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Spr5899Class());
 		Expression expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull(12)");
 		assertThat(expr.getValue(context)).isEqualTo(12);
 		expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull(null)");
-		assertThat(expr.getValue(context)).isEqualTo(null);
+		assertThat(expr.getValue(context)).isNull();
 		expr = new SpelExpressionParser().parseRaw("tryToInvokeWithNull2(null)");
 		assertThatExceptionOfType(EvaluationException.class).isThrownBy(
 				expr::getValue);
@@ -133,7 +133,7 @@ public void SPR5899() {
 	}
 
 	@Test
-	public void SPR5905_InnerTypeReferences() {
+	void SPR5905_InnerTypeReferences() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Spr5899Class());
 		Expression expr = new SpelExpressionParser().parseRaw("T(java.util.Map$Entry)");
 		assertThat(expr.getValue(context)).isEqualTo(Map.Entry.class);
@@ -146,7 +146,7 @@ public void SPR5905_InnerTypeReferences() {
 	}
 
 	@Test
-	public void SPR5804() {
+	void SPR5804() {
 		Map<String, String> m = new HashMap<>();
 		m.put("foo", "bar");
 		StandardEvaluationContext context = new StandardEvaluationContext(m);  // root is a map instance
@@ -156,7 +156,7 @@ public void SPR5804() {
 	}
 
 	@Test
-	public void SPR5847() {
+	void SPR5847() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new TestProperties());
 		String name = null;
 		Expression expr = null;
@@ -192,7 +192,7 @@ public void SPR5847() {
 	}
 
 	@Test
-	public void NPE_SPR5673() {
+	void NPE_SPR5673() {
 		ParserContext hashes = TemplateExpressionParsingTests.HASH_DELIMITED_PARSER_CONTEXT;
 		ParserContext dollars = TemplateExpressionParsingTests.DEFAULT_TEMPLATE_PARSER_CONTEXT;
 
@@ -227,7 +227,7 @@ public void NPE_SPR5673() {
 	}
 
 	@Test
-	public void propertyAccessOnNullTarget_SPR5663() throws AccessException {
+	void propertyAccessOnNullTarget_SPR5663() throws AccessException {
 		PropertyAccessor accessor = new ReflectivePropertyAccessor();
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		assertThat(accessor.canRead(context, null, "abc")).isFalse();
@@ -239,7 +239,7 @@ public void propertyAccessOnNullTarget_SPR5663() throws AccessException {
 	}
 
 	@Test
-	public void nestedProperties_SPR6923() {
+	void nestedProperties_SPR6923() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Foo());
 		Expression expr = new SpelExpressionParser().parseRaw("resource.resource.server");
 		String name = expr.getValue(context, String.class);
@@ -248,7 +248,7 @@ public void nestedProperties_SPR6923() {
 
 	/** Should be accessing Goo.getKey because 'bar' field evaluates to "key" */
 	@Test
-	public void indexingAsAPropertyAccess_SPR6968_1() {
+	void indexingAsAPropertyAccess_SPR6968_1() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Goo());
 		String name = null;
 		Expression expr = null;
@@ -261,7 +261,7 @@ public void indexingAsAPropertyAccess_SPR6968_1() {
 
 	/** Should be accessing Goo.getKey because 'bar' variable evaluates to "key" */
 	@Test
-	public void indexingAsAPropertyAccess_SPR6968_2() {
+	void indexingAsAPropertyAccess_SPR6968_2() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Goo());
 		context.setVariable("bar", "key");
 		String name = null;
@@ -275,7 +275,7 @@ public void indexingAsAPropertyAccess_SPR6968_2() {
 
 	/** $ related identifiers */
 	@Test
-	public void dollarPrefixedIdentifier_SPR7100() {
+	void dollarPrefixedIdentifier_SPR7100() {
 		Holder h = new Holder();
 		StandardEvaluationContext context = new StandardEvaluationContext(h);
 		context.addPropertyAccessor(new MapAccessor());
@@ -315,7 +315,7 @@ public void dollarPrefixedIdentifier_SPR7100() {
 
 	/** Should be accessing Goo.wibble field because 'bar' variable evaluates to "wibble" */
 	@Test
-	public void indexingAsAPropertyAccess_SPR6968_3() {
+	void indexingAsAPropertyAccess_SPR6968_3() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Goo());
 		context.setVariable("bar", "wibble");
 		String name = null;
@@ -333,7 +333,7 @@ public void indexingAsAPropertyAccess_SPR6968_3() {
 	 * "wibble"
 	 */
 	@Test
-	public void indexingAsAPropertyAccess_SPR6968_4() {
+	void indexingAsAPropertyAccess_SPR6968_4() {
 		Goo g = Goo.instance;
 		StandardEvaluationContext context = new StandardEvaluationContext(g);
 		context.setVariable("bar", "wibble");
@@ -348,7 +348,7 @@ public void indexingAsAPropertyAccess_SPR6968_4() {
 
 	/** Should be accessing Goo.setKey field because 'bar' variable evaluates to "key" */
 	@Test
-	public void indexingAsAPropertyAccess_SPR6968_5() {
+	void indexingAsAPropertyAccess_SPR6968_5() {
 		Goo g = Goo.instance;
 		StandardEvaluationContext context = new StandardEvaluationContext(g);
 		Expression expr = null;
@@ -360,7 +360,7 @@ public void indexingAsAPropertyAccess_SPR6968_5() {
 	}
 
 	@Test
-	public void dollars() {
+	void dollars() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("m['$foo']");
@@ -369,7 +369,7 @@ public void dollars() {
 	}
 
 	@Test
-	public void dollars2() {
+	void dollars2() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 		expr = new SpelExpressionParser().parseRaw("m[$foo]");
@@ -421,7 +421,7 @@ public boolean isTemplate() {
 	};
 
 	@Test
-	public void beanResolution() {
+	void beanResolution() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 
@@ -443,12 +443,12 @@ public void beanResolution() {
 
 		// bean does not exist
 		expr = new SpelExpressionParser().parseRaw("@bar");
-		assertThat(expr.getValue(context, String.class)).isEqualTo(null);
+		assertThat(expr.getValue(context, String.class)).isNull();
 
 		// bean name will cause AccessException
 		expr = new SpelExpressionParser().parseRaw("@goo");
 		try {
-			assertThat(expr.getValue(context, String.class)).isEqualTo(null);
+			assertThat(expr.getValue(context, String.class)).isNull();
 		}
 		catch (SpelEvaluationException see) {
 			assertThat(see.getMessageCode()).isEqualTo(SpelMessage.EXCEPTION_DURING_BEAN_RESOLUTION);
@@ -472,7 +472,7 @@ public void beanResolution() {
 	}
 
 	@Test
-	public void elvis_SPR7209_1() {
+	void elvis_SPR7209_1() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new XX());
 		Expression expr = null;
 
@@ -482,14 +482,14 @@ public void elvis_SPR7209_1() {
 		expr = new SpelExpressionParser().parseRaw("?:'default'");
 		assertThat(expr.getValue()).isEqualTo("default");
 		expr = new SpelExpressionParser().parseRaw("?:");
-		assertThat(expr.getValue()).isEqualTo(null);
+		assertThat(expr.getValue()).isNull();
 
 		// Different parts of ternary expression are null
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
 				new SpelExpressionParser().parseRaw("(?'abc':'default')").getValue(context))
 			.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.TYPE_CONVERSION_ERROR));
 		expr = new SpelExpressionParser().parseRaw("(false?'abc':null)");
-		assertThat(expr.getValue()).isEqualTo(null);
+		assertThat(expr.getValue()).isNull();
 
 		// Assignment
 		assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
@@ -498,7 +498,7 @@ public void elvis_SPR7209_1() {
 	}
 
 	@Test
-	public void elvis_SPR7209_2() {
+	void elvis_SPR7209_2() {
 		Expression expr = null;
 		// Have empty string treated as null for elvis
 		expr = new SpelExpressionParser().parseRaw("?:'default'");
@@ -510,7 +510,7 @@ public void elvis_SPR7209_2() {
 	}
 
 	@Test
-	public void mapOfMap_SPR7244() {
+	void mapOfMap_SPR7244() {
 		Map<String, Object> map = new LinkedHashMap<>();
 		map.put("uri", "http:");
 		Map<String, String> nameMap = new LinkedHashMap<>();
@@ -531,7 +531,7 @@ public void mapOfMap_SPR7244() {
 	}
 
 	@Test
-	public void projectionTypeDescriptors_1() {
+	void projectionTypeDescriptors_1() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "ls.![#this.equals('abc')]";
@@ -540,11 +540,11 @@ public void projectionTypeDescriptors_1() {
 		// value is list containing [true,false]
 		assertThat(value.get(0).getClass()).isEqualTo(Boolean.class);
 		TypeDescriptor evaluated = exp.getValueTypeDescriptor(context);
-		assertThat(evaluated.getElementTypeDescriptor()).isEqualTo(null);
+		assertThat(evaluated.getElementTypeDescriptor()).isNull();
 	}
 
 	@Test
-	public void projectionTypeDescriptors_2() {
+	void projectionTypeDescriptors_2() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "as.![#this.equals('abc')]";
@@ -557,7 +557,7 @@ public void projectionTypeDescriptors_2() {
 	}
 
 	@Test
-	public void projectionTypeDescriptors_3() {
+	void projectionTypeDescriptors_3() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new C());
 		SpelExpressionParser parser = new SpelExpressionParser();
 		String el1 = "ms.![key.equals('abc')]";
@@ -566,11 +566,11 @@ public void projectionTypeDescriptors_3() {
 		// value is list containing [true,false]
 		assertThat(value.get(0).getClass()).isEqualTo(Boolean.class);
 		TypeDescriptor evaluated = exp.getValueTypeDescriptor(context);
-		assertThat(evaluated.getElementTypeDescriptor()).isEqualTo(null);
+		assertThat(evaluated.getElementTypeDescriptor()).isNull();
 	}
 
 	@Test
-	public void greaterThanWithNulls_SPR7840() {
+	void greaterThanWithNulls_SPR7840() {
 		List<D> list = new ArrayList<>();
 		list.add(new D("aaa"));
 		list.add(new D("bbb"));
@@ -605,7 +605,7 @@ public void greaterThanWithNulls_SPR7840() {
 	 * than a unboxing conversion.
 	 */
 	@Test
-	public void conversionPriority_SPR8224() throws Exception {
+	void conversionPriority_SPR8224() throws Exception {
 
 		@SuppressWarnings("unused")
 		class ConversionPriority1 {
@@ -637,7 +637,7 @@ public int getX(Number i) {
 		ConversionPriority1 target = new ConversionPriority1();
 		MethodExecutor me = new ReflectiveMethodResolver(true).resolve(emptyEvalContext, target, "getX", args);
 		// MethodInvoker chooses getX(int i) when passing Integer
-		final int actual = (Integer) me.execute(emptyEvalContext, target, new Integer(42)).getValue();
+		final int actual = (Integer) me.execute(emptyEvalContext, target, Integer.valueOf(42)).getValue();
 		// Compiler chooses getX(Number i) when passing Integer
 		final int compiler = target.getX(INTEGER);
 		// Fails!
@@ -646,7 +646,7 @@ public int getX(Number i) {
 		ConversionPriority2 target2 = new ConversionPriority2();
 		MethodExecutor me2 = new ReflectiveMethodResolver(true).resolve(emptyEvalContext, target2, "getX", args);
 		// MethodInvoker chooses getX(int i) when passing Integer
-		int actual2 = (Integer) me2.execute(emptyEvalContext, target2, new Integer(42)).getValue();
+		int actual2 = (Integer) me2.execute(emptyEvalContext, target2, Integer.valueOf(42)).getValue();
 		// Compiler chooses getX(Number i) when passing Integer
 		int compiler2 = target2.getX(INTEGER);
 		// Fails!
@@ -659,7 +659,7 @@ public int getX(Number i) {
 	 * method accepting 'long' is ok.
 	 */
 	@Test
-	public void wideningPrimitiveConversion_SPR8224() throws Exception {
+	void wideningPrimitiveConversion_SPR8224() throws Exception {
 
 		class WideningPrimitiveConversion {
 			public int getX(long i) {
@@ -667,7 +667,7 @@ public int getX(long i) {
 			}
 		}
 
-		final Integer INTEGER_VALUE = Integer.valueOf(7);
+		final Integer INTEGER_VALUE = 7;
 		WideningPrimitiveConversion target = new WideningPrimitiveConversion();
 		EvaluationContext emptyEvalContext = new StandardEvaluationContext();
 
@@ -682,7 +682,7 @@ public int getX(long i) {
 	}
 
 	@Test
-	public void varargsAgainstProxy_SPR16122() {
+	void varargsAgainstProxy_SPR16122() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("process('a', 'b')");
 
@@ -696,7 +696,7 @@ public void varargsAgainstProxy_SPR16122() {
 	}
 
 	@Test
-	public void testCompiledExpressionForProxy_SPR16191() {
+	void testCompiledExpressionForProxy_SPR16191() {
 		SpelExpressionParser expressionParser =
 				new SpelExpressionParser(new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE, null));
 		Expression expression = expressionParser.parseExpression("#target.process(#root)");
@@ -715,7 +715,7 @@ public void testCompiledExpressionForProxy_SPR16191() {
 	}
 
 	@Test
-	public void varargsAndPrimitives_SPR8174() throws Exception {
+	void varargsAndPrimitives_SPR8174() throws Exception {
 		EvaluationContext emptyEvalContext = new StandardEvaluationContext();
 		List<TypeDescriptor> args = new ArrayList<>();
 
@@ -763,7 +763,7 @@ public void varargsAndPrimitives_SPR8174() throws Exception {
 	}
 
 	@Test
-	public void reservedWords_SPR8228() {
+	void reservedWords_SPR8228() {
 
 		// "DIV","EQ","GE","GT","LE","LT","MOD","NE","NOT"
 		@SuppressWarnings("unused")
@@ -814,7 +814,7 @@ public Reserver getReserver() {
 	}
 
 	@Test
-	public void reservedWordProperties_SPR9862() {
+	void reservedWordProperties_SPR9862() {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		SpelExpressionParser parser = new SpelExpressionParser();
 		SpelExpression expression = parser.parseRaw("T(org.springframework.expression.spel.testresources.le.div.mod.reserved.Reserver).CONST");
@@ -829,7 +829,7 @@ public void reservedWordProperties_SPR9862() {
 	 * in evaluation of SPEL expressions for a given context.
 	 */
 	@Test
-	public void propertyAccessorOrder_SPR8211() {
+	void propertyAccessorOrder_SPR8211() {
 		ExpressionParser expressionParser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new ContextObject());
 
@@ -849,7 +849,7 @@ public void propertyAccessorOrder_SPR8211() {
 	 * determines the set of methods for a type.
 	 */
 	@Test
-	public void customStaticFunctions_SPR9038() {
+	void customStaticFunctions_SPR9038() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		List<MethodResolver> methodResolvers = new ArrayList<>();
@@ -873,7 +873,7 @@ protected Method[] getMethods(Class<?> type) {
 	}
 
 	@Test
-	public void array() {
+	void array() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Expression expression = null;
@@ -902,7 +902,7 @@ public void array() {
 	}
 
 	@Test
-	public void SPR9486_floatFunctionResolver() {
+	void SPR9486_floatFunctionResolver() {
 		Number expectedResult = Math.abs(-10.2f);
 		ExpressionParser parser = new SpelExpressionParser();
 		SPR9486_FunctionsClass testObject = new SPR9486_FunctionsClass();
@@ -914,7 +914,7 @@ public void SPR9486_floatFunctionResolver() {
 	}
 
 	@Test
-	public void SPR9486_addFloatWithDouble() {
+	void SPR9486_addFloatWithDouble() {
 		Number expectedNumber = 10.21f + 10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -924,7 +924,7 @@ public void SPR9486_addFloatWithDouble() {
 	}
 
 	@Test
-	public void SPR9486_addFloatWithFloat() {
+	void SPR9486_addFloatWithFloat() {
 		Number expectedNumber = 10.21f + 10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -934,7 +934,7 @@ public void SPR9486_addFloatWithFloat() {
 	}
 
 	@Test
-	public void SPR9486_subtractFloatWithDouble() {
+	void SPR9486_subtractFloatWithDouble() {
 		Number expectedNumber = 10.21f - 10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -944,7 +944,7 @@ public void SPR9486_subtractFloatWithDouble() {
 	}
 
 	@Test
-	public void SPR9486_subtractFloatWithFloat() {
+	void SPR9486_subtractFloatWithFloat() {
 		Number expectedNumber = 10.21f - 10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -954,7 +954,7 @@ public void SPR9486_subtractFloatWithFloat() {
 	}
 
 	@Test
-	public void SPR9486_multiplyFloatWithDouble() {
+	void SPR9486_multiplyFloatWithDouble() {
 		Number expectedNumber = 10.21f * 10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -964,7 +964,7 @@ public void SPR9486_multiplyFloatWithDouble() {
 	}
 
 	@Test
-	public void SPR9486_multiplyFloatWithFloat() {
+	void SPR9486_multiplyFloatWithFloat() {
 		Number expectedNumber = 10.21f * 10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -974,7 +974,7 @@ public void SPR9486_multiplyFloatWithFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatDivideByFloat() {
+	void SPR9486_floatDivideByFloat() {
 		Number expectedNumber = -10.21f / -10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -984,7 +984,7 @@ public void SPR9486_floatDivideByFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatDivideByDouble() {
+	void SPR9486_floatDivideByDouble() {
 		Number expectedNumber = -10.21f / -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -994,7 +994,7 @@ public void SPR9486_floatDivideByDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatEqFloatUnaryMinus() {
+	void SPR9486_floatEqFloatUnaryMinus() {
 		Boolean expectedResult = -10.21f == -10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1004,7 +1004,7 @@ public void SPR9486_floatEqFloatUnaryMinus() {
 	}
 
 	@Test
-	public void SPR9486_floatEqDoubleUnaryMinus() {
+	void SPR9486_floatEqDoubleUnaryMinus() {
 		Boolean expectedResult = -10.21f == -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1014,7 +1014,7 @@ public void SPR9486_floatEqDoubleUnaryMinus() {
 	}
 
 	@Test
-	public void SPR9486_floatEqFloat() {
+	void SPR9486_floatEqFloat() {
 		Boolean expectedResult = 10.215f == 10.2109f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1024,7 +1024,7 @@ public void SPR9486_floatEqFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatEqDouble() {
+	void SPR9486_floatEqDouble() {
 		Boolean expectedResult = 10.215f == 10.2109;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1034,7 +1034,7 @@ public void SPR9486_floatEqDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatNotEqFloat() {
+	void SPR9486_floatNotEqFloat() {
 		Boolean expectedResult = 10.215f != 10.2109f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1044,7 +1044,7 @@ public void SPR9486_floatNotEqFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatNotEqDouble() {
+	void SPR9486_floatNotEqDouble() {
 		Boolean expectedResult = 10.215f != 10.2109;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1054,7 +1054,7 @@ public void SPR9486_floatNotEqDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatLessThanFloat() {
+	void SPR9486_floatLessThanFloat() {
 		Boolean expectedNumber = -10.21f < -10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1064,7 +1064,7 @@ public void SPR9486_floatLessThanFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatLessThanDouble() {
+	void SPR9486_floatLessThanDouble() {
 		Boolean expectedNumber = -10.21f < -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1074,7 +1074,7 @@ public void SPR9486_floatLessThanDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatLessThanOrEqualFloat() {
+	void SPR9486_floatLessThanOrEqualFloat() {
 		Boolean expectedNumber = -10.21f <= -10.22f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1084,7 +1084,7 @@ public void SPR9486_floatLessThanOrEqualFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatLessThanOrEqualDouble() {
+	void SPR9486_floatLessThanOrEqualDouble() {
 		Boolean expectedNumber = -10.21f <= -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1094,7 +1094,7 @@ public void SPR9486_floatLessThanOrEqualDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatGreaterThanFloat() {
+	void SPR9486_floatGreaterThanFloat() {
 		Boolean expectedNumber = -10.21f > -10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1104,7 +1104,7 @@ public void SPR9486_floatGreaterThanFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatGreaterThanDouble() {
+	void SPR9486_floatGreaterThanDouble() {
 		Boolean expectedResult = -10.21f > -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1114,7 +1114,7 @@ public void SPR9486_floatGreaterThanDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatGreaterThanOrEqualFloat() {
+	void SPR9486_floatGreaterThanOrEqualFloat() {
 		Boolean expectedNumber = -10.21f >= -10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1124,7 +1124,7 @@ public void SPR9486_floatGreaterThanOrEqualFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatGreaterThanEqualDouble() {
+	void SPR9486_floatGreaterThanEqualDouble() {
 		Boolean expectedResult = -10.21f >= -10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1134,7 +1134,7 @@ public void SPR9486_floatGreaterThanEqualDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatModulusFloat() {
+	void SPR9486_floatModulusFloat() {
 		Number expectedResult = 10.21f % 10.2f;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1144,7 +1144,7 @@ public void SPR9486_floatModulusFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatModulusDouble() {
+	void SPR9486_floatModulusDouble() {
 		Number expectedResult = 10.21f % 10.2;
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1154,7 +1154,7 @@ public void SPR9486_floatModulusDouble() {
 	}
 
 	@Test
-	public void SPR9486_floatPowerFloat() {
+	void SPR9486_floatPowerFloat() {
 		Number expectedResult = Math.pow(10.21f, -10.2f);
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1164,7 +1164,7 @@ public void SPR9486_floatPowerFloat() {
 	}
 
 	@Test
-	public void SPR9486_floatPowerDouble() {
+	void SPR9486_floatPowerDouble() {
 		Number expectedResult = Math.pow(10.21f, 10.2);
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
@@ -1174,7 +1174,7 @@ public void SPR9486_floatPowerDouble() {
 	}
 
 	@Test
-	public void SPR9994_bridgeMethods() throws Exception {
+	void SPR9994_bridgeMethods() throws Exception {
 		ReflectivePropertyAccessor accessor = new ReflectivePropertyAccessor();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		GenericImplementation target = new GenericImplementation();
@@ -1187,7 +1187,7 @@ public void SPR9994_bridgeMethods() throws Exception {
 	}
 
 	@Test
-	public void SPR10162_onlyBridgeMethod() throws Exception {
+	void SPR10162_onlyBridgeMethod() throws Exception {
 		ReflectivePropertyAccessor accessor = new ReflectivePropertyAccessor();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Object target = new OnlyBridgeMethod();
@@ -1197,7 +1197,7 @@ public void SPR10162_onlyBridgeMethod() throws Exception {
 	}
 
 	@Test
-	public void SPR10091_simpleTestValueType() {
+	void SPR10091_simpleTestValueType() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Class<?> valueType = parser.parseExpression("simpleProperty").getValueType(evaluationContext);
@@ -1205,7 +1205,7 @@ public void SPR10091_simpleTestValueType() {
 	}
 
 	@Test
-	public void SPR10091_simpleTestValue() {
+	void SPR10091_simpleTestValue() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Object value = parser.parseExpression("simpleProperty").getValue(evaluationContext);
@@ -1213,7 +1213,7 @@ public void SPR10091_simpleTestValue() {
 	}
 
 	@Test
-	public void SPR10091_primitiveTestValueType() {
+	void SPR10091_primitiveTestValueType() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Class<?> valueType = parser.parseExpression("primitiveProperty").getValueType(evaluationContext);
@@ -1221,7 +1221,7 @@ public void SPR10091_primitiveTestValueType() {
 	}
 
 	@Test
-	public void SPR10091_primitiveTestValue() {
+	void SPR10091_primitiveTestValue() {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext evaluationContext = new StandardEvaluationContext(new BooleanHolder());
 		Object value = parser.parseExpression("primitiveProperty").getValue(evaluationContext);
@@ -1229,7 +1229,7 @@ public void SPR10091_primitiveTestValue() {
 	}
 
 	@Test
-	public void SPR16123() {
+	void SPR16123() {
 		ExpressionParser parser = new SpelExpressionParser();
 		parser.parseExpression("simpleProperty").setValue(new BooleanHolder(), null);
 		assertThatExceptionOfType(EvaluationException.class).isThrownBy(() ->
@@ -1237,7 +1237,7 @@ public void SPR16123() {
 	}
 
 	@Test
-	public void SPR10146_malformedExpressions() {
+	void SPR10146_malformedExpressions() {
 		doTestSpr10146("/foo", "EL1070E: Problem parsing left operand");
 		doTestSpr10146("*foo", "EL1070E: Problem parsing left operand");
 		doTestSpr10146("%foo", "EL1070E: Problem parsing left operand");
@@ -1255,7 +1255,7 @@ private void doTestSpr10146(String expression, String expectedMessage) {
 	}
 
 	@Test
-	public void SPR10125() {
+	void SPR10125() {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		String fromInterface = parser.parseExpression("T(" + StaticFinalImpl1.class.getName() + ").VALUE").getValue(
 				context, String.class);
@@ -1266,7 +1266,7 @@ public void SPR10125() {
 	}
 
 	@Test
-	public void SPR10210() {
+	void SPR10210() {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setVariable("bridgeExample", new org.springframework.expression.spel.spr10210.D());
 		Expression parseExpression = parser.parseExpression("#bridgeExample.bridgeMethod()");
@@ -1274,14 +1274,14 @@ public void SPR10210() {
 	}
 
 	@Test
-	public void SPR10328() {
+	void SPR10328() {
 		assertThatExceptionOfType(SpelParseException.class).isThrownBy(() ->
 				parser.parseExpression("$[]"))
 			.withMessageContaining("EL1071E: A required selection expression has not been specified");
 	}
 
 	@Test
-	public void SPR10452() {
+	void SPR10452() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(false, false);
 		ExpressionParser parser = new SpelExpressionParser(configuration);
 
@@ -1306,7 +1306,7 @@ public void SPR10452() {
 	}
 
 	@Test
-	public void SPR9495() {
+	void SPR9495() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(false, false);
 		ExpressionParser parser = new SpelExpressionParser(configuration);
 
@@ -1347,7 +1347,7 @@ public MethodExecutor resolve(EvaluationContext context, Object targetObject, St
 	}
 
 	@Test
-	public void SPR10486() {
+	void SPR10486() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Spr10486 rootObject = new Spr10486();
@@ -1358,7 +1358,7 @@ public void SPR10486() {
 	}
 
 	@Test
-	public void SPR11142() {
+	void SPR11142() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		Spr11142 rootObject = new Spr11142();
@@ -1369,7 +1369,7 @@ public void SPR11142() {
 	}
 
 	@Test
-	public void SPR9194() {
+	void SPR9194() {
 		TestClass2 one = new TestClass2("abc");
 		TestClass2 two = new TestClass2("abc");
 		Map<String, TestClass2> map = new HashMap<>();
@@ -1382,7 +1382,7 @@ public void SPR9194() {
 	}
 
 	@Test
-	public void SPR11348() {
+	void SPR11348() {
 		Collection<String> coll = new LinkedHashSet<>();
 		coll.add("one");
 		coll.add("two");
@@ -1399,14 +1399,14 @@ public void SPR11348() {
 	}
 
 	@Test
-	public void SPR11445_simple() {
+	void SPR11445_simple() {
 		StandardEvaluationContext context = new StandardEvaluationContext(new Spr11445Class());
 		Expression expr = new SpelExpressionParser().parseRaw("echo(parameter())");
 		assertThat(expr.getValue(context)).isEqualTo(1);
 	}
 
 	@Test
-	public void SPR11445_beanReference() {
+	void SPR11445_beanReference() {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setBeanResolver(new Spr11445Class());
 		Expression expr = new SpelExpressionParser().parseRaw("@bean.echo(@bean.parameter())");
@@ -1415,14 +1415,14 @@ public void SPR11445_beanReference() {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void SPR11494() {
+	void SPR11494() {
 		Expression exp = new SpelExpressionParser().parseExpression("T(java.util.Arrays).asList('a','b')");
 		List<String> list = (List<String>) exp.getValue();
 		assertThat(list).hasSize(2);
 	}
 
 	@Test
-	public void SPR11609() {
+	void SPR11609() {
 		StandardEvaluationContext sec = new StandardEvaluationContext();
 		sec.addPropertyAccessor(new MapAccessor());
 		Expression exp = new SpelExpressionParser().parseExpression(
@@ -1431,7 +1431,7 @@ public void SPR11609() {
 	}
 
 	@Test
-	public void SPR9735() {
+	void SPR9735() {
 		Item item = new Item();
 		item.setName("parent");
 
@@ -1453,7 +1453,7 @@ public void SPR9735() {
 	}
 
 	@Test
-	public void SPR12502() {
+	void SPR12502() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("#root.getClass().getName()");
 		assertThat(expression.getValue(new UnnamedUser())).isEqualTo(UnnamedUser.class.getName());
@@ -1462,7 +1462,7 @@ public void SPR12502() {
 
 	@Test
 	@SuppressWarnings("rawtypes")
-	public void SPR12522() {
+	void SPR12522() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("T(java.util.Arrays).asList('')");
 		Object value = expression.getValue();
@@ -1471,7 +1471,7 @@ public void SPR12522() {
 	}
 
 	@Test
-	public void SPR12803() {
+	void SPR12803() {
 		StandardEvaluationContext sec = new StandardEvaluationContext();
 		sec.setVariable("iterable", Collections.emptyList());
 		SpelExpressionParser parser = new SpelExpressionParser();
@@ -1480,7 +1480,7 @@ public void SPR12803() {
 	}
 
 	@Test
-	public void SPR12808() {
+	void SPR12808() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expression = parser.parseExpression("T(org.springframework.expression.spel.SpelReproTests.DistanceEnforcer).from(#no)");
 		StandardEvaluationContext sec = new StandardEvaluationContext();
@@ -1496,7 +1496,7 @@ public void SPR12808() {
 
 	@Test
 	@SuppressWarnings("rawtypes")
-	public void SPR13055() {
+	void SPR13055() {
 		List<Map<String, Object>> myPayload = new ArrayList<>();
 
 		Map<String, Object> v1 = new HashMap<>();
@@ -1527,7 +1527,7 @@ public void SPR13055() {
 	}
 
 	@Test
-	public void AccessingFactoryBean_spr9511() {
+	void AccessingFactoryBean_spr9511() {
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setBeanResolver(new MyBeanResolver());
 		Expression expr = new SpelExpressionParser().parseRaw("@foo");
@@ -1551,7 +1551,7 @@ public void AccessingFactoryBean_spr9511() {
 	}
 
 	@Test
-	public void SPR12035() {
+	void SPR12035() {
 		ExpressionParser parser = new SpelExpressionParser();
 
 		Expression expression1 = parser.parseExpression("list.?[ value>2 ].size()!=0");
@@ -1562,7 +1562,7 @@ public void SPR12035() {
 	}
 
 	@Test
-	public void SPR13055_maps() {
+	void SPR13055_maps() {
 		EvaluationContext context = new StandardEvaluationContext();
 		ExpressionParser parser = new SpelExpressionParser();
 
@@ -1578,7 +1578,7 @@ public void SPR13055_maps() {
 
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void SPR10417() {
+	void SPR10417() {
 		List list1 = new ArrayList();
 		list1.add("a");
 		list1.add("b");
@@ -1619,7 +1619,7 @@ public void SPR10417() {
 
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void SPR10417_maps() {
+	void SPR10417_maps() {
 		Map map1 = new HashMap();
 		map1.put("A", 65);
 		map1.put("B", 66);
@@ -1642,7 +1642,7 @@ public void SPR10417_maps() {
 	}
 
 	@Test
-	public void SPR13918() {
+	void SPR13918() {
 		EvaluationContext context = new StandardEvaluationContext();
 		context.setVariable("encoding", "UTF-8");
 
@@ -1652,7 +1652,7 @@ public void SPR13918() {
 	}
 
 	@Test
-	public void SPR16032() {
+	void SPR16032() {
 		EvaluationContext context = new StandardEvaluationContext();
 		context.setVariable("str", "a\0b");
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index f78a8d13fe3c..d4140d33e183 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public class MessageListenerAdapterTests {
+class MessageListenerAdapterTests {
 
 	private static final String TEXT = "I fancy a good cuppa right now";
 
@@ -65,7 +65,7 @@ public class MessageListenerAdapterTests {
 
 
 	@Test
-	public void testWithMessageContentsDelegateForTextMessage() throws Exception {
+	void testWithMessageContentsDelegateForTextMessage() throws Exception {
 		TextMessage textMessage = mock(TextMessage.class);
 		// TextMessage contents must be unwrapped...
 		given(textMessage.getText()).willReturn(TEXT);
@@ -79,17 +79,14 @@ public void testWithMessageContentsDelegateForTextMessage() throws Exception {
 	}
 
 	@Test
-	public void testWithMessageContentsDelegateForBytesMessage() throws Exception {
+	void testWithMessageContentsDelegateForBytesMessage() throws Exception {
 		BytesMessage bytesMessage = mock(BytesMessage.class);
 		// BytesMessage contents must be unwrapped...
-		given(bytesMessage.getBodyLength()).willReturn(new Long(TEXT.getBytes().length));
-		given(bytesMessage.readBytes(any(byte[].class))).willAnswer(new Answer<Integer>() {
-			@Override
-			public Integer answer(InvocationOnMock invocation) throws Throwable {
-				byte[] bytes = (byte[]) invocation.getArguments()[0];
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(TEXT.getBytes());
-				return inputStream.read(bytes);
-			}
+		given(bytesMessage.getBodyLength()).willReturn(Long.valueOf(TEXT.getBytes().length));
+		given(bytesMessage.readBytes(any(byte[].class))).willAnswer((Answer<Integer>) invocation -> {
+			byte[] bytes = (byte[]) invocation.getArguments()[0];
+			ByteArrayInputStream inputStream = new ByteArrayInputStream(TEXT.getBytes());
+			return inputStream.read(bytes);
 		});
 
 		MessageContentsDelegate delegate = mock(MessageContentsDelegate.class);
@@ -101,7 +98,7 @@ public Integer answer(InvocationOnMock invocation) throws Throwable {
 	}
 
 	@Test
-	public void testWithMessageContentsDelegateForObjectMessage() throws Exception {
+	void testWithMessageContentsDelegateForObjectMessage() throws Exception {
 		ObjectMessage objectMessage = mock(ObjectMessage.class);
 		given(objectMessage.getObject()).willReturn(NUMBER);
 
@@ -114,7 +111,7 @@ public void testWithMessageContentsDelegateForObjectMessage() throws Exception {
 	}
 
 	@Test
-	public void testWithMessageContentsDelegateForObjectMessageWithPlainObject() throws Exception {
+	void testWithMessageContentsDelegateForObjectMessageWithPlainObject() throws Exception {
 		ObjectMessage objectMessage = mock(ObjectMessage.class);
 		given(objectMessage.getObject()).willReturn(OBJECT);
 
@@ -127,7 +124,7 @@ public void testWithMessageContentsDelegateForObjectMessageWithPlainObject() thr
 	}
 
 	@Test
-	public void testWithMessageDelegate() throws Exception {
+	void testWithMessageDelegate() throws Exception {
 		TextMessage textMessage = mock(TextMessage.class);
 
 		MessageDelegate delegate = mock(MessageDelegate.class);
@@ -141,7 +138,7 @@ public void testWithMessageDelegate() throws Exception {
 	}
 
 	@Test
-	public void testWhenTheAdapterItselfIsTheDelegate() throws Exception {
+	void testWhenTheAdapterItselfIsTheDelegate() throws Exception {
 		TextMessage textMessage = mock(TextMessage.class);
 		// TextMessage contents must be unwrapped...
 		given(textMessage.getText()).willReturn(TEXT);
@@ -152,7 +149,7 @@ public void testWhenTheAdapterItselfIsTheDelegate() throws Exception {
 	}
 
 	@Test
-	public void testRainyDayWithNoApplicableHandlingMethods() throws Exception {
+	void testRainyDayWithNoApplicableHandlingMethods() throws Exception {
 		TextMessage textMessage = mock(TextMessage.class);
 		// TextMessage contents must be unwrapped...
 		given(textMessage.getText()).willReturn(TEXT);
@@ -164,7 +161,7 @@ public void testRainyDayWithNoApplicableHandlingMethods() throws Exception {
 	}
 
 	@Test
-	public void testThatAnExceptionThrownFromTheHandlingMethodIsSimplySwallowedByDefault() throws Exception {
+	void testThatAnExceptionThrownFromTheHandlingMethodIsSimplySwallowedByDefault() throws Exception {
 		final IllegalArgumentException exception = new IllegalArgumentException();
 
 		TextMessage textMessage = mock(TextMessage.class);
@@ -189,7 +186,7 @@ protected void handleListenerException(Throwable ex) {
 	}
 
 	@Test
-	public void testThatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() throws Exception {
+	void testThatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter();
 		assertThat(adapter.getMessageConverter()).as("The default [MessageConverter] must never be null.").isNotNull();
 		boolean condition = adapter.getMessageConverter() instanceof SimpleMessageConverter;
@@ -197,19 +194,19 @@ public void testThatTheDefaultMessageConverterisIndeedTheSimpleMessageConverter(
 	}
 
 	@Test
-	public void testThatWhenNoDelegateIsSuppliedTheDelegateIsAssumedToBeTheMessageListenerAdapterItself() throws Exception {
+	void testThatWhenNoDelegateIsSuppliedTheDelegateIsAssumedToBeTheMessageListenerAdapterItself() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter();
 		assertThat(adapter.getDelegate()).isSameAs(adapter);
 	}
 
 	@Test
-	public void testThatTheDefaultMessageHandlingMethodNameIsTheConstantDefault() throws Exception {
+	void testThatTheDefaultMessageHandlingMethodNameIsTheConstantDefault() throws Exception {
 		MessageListenerAdapter adapter = new MessageListenerAdapter();
 		assertThat(adapter.getDefaultListenerMethod()).isEqualTo(MessageListenerAdapter.ORIGINAL_DEFAULT_LISTENER_METHOD);
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSessionSupplied() throws Exception {
+	void testWithResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSessionSupplied() throws Exception {
 		TextMessage textMessage = mock(TextMessage.class);
 		ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class);
 		given(delegate.handleMessage(textMessage)).willReturn(TEXT);
@@ -221,7 +218,7 @@ public void testWithResponsiveMessageDelegate_DoesNotSendReturnTextMessageIfNoSe
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateWithDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
+	void testWithResponsiveMessageDelegateWithDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
 		Queue destination = mock(Queue.class);
 		TextMessage sentTextMessage = mock(TextMessage.class);
 		// correlation ID is queried when response is being created...
@@ -256,7 +253,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
+	void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
 		Queue destination = mock(Queue.class);
 		TextMessage sentTextMessage = mock(TextMessage.class);
 		// correlation ID is queried when response is being created...
@@ -289,7 +286,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateNoDefaultDestinationAndNoReplyToDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
+	void testWithResponsiveMessageDelegateNoDefaultDestinationAndNoReplyToDestination_SendsReturnTextMessageWhenSessionSupplied() throws Exception {
 		final TextMessage sentTextMessage = mock(TextMessage.class);
 		// correlation ID is queried when response is being created...
 		given(sentTextMessage.getJMSCorrelationID()).willReturn(CORRELATION_ID);
@@ -318,7 +315,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied_AndSendingThrowsJMSException() throws Exception {
+	void testWithResponsiveMessageDelegateNoDefaultDestination_SendsReturnTextMessageWhenSessionSupplied_AndSendingThrowsJMSException() throws Exception {
 		Queue destination = mock(Queue.class);
 
 		final TextMessage sentTextMessage = mock(TextMessage.class);
@@ -354,7 +351,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateDoesNotSendReturnTextMessageWhenSessionSupplied_AndListenerMethodThrowsException() throws Exception {
+	void testWithResponsiveMessageDelegateDoesNotSendReturnTextMessageWhenSessionSupplied_AndListenerMethodThrowsException() throws Exception {
 		final TextMessage message = mock(TextMessage.class);
 		final QueueSession session = mock(QueueSession.class);
 
@@ -372,7 +369,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateWhenReturnTypeIsNotAJMSMessageAndNoMessageConverterIsSupplied() throws Exception {
+	void testWithResponsiveMessageDelegateWhenReturnTypeIsNotAJMSMessageAndNoMessageConverterIsSupplied() throws Exception {
 		final TextMessage sentTextMessage = mock(TextMessage.class);
 		final Session session = mock(Session.class);
 		ResponsiveMessageDelegate delegate = mock(ResponsiveMessageDelegate.class);
@@ -391,7 +388,7 @@ protected Object extractMessage(Message message) {
 	}
 
 	@Test
-	public void testWithResponsiveMessageDelegateWhenReturnTypeIsAJMSMessageAndNoMessageConverterIsSupplied() throws Exception {
+	void testWithResponsiveMessageDelegateWhenReturnTypeIsAJMSMessageAndNoMessageConverterIsSupplied() throws Exception {
 		Queue destination = mock(Queue.class);
 		final TextMessage sentTextMessage = mock(TextMessage.class);
 		// correlation ID is queried when response is being created...
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
index a7942cccb8e0..2d2b48fbfb41 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
  * @author Dave Syer
  * @author Stephane Nicoll
  */
-public class MappingJackson2MessageConverterTests {
+class MappingJackson2MessageConverterTests {
 
 	private MappingJackson2MessageConverter converter;
 
@@ -66,7 +66,7 @@ public void setup() {
 
 
 	@Test
-	public void toBytesMessage() throws Exception {
+	void toBytesMessage() throws Exception {
 		BytesMessage bytesMessageMock = mock(BytesMessage.class);
 		Date toBeMarshalled = new Date();
 
@@ -80,7 +80,7 @@ public void toBytesMessage() throws Exception {
 	}
 
 	@Test
-	public void fromBytesMessage() throws Exception {
+	void fromBytesMessage() throws Exception {
 		BytesMessage bytesMessageMock = mock(BytesMessage.class);
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
 
@@ -89,21 +89,16 @@ public void fromBytesMessage() throws Exception {
 
 		given(bytesMessageMock.getStringProperty("__typeid__")).willReturn(Object.class.getName());
 		given(bytesMessageMock.propertyExists("__encoding__")).willReturn(false);
-		given(bytesMessageMock.getBodyLength()).willReturn(new Long(bytes.length));
+		given(bytesMessageMock.getBodyLength()).willReturn(Long.valueOf(bytes.length));
 		given(bytesMessageMock.readBytes(any(byte[].class))).willAnswer(
-				new Answer<Integer>() {
-					@Override
-					public Integer answer(InvocationOnMock invocation) throws Throwable {
-						return byteStream.read((byte[]) invocation.getArguments()[0]);
-					}
-				});
+				(Answer<Integer>) invocation -> byteStream.read((byte[]) invocation.getArguments()[0]));
 
 		Object result = converter.fromMessage(bytesMessageMock);
 		assertThat(unmarshalled).as("Invalid result").isEqualTo(result);
 	}
 
 	@Test
-	public void toTextMessageWithObject() throws Exception {
+	void toTextMessageWithObject() throws Exception {
 		converter.setTargetType(MessageType.TEXT);
 		TextMessage textMessageMock = mock(TextMessage.class);
 		Date toBeMarshalled = new Date();
@@ -115,7 +110,7 @@ public void toTextMessageWithObject() throws Exception {
 	}
 
 	@Test
-	public void toTextMessageWithMap() throws Exception {
+	void toTextMessageWithMap() throws Exception {
 		converter.setTargetType(MessageType.TEXT);
 		TextMessage textMessageMock = mock(TextMessage.class);
 		Map<String, String> toBeMarshalled = new HashMap<>();
@@ -128,7 +123,7 @@ public void toTextMessageWithMap() throws Exception {
 	}
 
 	@Test
-	public void fromTextMessage() throws Exception {
+	void fromTextMessage() throws Exception {
 		TextMessage textMessageMock = mock(TextMessage.class);
 		MyBean unmarshalled = new MyBean("bar");
 
@@ -141,7 +136,7 @@ public void fromTextMessage() throws Exception {
 	}
 
 	@Test
-	public void fromTextMessageWithUnknownProperty() throws Exception {
+	void fromTextMessageWithUnknownProperty() throws Exception {
 		TextMessage textMessageMock = mock(TextMessage.class);
 		MyBean unmarshalled = new MyBean("bar");
 
@@ -154,7 +149,7 @@ public void fromTextMessageWithUnknownProperty() throws Exception {
 	}
 
 	@Test
-	public void fromTextMessageAsObject() throws Exception {
+	void fromTextMessageAsObject() throws Exception {
 		TextMessage textMessageMock = mock(TextMessage.class);
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
 
@@ -167,7 +162,7 @@ public void fromTextMessageAsObject() throws Exception {
 	}
 
 	@Test
-	public void fromTextMessageAsMap() throws Exception {
+	void fromTextMessageAsMap() throws Exception {
 		TextMessage textMessageMock = mock(TextMessage.class);
 		Map<String, String> unmarshalled = Collections.singletonMap("foo", "bar");
 
@@ -180,7 +175,7 @@ public void fromTextMessageAsMap() throws Exception {
 	}
 
 	@Test
-	public void toTextMessageWithReturnType() throws JMSException, NoSuchMethodException {
+	void toTextMessageWithReturnType() throws JMSException, NoSuchMethodException {
 		Method method = this.getClass().getDeclaredMethod("summary");
 		MethodParameter returnType = new MethodParameter(method, -1);
 		testToTextMessageWithReturnType(returnType);
@@ -188,13 +183,13 @@ public void toTextMessageWithReturnType() throws JMSException, NoSuchMethodExcep
 	}
 
 	@Test
-	public void toTextMessageWithNullReturnType() throws JMSException, NoSuchMethodException {
+	void toTextMessageWithNullReturnType() throws JMSException, NoSuchMethodException {
 		testToTextMessageWithReturnType(null);
 		verify(sessionMock).createTextMessage("{\"name\":\"test\",\"description\":\"lengthy description\"}");
 	}
 
 	@Test
-	public void toTextMessageWithReturnTypeAndNoJsonView() throws JMSException, NoSuchMethodException {
+	void toTextMessageWithReturnTypeAndNoJsonView() throws JMSException, NoSuchMethodException {
 		Method method = this.getClass().getDeclaredMethod("none");
 		MethodParameter returnType = new MethodParameter(method, -1);
 
@@ -203,7 +198,7 @@ public void toTextMessageWithReturnTypeAndNoJsonView() throws JMSException, NoSu
 	}
 
 	@Test
-	public void toTextMessageWithReturnTypeAndMultipleJsonViews() throws JMSException, NoSuchMethodException {
+	void toTextMessageWithReturnTypeAndMultipleJsonViews() throws JMSException, NoSuchMethodException {
 		Method method = this.getClass().getDeclaredMethod("invalid");
 		MethodParameter returnType = new MethodParameter(method, -1);
 
@@ -222,7 +217,7 @@ private void testToTextMessageWithReturnType(MethodParameter returnType) throws
 	}
 
 	@Test
-	public void toTextMessageWithJsonViewClass() throws JMSException {
+	void toTextMessageWithJsonViewClass() throws JMSException {
 		converter.setTargetType(MessageType.TEXT);
 		TextMessage textMessageMock = mock(TextMessage.class);
 
@@ -236,7 +231,7 @@ public void toTextMessageWithJsonViewClass() throws JMSException {
 	}
 
 	@Test
-	public void toTextMessageWithAnotherJsonViewClass() throws JMSException {
+	void toTextMessageWithAnotherJsonViewClass() throws JMSException {
 		converter.setTargetType(MessageType.TEXT);
 		TextMessage textMessageMock = mock(TextMessage.class);
 
diff --git a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
index 80e098ba1301..644086ebf784 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
@@ -83,7 +83,7 @@ public void testEscapedErrors() {
 		FieldError ageError = errors.getFieldError("age");
 		assertThat("message: &lt;tag&gt;".equals(ageError.getDefaultMessage())).as("Age error message escaped").isTrue();
 		assertThat("AGE_NOT_SET <tag>".equals(ageError.getCode())).as("Age error code not escaped").isTrue();
-		assertThat((new Integer(0)).equals(errors.getFieldValue("age"))).as("Age value not escaped").isTrue();
+		assertThat((Integer.valueOf(0)).equals(errors.getFieldValue("age"))).as("Age value not escaped").isTrue();
 		FieldError ageErrorInList = errors.getFieldErrors("age").get(0);
 		assertThat(ageError.getDefaultMessage().equals(ageErrorInList.getDefaultMessage())).as("Same name error in list").isTrue();
 		FieldError ageError2 = errors.getFieldErrors("age").get(1);
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
index d0f108eb9d7e..00a82790f3b6 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ void testIntParameter() throws ServletRequestBindingException {
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredIntParameter(request, "param2"));
 
-		assertThat(ServletRequestUtils.getIntParameter(request, "param3")).isEqualTo(null);
+		assertThat(ServletRequestUtils.getIntParameter(request, "param3")).isNull();
 		assertThat(ServletRequestUtils.getIntParameter(request, "param3", 6)).isEqualTo(6);
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredIntParameter(request, "param3"));
@@ -66,7 +66,7 @@ void testIntParameters() throws ServletRequestBindingException {
 
 		int[] array = new int[] {1, 2, 3};
 		int[] values = ServletRequestUtils.getRequiredIntParameters(request, "param");
-		assertThat(3).isEqualTo(values.length);
+		assertThat(values).hasSize(3);
 		for (int i = 0; i < array.length; i++) {
 			assertThat(array[i]).isEqualTo(values[i]);
 		}
@@ -81,7 +81,7 @@ void testLongParameter() throws ServletRequestBindingException {
 		request.addParameter("param2", "e");
 		request.addParameter("paramEmpty", "");
 
-		assertThat(ServletRequestUtils.getLongParameter(request, "param1")).isEqualTo(new Long(5L));
+		assertThat(ServletRequestUtils.getLongParameter(request, "param1")).isEqualTo(Long.valueOf(5L));
 		assertThat(ServletRequestUtils.getLongParameter(request, "param1", 6L)).isEqualTo(5L);
 		assertThat(ServletRequestUtils.getRequiredIntParameter(request, "param1")).isEqualTo(5L);
 
@@ -89,7 +89,7 @@ void testLongParameter() throws ServletRequestBindingException {
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredLongParameter(request, "param2"));
 
-		assertThat(ServletRequestUtils.getLongParameter(request, "param3")).isEqualTo(null);
+		assertThat(ServletRequestUtils.getLongParameter(request, "param3")).isNull();
 		assertThat(ServletRequestUtils.getLongParameter(request, "param3", 6L)).isEqualTo(6L);
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredLongParameter(request, "param3"));
@@ -128,7 +128,7 @@ void testFloatParameter() throws ServletRequestBindingException {
 		request.addParameter("param2", "e");
 		request.addParameter("paramEmpty", "");
 
-		assertThat(ServletRequestUtils.getFloatParameter(request, "param1").equals(new Float(5.5f))).isTrue();
+		assertThat(ServletRequestUtils.getFloatParameter(request, "param1")).isEqualTo(Float.valueOf(5.5f));
 		assertThat(ServletRequestUtils.getFloatParameter(request, "param1", 6.5f) == 5.5f).isTrue();
 		assertThat(ServletRequestUtils.getRequiredFloatParameter(request, "param1") == 5.5f).isTrue();
 
@@ -136,7 +136,7 @@ void testFloatParameter() throws ServletRequestBindingException {
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredFloatParameter(request, "param2"));
 
-		assertThat(ServletRequestUtils.getFloatParameter(request, "param3") == null).isTrue();
+		assertThat(ServletRequestUtils.getFloatParameter(request, "param3")).isNull();
 		assertThat(ServletRequestUtils.getFloatParameter(request, "param3", 6.5f) == 6.5f).isTrue();
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredFloatParameter(request, "param3"));
@@ -166,7 +166,7 @@ void testDoubleParameter() throws ServletRequestBindingException {
 		request.addParameter("param2", "e");
 		request.addParameter("paramEmpty", "");
 
-		assertThat(ServletRequestUtils.getDoubleParameter(request, "param1").equals(new Double(5.5))).isTrue();
+		assertThat(ServletRequestUtils.getDoubleParameter(request, "param1")).isEqualTo(Double.valueOf(5.5));
 		assertThat(ServletRequestUtils.getDoubleParameter(request, "param1", 6.5) == 5.5).isTrue();
 		assertThat(ServletRequestUtils.getRequiredDoubleParameter(request, "param1") == 5.5).isTrue();
 
@@ -174,7 +174,7 @@ void testDoubleParameter() throws ServletRequestBindingException {
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredDoubleParameter(request, "param2"));
 
-		assertThat(ServletRequestUtils.getDoubleParameter(request, "param3") == null).isTrue();
+		assertThat(ServletRequestUtils.getDoubleParameter(request, "param3")).isNull();
 		assertThat(ServletRequestUtils.getDoubleParameter(request, "param3", 6.5) == 6.5).isTrue();
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredDoubleParameter(request, "param3"));
@@ -212,7 +212,7 @@ void testBooleanParameter() throws ServletRequestBindingException {
 		assertThat(ServletRequestUtils.getBooleanParameter(request, "param2", true)).isFalse();
 		assertThat(ServletRequestUtils.getRequiredBooleanParameter(request, "param2")).isFalse();
 
-		assertThat(ServletRequestUtils.getBooleanParameter(request, "param3") == null).isTrue();
+		assertThat(ServletRequestUtils.getBooleanParameter(request, "param3")).isNull();
 		assertThat(ServletRequestUtils.getBooleanParameter(request, "param3", true)).isTrue();
 		assertThatExceptionOfType(ServletRequestBindingException.class).isThrownBy(() ->
 				ServletRequestUtils.getRequiredBooleanParameter(request, "param3"));
@@ -235,14 +235,14 @@ void testBooleanParameters() throws ServletRequestBindingException {
 
 		boolean[] array = new boolean[] {true, true, false, true, false};
 		boolean[] values = ServletRequestUtils.getRequiredBooleanParameters(request, "param");
-		assertThat(array.length).isEqualTo(values.length);
+		assertThat(array).hasSameSizeAs(values);
 		for (int i = 0; i < array.length; i++) {
 			assertThat(array[i]).isEqualTo(values[i]);
 		}
 
 		array = new boolean[] {false, true, false};
 		values = ServletRequestUtils.getRequiredBooleanParameters(request, "param2");
-		assertThat(array.length).isEqualTo(values.length);
+		assertThat(array).hasSameSizeAs(values);
 		for (int i = 0; i < array.length; i++) {
 			assertThat(array[i]).isEqualTo(values[i]);
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java
index 256b9631df72..9549902149ec 100644
--- a/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java
@@ -33,10 +33,10 @@
  * @author Sebastien Deleuze
  * @author Sam Brannen
  */
-public class CorsConfigurationTests {
+class CorsConfigurationTests {
 
 	@Test
-	public void setNullValues() {
+	void setNullValues() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.setAllowedOrigins(null);
 		assertThat(config.getAllowedOrigins()).isNull();
@@ -55,7 +55,7 @@ public void setNullValues() {
 	}
 
 	@Test
-	public void setValues() {
+	void setValues() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("*");
 		config.addAllowedOriginPattern("http://*.example.com");
@@ -71,11 +71,11 @@ public void setValues() {
 		assertThat(config.getAllowedMethods()).containsExactly("*");
 		assertThat(config.getExposedHeaders()).containsExactly("*");
 		assertThat(config.getAllowCredentials()).isTrue();
-		assertThat(config.getMaxAge()).isEqualTo(new Long(123));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(123));
 	}
 
 	@Test
-	public void combineWithNull() {
+	void combineWithNull() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.setAllowedOrigins(Collections.singletonList("*"));
 		config.combine(null);
@@ -84,7 +84,7 @@ public void combineWithNull() {
 	}
 
 	@Test
-	public void combineWithNullProperties() {
+	void combineWithNullProperties() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("*");
 		config.setAllowedOriginPatterns(Collections.singletonList("http://*.example.com"));
@@ -103,12 +103,12 @@ public void combineWithNullProperties() {
 		assertThat(config.getAllowedHeaders()).containsExactly("header1");
 		assertThat(config.getExposedHeaders()).containsExactly("header3");
 		assertThat(config.getAllowedMethods()).containsExactly(HttpMethod.GET.name());
-		assertThat(config.getMaxAge()).isEqualTo(new Long(123));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(123));
 		assertThat(config.getAllowCredentials()).isTrue();
 	}
 
 	@Test  // SPR-15772
-	public void combineWithDefaultPermitValues() {
+	void combineWithDefaultPermitValues() {
 		CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
 		CorsConfiguration other = new CorsConfiguration();
 		other.addAllowedOrigin("https://domain.com");
@@ -147,7 +147,7 @@ public void combineWithDefaultPermitValues() {
 	}
 
 	@Test
-	public void combinePatternWithDefaultPermitValues() {
+	void combinePatternWithDefaultPermitValues() {
 		CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
 		CorsConfiguration other = new CorsConfiguration();
 		other.addAllowedOriginPattern("http://*.com");
@@ -164,7 +164,7 @@ public void combinePatternWithDefaultPermitValues() {
 	}
 
 	@Test
-	public void combinePatternWithDefaultPermitValuesAndCustomOrigin() {
+	void combinePatternWithDefaultPermitValuesAndCustomOrigin() {
 		CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
 		config.setAllowedOrigins(Collections.singletonList("https://domain.com"));
 
@@ -183,7 +183,7 @@ public void combinePatternWithDefaultPermitValuesAndCustomOrigin() {
 	}
 
 	@Test
-	public void combineWithAsteriskWildCard() {
+	void combineWithAsteriskWildCard() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("*");
 		config.addAllowedHeader("*");
@@ -219,7 +219,7 @@ public void combineWithAsteriskWildCard() {
 	}
 
 	@Test  // SPR-14792
-	public void combineWithDuplicatedElements() {
+	void combineWithDuplicatedElements() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("https://domain1.com");
 		config.addAllowedOrigin("https://domain2.com");
@@ -249,7 +249,7 @@ public void combineWithDuplicatedElements() {
 	}
 
 	@Test
-	public void combine() {
+	void combine() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("https://domain1.com");
 		config.addAllowedOriginPattern("http://*.domain1.com");
@@ -274,14 +274,14 @@ public void combine() {
 		assertThat(config.getAllowedHeaders()).containsExactly("header1", "header2");
 		assertThat(config.getExposedHeaders()).containsExactly("header3", "header4");
 		assertThat(config.getAllowedMethods()).containsExactly(HttpMethod.GET.name(), HttpMethod.PUT.name());
-		assertThat(config.getMaxAge()).isEqualTo(new Long(456));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(456));
 		assertThat(config).isNotNull();
 		assertThat(config.getAllowCredentials()).isFalse();
 		assertThat(config.getAllowedOriginPatterns()).containsExactly("http://*.domain1.com", "http://*.domain2.com");
 	}
 
 	@Test
-	public void checkOriginAllowed() {
+	void checkOriginAllowed() {
 		// "*" matches
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOrigin("*");
@@ -306,7 +306,7 @@ public void checkOriginAllowed() {
 	}
 
 	@Test
-	public void checkOriginNotAllowed() {
+	void checkOriginNotAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkOrigin(null)).isNull();
 		assertThat(config.checkOrigin("https://domain.com")).isNull();
@@ -322,7 +322,7 @@ public void checkOriginNotAllowed() {
 	}
 
 	@Test
-	public void checkOriginPatternAllowed() {
+	void checkOriginPatternAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkOrigin("https://domain.com")).isNull();
 
@@ -349,7 +349,7 @@ public void checkOriginPatternAllowed() {
 	}
 
 	@Test
-	public void checkOriginPatternNotAllowed() {
+	void checkOriginPatternNotAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkOrigin(null)).isNull();
 		assertThat(config.checkOrigin("https://domain.com")).isNull();
@@ -367,7 +367,7 @@ public void checkOriginPatternNotAllowed() {
 	}
 
 	@Test
-	public void checkMethodAllowed() {
+	void checkMethodAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkHttpMethod(HttpMethod.GET)).containsExactly(HttpMethod.GET, HttpMethod.HEAD);
 
@@ -380,7 +380,7 @@ public void checkMethodAllowed() {
 	}
 
 	@Test
-	public void checkMethodNotAllowed() {
+	void checkMethodNotAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkHttpMethod(null)).isNull();
 		assertThat(config.checkHttpMethod(HttpMethod.DELETE)).isNull();
@@ -390,7 +390,7 @@ public void checkMethodNotAllowed() {
 	}
 
 	@Test
-	public void checkHeadersAllowed() {
+	void checkHeadersAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkHeaders(Collections.emptyList())).isEqualTo(Collections.emptyList());
 
@@ -403,7 +403,7 @@ public void checkHeadersAllowed() {
 	}
 
 	@Test
-	public void checkHeadersNotAllowed() {
+	void checkHeadersNotAllowed() {
 		CorsConfiguration config = new CorsConfiguration();
 		assertThat(config.checkHeaders(null)).isNull();
 		assertThat(config.checkHeaders(Collections.singletonList("header1"))).isNull();
@@ -417,7 +417,7 @@ public void checkHeadersNotAllowed() {
 	}
 
 	@Test  // SPR-15772
-	public void changePermitDefaultValues() {
+	void changePermitDefaultValues() {
 		CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
 		config.addAllowedOrigin("https://domain.com");
 		config.addAllowedHeader("header1");
@@ -429,7 +429,7 @@ public void changePermitDefaultValues() {
 	}
 
 	@Test
-	public void permitDefaultDoesntSetOriginWhenPatternPresent() {
+	void permitDefaultDoesntSetOriginWhenPatternPresent() {
 		CorsConfiguration config = new CorsConfiguration();
 		config.addAllowedOriginPattern("http://*.com");
 		config = config.applyPermitDefaultValues();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
index 3f1fce6612a2..f4fa67d7ce8a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/CrossOriginTests.java
@@ -159,7 +159,7 @@ void defaultAnnotation(TestRequestMappingInfoHandlerMapping mapping) throws Exce
 		assertThat(config.getAllowCredentials()).isNull();
 		assertThat(config.getAllowedHeaders()).containsExactly("*");
 		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
-		assertThat(config.getMaxAge()).isEqualTo(new Long(1800));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(1800));
 	}
 
 	@PathPatternsParameterizedTest
@@ -173,7 +173,7 @@ void customized(TestRequestMappingInfoHandlerMapping mapping) throws Exception {
 		assertThat(config.getAllowedOrigins()).containsExactly("https://site1.com", "https://site2.com");
 		assertThat(config.getAllowedHeaders()).containsExactly("header1", "header2");
 		assertThat(config.getExposedHeaders()).containsExactly("header3", "header4");
-		assertThat(config.getMaxAge()).isEqualTo(new Long(123));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(123));
 		assertThat(config.getAllowCredentials()).isFalse();
 	}
 
@@ -315,7 +315,7 @@ void preFlightRequest(TestRequestMappingInfoHandlerMapping mapping) throws Excep
 		assertThat(config.getAllowCredentials()).isNull();
 		assertThat(config.getAllowedHeaders()).containsExactly("*");
 		assertThat(CollectionUtils.isEmpty(config.getExposedHeaders())).isTrue();
-		assertThat(config.getMaxAge()).isEqualTo(new Long(1800));
+		assertThat(config.getMaxAge()).isEqualTo(Long.valueOf(1800));
 	}
 
 	@PathPatternsParameterizedTest
@@ -389,7 +389,7 @@ private CorsConfiguration getCorsConfiguration(@Nullable HandlerExecutionChain c
 		assertThat(chain).isNotNull();
 		if (isPreFlightRequest) {
 			Object handler = chain.getHandler();
-			assertThat(handler.getClass().getSimpleName().equals("PreFlightHandler")).isTrue();
+			assertThat(handler.getClass().getSimpleName()).isEqualTo("PreFlightHandler");
 			DirectFieldAccessor accessor = new DirectFieldAccessor(handler);
 			return (CorsConfiguration)accessor.getPropertyValue("config");
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
index 9e8da5248e67..41ee86b09401 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
  * @author Rossen Stoyanchev
  * @since 3.1
  */
-public class RedirectAttributesModelMapTests {
+class RedirectAttributesModelMapTests {
 
 	private RedirectAttributesModelMap redirectAttributes;
 
@@ -54,13 +54,13 @@ public void setup() {
 	}
 
 	@Test
-	public void addAttributePrimitiveType() {
+	void addAttributePrimitiveType() {
 		this.redirectAttributes.addAttribute("speed", 65);
 		assertThat(this.redirectAttributes.get("speed")).isEqualTo("65");
 	}
 
 	@Test
-	public void addAttributeCustomType() {
+	void addAttributeCustomType() {
 		String attrName = "person";
 		this.redirectAttributes.addAttribute(attrName, new TestBean("Fred"));
 
@@ -73,7 +73,7 @@ public void addAttributeCustomType() {
 	}
 
 	@Test
-	public void addAttributeToString() {
+	void addAttributeToString() {
 		String attrName = "person";
 		RedirectAttributesModelMap model = new RedirectAttributesModelMap();
 		model.addAttribute(attrName, new TestBean("Fred"));
@@ -82,22 +82,22 @@ public void addAttributeToString() {
 	}
 
 	@Test
-	public void addAttributeValue() {
+	void addAttributeValue() {
 		this.redirectAttributes.addAttribute(new TestBean("Fred"));
 
 		assertThat(this.redirectAttributes.get("testBean")).isEqualTo("Fred");
 	}
 
 	@Test
-	public void addAllAttributesList() {
-		this.redirectAttributes.addAllAttributes(Arrays.asList(new TestBean("Fred"), new Integer(5)));
+	void addAllAttributesList() {
+		this.redirectAttributes.addAllAttributes(Arrays.asList(new TestBean("Fred"), 5));
 
 		assertThat(this.redirectAttributes.get("testBean")).isEqualTo("Fred");
 		assertThat(this.redirectAttributes.get("integer")).isEqualTo("5");
 	}
 
 	@Test
-	public void addAttributesMap() {
+	void addAttributesMap() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
@@ -108,7 +108,7 @@ public void addAttributesMap() {
 	}
 
 	@Test
-	public void mergeAttributes() {
+	void mergeAttributes() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
@@ -121,14 +121,14 @@ public void mergeAttributes() {
 	}
 
 	@Test
-	public void put() {
+	void put() {
 		this.redirectAttributes.put("testBean", new TestBean("Fred"));
 
 		assertThat(this.redirectAttributes.get("testBean")).isEqualTo("Fred");
 	}
 
 	@Test
-	public void putAll() {
+	void putAll() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index d8f92d4de72e..24a9942e3499 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,10 +50,10 @@
  * @author Alef Arendsen
  * @author Mark Fisher
  */
-public class BindTagTests extends AbstractTagTests {
+class BindTagTests extends AbstractTagTests {
 
 	@Test
-	public void bindTagWithoutErrors() throws JspException {
+	void bindTagWithoutErrors() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", errors);
@@ -76,7 +76,7 @@ public void bindTagWithoutErrors() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithGlobalErrors() throws JspException {
+	void bindTagWithGlobalErrors() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		errors.reject("code1", "message1");
@@ -116,7 +116,7 @@ public void bindTagWithGlobalErrors() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithGlobalErrorsAndNoDefaultMessage() throws JspException {
+	void bindTagWithGlobalErrorsAndNoDefaultMessage() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		errors.reject("code1");
@@ -150,7 +150,7 @@ public void bindTagWithGlobalErrorsAndNoDefaultMessage() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithGlobalErrorsAndDefaultMessageOnly() throws JspException {
+	void bindTagWithGlobalErrorsAndDefaultMessageOnly() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		errors.reject(null, "message1");
@@ -186,7 +186,7 @@ public void bindTagWithGlobalErrorsAndDefaultMessageOnly() throws JspException {
 	}
 
 	@Test
-	public void bindStatusGetErrorMessagesAsString() throws JspException {
+	void bindStatusGetErrorMessagesAsString() throws JspException {
 		// one error (should not include delimiter)
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
@@ -225,7 +225,7 @@ public void bindStatusGetErrorMessagesAsString() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithFieldErrors() throws JspException {
+	void bindTagWithFieldErrors() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		tb.setName("name1");
@@ -263,7 +263,7 @@ public void bindTagWithFieldErrors() throws JspException {
 		status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
 		assertThat(status != null).as("Has status variable").isTrue();
 		assertThat("age".equals(status.getExpression())).as("Correct expression").isTrue();
-		assertThat(new Integer(0).equals(status.getValue())).as("Correct value").isTrue();
+		assertThat(Integer.valueOf(0).equals(status.getValue())).as("Correct value").isTrue();
 		assertThat("0".equals(status.getDisplayValue())).as("Correct displayValue").isTrue();
 		assertThat(status.isError()).as("Correct isError").isTrue();
 		assertThat(status.getErrorCodes().length == 1).as("Correct errorCodes").isTrue();
@@ -295,7 +295,7 @@ public void bindTagWithFieldErrors() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithFieldErrorsAndNoDefaultMessage() throws JspException {
+	void bindTagWithFieldErrorsAndNoDefaultMessage() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		tb.setName("name1");
@@ -328,7 +328,7 @@ public void bindTagWithFieldErrorsAndNoDefaultMessage() throws JspException {
 		status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
 		assertThat(status != null).as("Has status variable").isTrue();
 		assertThat("age".equals(status.getExpression())).as("Correct expression").isTrue();
-		assertThat(new Integer(0).equals(status.getValue())).as("Correct value").isTrue();
+		assertThat(Integer.valueOf(0).equals(status.getValue())).as("Correct value").isTrue();
 		assertThat("0".equals(status.getDisplayValue())).as("Correct displayValue").isTrue();
 		assertThat(status.isError()).as("Correct isError").isTrue();
 		assertThat(status.getErrorCodes().length == 1).as("Correct errorCodes").isTrue();
@@ -352,7 +352,7 @@ public void bindTagWithFieldErrorsAndNoDefaultMessage() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithFieldErrorsAndDefaultMessageOnly() throws JspException {
+	void bindTagWithFieldErrorsAndDefaultMessageOnly() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		tb.setName("name1");
@@ -386,7 +386,7 @@ public void bindTagWithFieldErrorsAndDefaultMessageOnly() throws JspException {
 		status = (BindStatus) pc.getAttribute(BindTag.STATUS_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
 		assertThat(status != null).as("Has status variable").isTrue();
 		assertThat("age".equals(status.getExpression())).as("Correct expression").isTrue();
-		assertThat(new Integer(0).equals(status.getValue())).as("Correct value").isTrue();
+		assertThat(Integer.valueOf(0).equals(status.getValue())).as("Correct value").isTrue();
 		assertThat("0".equals(status.getDisplayValue())).as("Correct displayValue").isTrue();
 		assertThat(status.isError()).as("Correct isError").isTrue();
 		assertThat(status.getErrorMessages().length == 1).as("Correct errorMessages").isTrue();
@@ -411,7 +411,7 @@ public void bindTagWithFieldErrorsAndDefaultMessageOnly() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithNestedFieldErrors() throws JspException {
+	void bindTagWithNestedFieldErrors() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		tb.setName("name1");
@@ -439,7 +439,7 @@ public void bindTagWithNestedFieldErrors() throws JspException {
 	}
 
 	@Test
-	public void propertyExposing() throws JspException {
+	void propertyExposing() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		tb.setName("name1");
@@ -464,7 +464,7 @@ public void propertyExposing() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithIndexedProperties() throws JspException {
+	void bindTagWithIndexedProperties() throws JspException {
 		PageContext pc = createPageContext();
 		IndexedTestBean tb = new IndexedTestBean();
 		Errors errors = new ServletRequestDataBinder(tb, "tb").getBindingResult();
@@ -492,7 +492,7 @@ public void bindTagWithIndexedProperties() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithMappedProperties() throws JspException {
+	void bindTagWithMappedProperties() throws JspException {
 		PageContext pc = createPageContext();
 		IndexedTestBean tb = new IndexedTestBean();
 		Errors errors = new ServletRequestDataBinder(tb, "tb").getBindingResult();
@@ -520,7 +520,7 @@ public void bindTagWithMappedProperties() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithIndexedPropertiesAndCustomEditor() throws JspException {
+	void bindTagWithIndexedPropertiesAndCustomEditor() throws JspException {
 		PageContext pc = createPageContext();
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new ServletRequestDataBinder(tb, "tb");
@@ -549,7 +549,7 @@ public String getAsText() {
 	}
 
 	@Test
-	public void bindTagWithToStringAndHtmlEscaping() throws JspException {
+	void bindTagWithToStringAndHtmlEscaping() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -568,7 +568,7 @@ public void bindTagWithToStringAndHtmlEscaping() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithSetValueAndHtmlEscaping() throws JspException {
+	void bindTagWithSetValueAndHtmlEscaping() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -583,7 +583,7 @@ public void bindTagWithSetValueAndHtmlEscaping() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithFieldButWithoutErrorsInstance() throws JspException {
+	void bindTagWithFieldButWithoutErrorsInstance() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -596,7 +596,7 @@ public void bindTagWithFieldButWithoutErrorsInstance() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithFieldButWithoutErrorsInstanceAndHtmlEscaping() throws JspException {
+	void bindTagWithFieldButWithoutErrorsInstanceAndHtmlEscaping() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -610,7 +610,7 @@ public void bindTagWithFieldButWithoutErrorsInstanceAndHtmlEscaping() throws Jsp
 	}
 
 	@Test
-	public void bindTagWithBeanButWithoutErrorsInstance() throws JspException {
+	void bindTagWithBeanButWithoutErrorsInstance() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -623,7 +623,7 @@ public void bindTagWithBeanButWithoutErrorsInstance() throws JspException {
 	}
 
 	@Test
-	public void bindTagWithoutBean() throws JspException {
+	void bindTagWithoutBean() throws JspException {
 		PageContext pc = createPageContext();
 		BindTag tag = new BindTag();
 		tag.setPageContext(pc);
@@ -634,7 +634,7 @@ public void bindTagWithoutBean() throws JspException {
 
 
 	@Test
-	public void bindErrorsTagWithoutErrors() throws JspException {
+	void bindErrorsTagWithoutErrors() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", errors);
@@ -646,7 +646,7 @@ public void bindErrorsTagWithoutErrors() throws JspException {
 	}
 
 	@Test
-	public void bindErrorsTagWithErrors() throws JspException {
+	void bindErrorsTagWithErrors() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		errors.reject("test", null, "test");
@@ -659,7 +659,7 @@ public void bindErrorsTagWithErrors() throws JspException {
 	}
 
 	@Test
-	public void bindErrorsTagWithoutBean() throws JspException {
+	void bindErrorsTagWithoutBean() throws JspException {
 		PageContext pc = createPageContext();
 		BindErrorsTag tag = new BindErrorsTag();
 		tag.setPageContext(pc);
@@ -669,7 +669,7 @@ public void bindErrorsTagWithoutBean() throws JspException {
 
 
 	@Test
-	public void nestedPathDoEndTag() throws JspException {
+	void nestedPathDoEndTag() throws JspException {
 		PageContext pc = createPageContext();
 		NestedPathTag tag = new NestedPathTag();
 		tag.setPath("foo");
@@ -681,7 +681,7 @@ public void nestedPathDoEndTag() throws JspException {
 	}
 
 	@Test
-	public void nestedPathDoEndTagWithNesting() throws JspException {
+	void nestedPathDoEndTagWithNesting() throws JspException {
 		PageContext pc = createPageContext();
 		NestedPathTag tag = new NestedPathTag();
 		tag.setPath("foo");
@@ -701,7 +701,7 @@ public void nestedPathDoEndTagWithNesting() throws JspException {
 	}
 
 	@Test
-	public void nestedPathDoStartTagInternal() throws JspException {
+	void nestedPathDoStartTagInternal() throws JspException {
 		PageContext pc = createPageContext();
 		NestedPathTag tag = new NestedPathTag();
 		tag.setPath("foo");
@@ -713,7 +713,7 @@ public void nestedPathDoStartTagInternal() throws JspException {
 	}
 
 	@Test
-	public void nestedPathDoStartTagInternalWithNesting() throws JspException {
+	void nestedPathDoStartTagInternalWithNesting() throws JspException {
 		PageContext pc = createPageContext();
 		NestedPathTag tag = new NestedPathTag();
 		tag.setPath("foo");
@@ -746,7 +746,7 @@ public void nestedPathDoStartTagInternalWithNesting() throws JspException {
 	}
 
 	@Test
-	public void nestedPathWithBindTag() throws JspException {
+	void nestedPathWithBindTag() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb").getBindingResult();
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", errors);
@@ -788,7 +788,7 @@ public void nestedPathWithBindTag() throws JspException {
 	}
 
 	@Test
-	public void nestedPathWithBindTagWithIgnoreNestedPath() throws JspException {
+	void nestedPathWithBindTagWithIgnoreNestedPath() throws JspException {
 		PageContext pc = createPageContext();
 		Errors errors = new ServletRequestDataBinder(new TestBean(), "tb2").getBindingResult();
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb2", errors);
@@ -810,7 +810,7 @@ public void nestedPathWithBindTagWithIgnoreNestedPath() throws JspException {
 	}
 
 	@Test
-	public void transformTagCorrectBehavior() throws JspException {
+	void transformTagCorrectBehavior() throws JspException {
 		// first set up the pagecontext and the bean
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
@@ -855,7 +855,7 @@ public void transformTagCorrectBehavior() throws JspException {
 	}
 
 	@Test
-	public void transformTagWithHtmlEscape() throws JspException {
+	void transformTagWithHtmlEscape() throws JspException {
 		// first set up the PageContext and the bean
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
@@ -884,7 +884,7 @@ public void transformTagWithHtmlEscape() throws JspException {
 	}
 
 	@Test
-	public void transformTagOutsideBindTag() throws JspException {
+	void transformTagOutsideBindTag() throws JspException {
 		// first set up the pagecontext and the bean
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
@@ -915,7 +915,7 @@ public void transformTagOutsideBindTag() throws JspException {
 	}
 
 	@Test
-	public void transformTagNonExistingValue() throws JspException {
+	void transformTagNonExistingValue() throws JspException {
 		// first set up the pagecontext and the bean
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
@@ -942,7 +942,7 @@ public void transformTagNonExistingValue() throws JspException {
 	}
 
 	@Test
-	public void transformTagWithSettingOfScope() throws JspException {
+	void transformTagWithSettingOfScope() throws JspException {
 		// first set up the pagecontext and the bean
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
@@ -997,7 +997,7 @@ public void transformTagWithSettingOfScope() throws JspException {
 	 */
 	@SuppressWarnings("serial")
 	@Test
-	public void nestingInFormTag() throws JspException {
+	void nestingInFormTag() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index 164a41582682..39e1bb710b9a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@
  * @author Jeremy Grelle
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class CheckboxTagTests extends AbstractFormTagTests {
+class CheckboxTagTests extends AbstractFormTagTests {
 
 	private CheckboxTag tag;
 
@@ -68,7 +68,7 @@ protected TagWriter createTagWriter() {
 	}
 
 	@Test
-	public void withSingleValueBooleanObjectChecked() throws Exception {
+	void withSingleValueBooleanObjectChecked() throws Exception {
 		this.tag.setPath("someBoolean");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(Tag.SKIP_BODY);
@@ -91,7 +91,7 @@ public void withSingleValueBooleanObjectChecked() throws Exception {
 	}
 
 	@Test
-	public void withIndexedBooleanObjectNotChecked() throws Exception {
+	void withIndexedBooleanObjectNotChecked() throws Exception {
 		this.tag.setPath("someMap[key]");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(Tag.SKIP_BODY);
@@ -114,7 +114,7 @@ public void withIndexedBooleanObjectNotChecked() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueBooleanObjectCheckedAndDynamicAttributes() throws Exception {
+	void withSingleValueBooleanObjectCheckedAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
 
@@ -144,7 +144,7 @@ public void withSingleValueBooleanObjectCheckedAndDynamicAttributes() throws Exc
 	}
 
 	@Test
-	public void withSingleValueBooleanChecked() throws Exception {
+	void withSingleValueBooleanChecked() throws Exception {
 		this.tag.setPath("jedi");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(Tag.SKIP_BODY);
@@ -164,7 +164,7 @@ public void withSingleValueBooleanChecked() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueBooleanObjectUnchecked() throws Exception {
+	void withSingleValueBooleanObjectUnchecked() throws Exception {
 		this.bean.setSomeBoolean(Boolean.FALSE);
 		this.tag.setPath("someBoolean");
 		int result = this.tag.doStartTag();
@@ -186,7 +186,7 @@ public void withSingleValueBooleanObjectUnchecked() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueBooleanUnchecked() throws Exception {
+	void withSingleValueBooleanUnchecked() throws Exception {
 		this.bean.setJedi(false);
 		this.tag.setPath("jedi");
 		int result = this.tag.doStartTag();
@@ -208,7 +208,7 @@ public void withSingleValueBooleanUnchecked() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueNull() throws Exception {
+	void withSingleValueNull() throws Exception {
 		this.bean.setName(null);
 		this.tag.setPath("name");
 		this.tag.setValue("Rob Harrop");
@@ -231,7 +231,7 @@ public void withSingleValueNull() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueNotNull() throws Exception {
+	void withSingleValueNotNull() throws Exception {
 		this.bean.setName("Rob Harrop");
 		this.tag.setPath("name");
 		this.tag.setValue("Rob Harrop");
@@ -254,7 +254,7 @@ public void withSingleValueNotNull() throws Exception {
 	}
 
 	@Test
-	public void withSingleValueAndEditor() throws Exception {
+	void withSingleValueAndEditor() throws Exception {
 		this.bean.setName("Rob Harrop");
 		this.tag.setPath("name");
 		this.tag.setValue("   Rob Harrop");
@@ -281,7 +281,7 @@ public void withSingleValueAndEditor() throws Exception {
 	}
 
 	@Test
-	public void withMultiValueChecked() throws Exception {
+	void withMultiValueChecked() throws Exception {
 		this.tag.setPath("stringArray");
 		this.tag.setValue("foo");
 		int result = this.tag.doStartTag();
@@ -303,7 +303,7 @@ public void withMultiValueChecked() throws Exception {
 	}
 
 	@Test
-	public void withMultiValueUnchecked() throws Exception {
+	void withMultiValueUnchecked() throws Exception {
 		this.tag.setPath("stringArray");
 		this.tag.setValue("abc");
 		int result = this.tag.doStartTag();
@@ -325,7 +325,7 @@ public void withMultiValueUnchecked() throws Exception {
 	}
 
 	@Test
-	public void withMultiValueWithEditor() throws Exception {
+	void withMultiValueWithEditor() throws Exception {
 		this.tag.setPath("stringArray");
 		this.tag.setValue("   foo");
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
@@ -353,7 +353,7 @@ public void withMultiValueWithEditor() throws Exception {
 	}
 
 	@Test
-	public void withMultiValueIntegerWithEditor() throws Exception {
+	void withMultiValueIntegerWithEditor() throws Exception {
 		this.tag.setPath("someIntegerArray");
 		this.tag.setValue("   1");
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
@@ -381,7 +381,7 @@ public void withMultiValueIntegerWithEditor() throws Exception {
 	}
 
 	@Test
-	public void withCollection() throws Exception {
+	void withCollection() throws Exception {
 		this.tag.setPath("someList");
 		this.tag.setValue("foo");
 		int result = this.tag.doStartTag();
@@ -403,7 +403,7 @@ public void withCollection() throws Exception {
 	}
 
 	@Test
-	public void withObjectChecked() throws Exception {
+	void withObjectChecked() throws Exception {
 		this.tag.setPath("date");
 		this.tag.setValue(getDate());
 
@@ -426,7 +426,7 @@ public void withObjectChecked() throws Exception {
 	}
 
 	@Test
-	public void withObjectUnchecked() throws Exception {
+	void withObjectUnchecked() throws Exception {
 		this.tag.setPath("date");
 		Date date = new Date();
 		this.tag.setValue(date);
@@ -450,7 +450,7 @@ public void withObjectUnchecked() throws Exception {
 	}
 
 	@Test
-	public void collectionOfColoursSelected() throws Exception {
+	void collectionOfColoursSelected() throws Exception {
 		this.tag.setPath("otherColours");
 		this.tag.setValue("RED");
 
@@ -472,7 +472,7 @@ public void collectionOfColoursSelected() throws Exception {
 	}
 
 	@Test
-	public void collectionOfColoursNotSelected() throws Exception {
+	void collectionOfColoursNotSelected() throws Exception {
 		this.tag.setPath("otherColours");
 		this.tag.setValue("PURPLE");
 
@@ -494,7 +494,7 @@ public void collectionOfColoursNotSelected() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsAsString() throws Exception {
+	void collectionOfPetsAsString() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue("Spot");
 
@@ -516,7 +516,7 @@ public void collectionOfPetsAsString() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsAsStringNotSelected() throws Exception {
+	void collectionOfPetsAsStringNotSelected() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue("Santa's Little Helper");
 
@@ -538,7 +538,7 @@ public void collectionOfPetsAsStringNotSelected() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPets() throws Exception {
+	void collectionOfPets() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new Pet("Rudiger"));
 
@@ -561,7 +561,7 @@ public void collectionOfPets() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsNotSelected() throws Exception {
+	void collectionOfPetsNotSelected() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new Pet("Santa's Little Helper"));
 
@@ -584,7 +584,7 @@ public void collectionOfPetsNotSelected() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsWithEditor() throws Exception {
+	void collectionOfPetsWithEditor() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new ItemPet("Rudiger"));
 
@@ -612,14 +612,14 @@ public void collectionOfPetsWithEditor() throws Exception {
 	}
 
 	@Test
-	public void withNullValue() throws Exception {
+	void withNullValue() throws Exception {
 		this.tag.setPath("name");
 		assertThatIllegalArgumentException().as("null value binding to a non-boolean").isThrownBy(
 				this.tag::doStartTag);
 	}
 
 	@Test
-	public void hiddenElementOmittedOnDisabled() throws Exception {
+	void hiddenElementOmittedOnDisabled() throws Exception {
 		this.tag.setPath("someBoolean");
 		this.tag.setDisabled(true);
 		int result = this.tag.doStartTag();
@@ -642,7 +642,7 @@ public void hiddenElementOmittedOnDisabled() throws Exception {
 	}
 
 	@Test
-	public void dynamicTypeAttribute() throws JspException {
+	void dynamicTypeAttribute() throws JspException {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				this.tag.setDynamicAttribute(null, "type", "email"))
 			.withMessage("Attribute type=\"email\" is not allowed");
@@ -718,7 +718,7 @@ private class MyIntegerEditor extends PropertyEditorSupport {
 		@Override
 		public void setAsText(String text) {
 			this.count++;
-			setValue(new Integer(text.trim()));
+			setValue(Integer.valueOf(text.trim()));
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index 29c95bda5590..e323aff62bba 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 /**
  * @author Rob Harrop
  */
-public class HiddenInputTagTests extends AbstractFormTagTests {
+class HiddenInputTagTests extends AbstractFormTagTests {
 
 	private HiddenInputTag tag;
 
@@ -49,7 +49,7 @@ protected TagWriter createTagWriter() {
 	}
 
 	@Test
-	public void render() throws Exception {
+	void render() throws Exception {
 		this.tag.setPath("name");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(Tag.SKIP_BODY);
@@ -65,7 +65,7 @@ public void render() throws Exception {
 	}
 
 	@Test
-	public void withCustomBinder() throws Exception {
+	void withCustomBinder() throws Exception {
 		this.tag.setPath("myFloat");
 
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
@@ -84,14 +84,14 @@ public void withCustomBinder() throws Exception {
 	}
 
 	@Test
-	public void dynamicTypeAttribute() throws JspException {
+	void dynamicTypeAttribute() throws JspException {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				this.tag.setDynamicAttribute(null, "type", "email"))
 			.withMessage("Attribute type=\"email\" is not allowed");
 	}
 
 	@Test
-	public void disabledTrue() throws Exception {
+	void disabledTrue() throws Exception {
 		this.tag.setDisabled(true);
 
 		this.tag.doStartTag();
@@ -107,7 +107,7 @@ public void disabledTrue() throws Exception {
 	// SPR-8661
 
 	@Test
-	public void disabledFalse() throws Exception {
+	void disabledFalse() throws Exception {
 		this.tag.setDisabled(false);
 
 		this.tag.doStartTag();
@@ -132,7 +132,7 @@ private void assertTagOpened(String output) {
 	protected TestBean createTestBean() {
 		this.bean = new TestBean();
 		bean.setName("Sally Greenwood");
-		bean.setMyFloat(new Float("12.34"));
+		bean.setMyFloat(Float.valueOf("12.34"));
 		return bean;
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index a68de172d710..59def204ee51 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -56,7 +56,7 @@ protected TestBean createTestBean() {
 		// set up test data
 		this.rob = new TestBean();
 		this.rob.setName("Rob");
-		this.rob.setMyFloat(new Float(12.34));
+		this.rob.setMyFloat(Float.valueOf(12.34f));
 
 		TestBean sally = new TestBean();
 		sally.setName("Sally");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index 54de88290b91..a94bee41a7d7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
  * @author Jeremy Grelle
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class OptionTagTests extends AbstractHtmlElementTagTests {
+class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	private static final String ARRAY_SOURCE = "abc,123,def";
 
@@ -79,7 +79,7 @@ public String getName() {
 
 
 	@Test
-	public void canBeDisabledEvenWhenSelected() throws Exception {
+	void canBeDisabledEvenWhenSelected() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -101,7 +101,7 @@ public void canBeDisabledEvenWhenSelected() throws Exception {
 	}
 
 	@Test
-	public void renderNotSelected() throws Exception {
+	void renderNotSelected() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -121,7 +121,7 @@ public void renderNotSelected() throws Exception {
 	}
 
 	@Test
-	public void renderWithDynamicAttributes() throws Exception {
+	void renderWithDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
 
@@ -149,7 +149,7 @@ public void renderWithDynamicAttributes() throws Exception {
 	}
 
 	@Test
-	public void renderSelected() throws Exception {
+	void renderSelected() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -172,7 +172,7 @@ public void renderSelected() throws Exception {
 	}
 
 	@Test
-	public void withNoLabel() throws Exception {
+	void withNoLabel() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -195,7 +195,7 @@ public void withNoLabel() throws Exception {
 	}
 
 	@Test
-	public void withoutContext() throws Exception {
+	void withoutContext() throws Exception {
 		this.tag.setParent(null);
 		this.tag.setValue("foo");
 		this.tag.setLabel("Foo");
@@ -204,7 +204,7 @@ public void withoutContext() throws Exception {
 	}
 
 	@Test
-	public void withPropertyEditor() throws Exception {
+	void withPropertyEditor() throws Exception {
 		String selectName = "testBean.stringArray";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
 			@Override
@@ -233,7 +233,7 @@ public PropertyEditor getEditor() {
 	}
 
 	@Test
-	public void withPropertyEditorStringComparison() throws Exception {
+	void withPropertyEditorStringComparison() throws Exception {
 		final PropertyEditor testBeanEditor = new TestBeanPropertyEditor();
 		testBeanEditor.setValue(new TestBean("Sally"));
 		String selectName = "testBean.spouse";
@@ -261,11 +261,11 @@ public PropertyEditor getEditor() {
 	}
 
 	@Test
-	public void withCustomObjectSelected() throws Exception {
+	void withCustomObjectSelected() throws Exception {
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
-		this.tag.setValue(new Float(12.34));
+		this.tag.setValue(12.34f);
 		this.tag.setLabel("GBP 12.34");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED);
@@ -282,11 +282,11 @@ public void withCustomObjectSelected() throws Exception {
 	}
 
 	@Test
-	public void withCustomObjectNotSelected() throws Exception {
+	void withCustomObjectNotSelected() throws Exception {
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
-		this.tag.setValue(new Float(12.35));
+		this.tag.setValue(12.35f);
 		this.tag.setLabel("GBP 12.35");
 		int result = this.tag.doStartTag();
 		assertThat(result).isEqualTo(BodyTag.EVAL_BODY_BUFFERED);
@@ -303,9 +303,9 @@ public void withCustomObjectNotSelected() throws Exception {
 	}
 
 	@Test
-	public void withCustomObjectAndEditorSelected() throws Exception {
+	void withCustomObjectAndEditorSelected() throws Exception {
 		final PropertyEditor floatEditor = new SimpleFloatEditor();
-		floatEditor.setValue(new Float("12.34"));
+		floatEditor.setValue(Float.valueOf("12.34"));
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
 			@Override
@@ -315,7 +315,7 @@ public PropertyEditor getEditor() {
 		};
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
 
-		this.tag.setValue(new Float(12.34));
+		this.tag.setValue(12.34f);
 		this.tag.setLabel("12.34f");
 
 		int result = this.tag.doStartTag();
@@ -331,7 +331,7 @@ public PropertyEditor getEditor() {
 	}
 
 	@Test
-	public void withCustomObjectAndEditorNotSelected() throws Exception {
+	void withCustomObjectAndEditorNotSelected() throws Exception {
 		final PropertyEditor floatEditor = new SimpleFloatEditor();
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
@@ -342,7 +342,7 @@ public PropertyEditor getEditor() {
 		};
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
 
-		this.tag.setValue(new Float(12.35));
+		this.tag.setValue(12.35f);
 		this.tag.setLabel("12.35f");
 
 		int result = this.tag.doStartTag();
@@ -358,7 +358,7 @@ public PropertyEditor getEditor() {
 	}
 
 	@Test
-	public void asBodyTag() throws Exception {
+	void asBodyTag() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -380,7 +380,7 @@ public void asBodyTag() throws Exception {
 	}
 
 	@Test
-	public void asBodyTagSelected() throws Exception {
+	void asBodyTagSelected() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -401,7 +401,7 @@ public void asBodyTagSelected() throws Exception {
 	}
 
 	@Test
-	public void asBodyTagCollapsed() throws Exception {
+	void asBodyTagCollapsed() throws Exception {
 		String selectName = "testBean.name";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false);
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, bindStatus);
@@ -423,7 +423,7 @@ public void asBodyTagCollapsed() throws Exception {
 	}
 
 	@Test
-	public void asBodyTagWithEditor() throws Exception {
+	void asBodyTagWithEditor() throws Exception {
 		String selectName = "testBean.stringArray";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
 			@Override
@@ -447,7 +447,7 @@ public PropertyEditor getEditor() {
 	}
 
 	@Test
-	public void multiBind() throws Exception {
+	void multiBind() throws Exception {
 		BeanPropertyBindingResult result = new BeanPropertyBindingResult(new TestBean(), "testBean");
 		result.getPropertyAccessor().registerCustomEditor(TestBean.class, "friends", new FriendEditor());
 		exposeBindingResult(result);
@@ -463,7 +463,7 @@ public void multiBind() throws Exception {
 	}
 
 	@Test
-	public void optionTagNotNestedWithinSelectTag() throws Exception {
+	void optionTagNotNestedWithinSelectTag() throws Exception {
 		tag.setParent(null);
 		tag.setValue("foo");
 		assertThatIllegalStateException().as("when not nested within a <select/> tag").isThrownBy(
@@ -486,7 +486,7 @@ protected void extendRequest(MockHttpServletRequest request) {
 		bean.setFavouriteColour(Colour.GREEN);
 		bean.setStringArray(ARRAY);
 		bean.setSpouse(new TestBean("Sally"));
-		bean.setSomeNumber(new Float("12.34"));
+		bean.setSomeNumber(Float.valueOf("12.34"));
 
 		List friends = new ArrayList();
 		friends.add(new TestBean("bar"));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index b01dc4878de4..48479f6bebf9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
  * @author Jeremy Grelle
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class OptionsTagTests extends AbstractHtmlElementTagTests {
+class OptionsTagTests extends AbstractHtmlElementTagTests {
 
 	private static final String COMMAND_NAME = "testBean";
 
@@ -87,7 +87,7 @@ public String getName() {
 	}
 
 	@Test
-	public void withCollection() throws Exception {
+	void withCollection() throws Exception {
 		getPageContext().setAttribute(
 				SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, new BindStatus(getRequestContext(), "testBean.country", false));
 
@@ -117,7 +117,7 @@ public void withCollection() throws Exception {
 	}
 
 	@Test
-	public void withCollectionAndDynamicAttributes() throws Exception {
+	void withCollectionAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
 
@@ -155,11 +155,11 @@ public void withCollectionAndDynamicAttributes() throws Exception {
 	}
 
 	@Test
-	public void withCollectionAndCustomEditor() throws Exception {
+	void withCollectionAndCustomEditor() throws Exception {
 		PropertyEditor propertyEditor = new SimpleFloatEditor();
 
 		TestBean target = new TestBean();
-		target.setMyFloat(new Float("12.34"));
+		target.setMyFloat(Float.valueOf("12.34"));
 
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(target, COMMAND_NAME);
 		errors.getPropertyAccessor().registerCustomEditor(Float.class, propertyEditor);
@@ -169,12 +169,12 @@ public void withCollectionAndCustomEditor() throws Exception {
 				SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, new BindStatus(getRequestContext(), "testBean.myFloat", false));
 
 		List<Float> floats = new ArrayList<>();
-		floats.add(new Float("12.30"));
-		floats.add(new Float("12.31"));
-		floats.add(new Float("12.32"));
-		floats.add(new Float("12.33"));
-		floats.add(new Float("12.34"));
-		floats.add(new Float("12.35"));
+		floats.add(Float.valueOf("12.30"));
+		floats.add(Float.valueOf("12.31"));
+		floats.add(Float.valueOf("12.32"));
+		floats.add(Float.valueOf("12.33"));
+		floats.add(Float.valueOf("12.34"));
+		floats.add(Float.valueOf("12.35"));
 
 		this.tag.setItems(floats);
 		int result = this.tag.doStartTag();
@@ -201,7 +201,7 @@ public void withCollectionAndCustomEditor() throws Exception {
 	}
 
 	@Test
-	public void withItemsNullReference() throws Exception {
+	void withItemsNullReference() throws Exception {
 		getPageContext().setAttribute(
 				SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, new BindStatus(getRequestContext(), "testBean.country", false));
 
@@ -222,7 +222,7 @@ public void withItemsNullReference() throws Exception {
 	}
 
 	@Test
-	public void withoutItems() throws Exception {
+	void withoutItems() throws Exception {
 		this.tag.setItemValue("isoCode");
 		this.tag.setItemLabel("name");
 		this.selectTag.setPath("testBean");
@@ -243,7 +243,7 @@ public void withoutItems() throws Exception {
 	}
 
 	@Test
-	public void withoutItemsEnumParent() throws Exception {
+	void withoutItemsEnumParent() throws Exception {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
@@ -271,7 +271,7 @@ public void withoutItemsEnumParent() throws Exception {
 	}
 
 	@Test
-	public void withoutItemsEnumParentWithExplicitLabelsAndValues() throws Exception {
+	void withoutItemsEnumParentWithExplicitLabelsAndValues() throws Exception {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
@@ -305,16 +305,16 @@ protected void extendRequest(MockHttpServletRequest request) {
 		TestBean bean = new TestBean();
 		bean.setName("foo");
 		bean.setCountry("UK");
-		bean.setMyFloat(new Float("12.34"));
+		bean.setMyFloat(Float.valueOf("12.34"));
 		request.setAttribute(COMMAND_NAME, bean);
 
 		List floats = new ArrayList();
-		floats.add(new Float("12.30"));
-		floats.add(new Float("12.31"));
-		floats.add(new Float("12.32"));
-		floats.add(new Float("12.33"));
-		floats.add(new Float("12.34"));
-		floats.add(new Float("12.35"));
+		floats.add(Float.valueOf("12.30"));
+		floats.add(Float.valueOf("12.31"));
+		floats.add(Float.valueOf("12.32"));
+		floats.add(Float.valueOf("12.33"));
+		floats.add(Float.valueOf("12.34"));
+		floats.add(Float.valueOf("12.35"));
 
 		request.setAttribute("floats", floats);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index fe5c805d8af1..ac40da641332 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
  * @author Juergen Hoeller
  * @author Jeremy Grelle
  */
-public class RadioButtonTagTests extends AbstractFormTagTests {
+class RadioButtonTagTests extends AbstractFormTagTests {
 
 	private RadioButtonTag tag;
 
@@ -60,7 +60,7 @@ protected TagWriter createTagWriter() {
 	}
 
 	@Test
-	public void withCheckedValue() throws Exception {
+	void withCheckedValue() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
 
@@ -84,7 +84,7 @@ public void withCheckedValue() throws Exception {
 	}
 
 	@Test
-	public void withCheckedValueAndDynamicAttributes() throws Exception {
+	void withCheckedValueAndDynamicAttributes() throws Exception {
 		this.tag.setPath("sex");
 		this.tag.setValue("M");
 		int result = this.tag.doStartTag();
@@ -100,7 +100,7 @@ public void withCheckedValueAndDynamicAttributes() throws Exception {
 	}
 
 	@Test
-	public void withCheckedObjectValue() throws Exception {
+	void withCheckedObjectValue() throws Exception {
 		this.tag.setPath("myFloat");
 		this.tag.setValue(getFloat());
 		int result = this.tag.doStartTag();
@@ -116,7 +116,7 @@ public void withCheckedObjectValue() throws Exception {
 	}
 
 	@Test
-	public void withCheckedObjectValueAndEditor() throws Exception {
+	void withCheckedObjectValueAndEditor() throws Exception {
 		this.tag.setPath("myFloat");
 		this.tag.setValue("F12.99");
 
@@ -138,8 +138,8 @@ public void withCheckedObjectValueAndEditor() throws Exception {
 	}
 
 	@Test
-	public void withUncheckedObjectValue() throws Exception {
-		Float value = new Float("99.45");
+	void withUncheckedObjectValue() throws Exception {
+		Float value = Float.valueOf("99.45");
 		this.tag.setPath("myFloat");
 		this.tag.setValue(value);
 		int result = this.tag.doStartTag();
@@ -155,7 +155,7 @@ public void withUncheckedObjectValue() throws Exception {
 	}
 
 	@Test
-	public void withUncheckedValue() throws Exception {
+	void withUncheckedValue() throws Exception {
 		this.tag.setPath("sex");
 		this.tag.setValue("F");
 		int result = this.tag.doStartTag();
@@ -171,7 +171,7 @@ public void withUncheckedValue() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPets() throws Exception {
+	void collectionOfPets() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new Pet("Rudiger"));
 
@@ -194,7 +194,7 @@ public void collectionOfPets() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsNotSelected() throws Exception {
+	void collectionOfPetsNotSelected() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new Pet("Santa's Little Helper"));
 
@@ -217,7 +217,7 @@ public void collectionOfPetsNotSelected() throws Exception {
 	}
 
 	@Test
-	public void collectionOfPetsWithEditor() throws Exception {
+	void collectionOfPetsWithEditor() throws Exception {
 		this.tag.setPath("pets");
 		this.tag.setValue(new ItemPet("Rudiger"));
 
@@ -245,7 +245,7 @@ public void collectionOfPetsWithEditor() throws Exception {
 	}
 
 	@Test
-	public void dynamicTypeAttribute() throws JspException {
+	void dynamicTypeAttribute() throws JspException {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				this.tag.setDynamicAttribute(null, "type", "email"))
 			.withMessage("Attribute type=\"email\" is not allowed");
@@ -260,7 +260,7 @@ private void assertTagClosed(String output) {
 	}
 
 	private Float getFloat() {
-		return new Float("12.99");
+		return Float.valueOf("12.99");
 	}
 
 	@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index 2ceafc8260e5..bade64bf142e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -429,9 +429,9 @@ public void withFloatCustom() throws Exception {
 		this.tag.setPath("myFloat");
 
 		Float[] array = new Float[] {
-				new Float("12.30"), new Float("12.32"), new Float("12.34"), new Float("12.36"),
-				new Float("12.38"), new Float("12.40"), new Float("12.42"), new Float("12.44"),
-				new Float("12.46"), new Float("12.48")
+				Float.valueOf("12.30"), Float.valueOf("12.32"), Float.valueOf("12.34"), Float.valueOf("12.36"),
+				Float.valueOf("12.38"), Float.valueOf("12.40"), Float.valueOf("12.42"), Float.valueOf("12.44"),
+				Float.valueOf("12.46"), Float.valueOf("12.48")
 		};
 
 		this.tag.setItems(array);
@@ -1010,7 +1010,7 @@ protected TestBean createTestBean() {
 		this.bean.setName("Rob");
 		this.bean.setCountry("UK");
 		this.bean.setSex("M");
-		this.bean.setMyFloat(new Float("12.34"));
+		this.bean.setMyFloat(Float.valueOf("12.34"));
 		this.bean.setSomeIntegerArray(new Integer[]{12, 34});
 		return this.bean;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
index 3f70bb509ee3..0c016a7a4225 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ class SimpleFloatEditor extends PropertyEditorSupport {
 
 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
-		setValue(new Float(text));
+		setValue(Float.valueOf(text));
 	}
 
 	@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index 2289023528b2..f5f06f49a0d7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -136,7 +136,7 @@ protected TestBean createTestBean() {
 		// set up test data
 		this.rob = new TestBean();
 		rob.setName("Rob");
-		rob.setMyFloat(new Float(12.34));
+		rob.setMyFloat(12.34f);
 
 		TestBean sally = new TestBean();
 		sally.setName("Sally");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
index 2d87dcfcd5dc..d0fe70e88c3c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-public class RedirectViewUriTemplateTests {
+class RedirectViewUriTemplateTests {
 
 	private MockHttpServletRequest request;
 
@@ -48,7 +48,7 @@ public void setUp() {
 	}
 
 	@Test
-	public void uriTemplate() throws Exception {
+	void uriTemplate() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		model.put("foo", "bar");
 
@@ -60,7 +60,7 @@ public void uriTemplate() throws Exception {
 	}
 
 	@Test
-	public void uriTemplateEncode() throws Exception {
+	void uriTemplateEncode() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		model.put("foo", "bar/bar baz");
 
@@ -72,7 +72,7 @@ public void uriTemplateEncode() throws Exception {
 	}
 
 	@Test
-	public void uriTemplateAndArrayQueryParam() throws Exception {
+	void uriTemplateAndArrayQueryParam() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		model.put("foo", "bar");
 		model.put("fooArr", new String[] { "baz", "bazz" });
@@ -84,9 +84,9 @@ public void uriTemplateAndArrayQueryParam() throws Exception {
 	}
 
 	@Test
-	public void uriTemplateWithObjectConversion() throws Exception {
+	void uriTemplateWithObjectConversion() throws Exception {
 		Map<String, Object> model = new HashMap<>();
-		model.put("foo", new Long(611));
+		model.put("foo", 611L);
 
 		RedirectView redirectView = new RedirectView("/foo/{foo}");
 		redirectView.renderMergedOutputModel(model, this.request, this.response);
@@ -95,7 +95,7 @@ public void uriTemplateWithObjectConversion() throws Exception {
 	}
 
 	@Test
-	public void uriTemplateReuseCurrentRequestVars() throws Exception {
+	void uriTemplateReuseCurrentRequestVars() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 		model.put("key1", "value1");
 		model.put("name", "value2");
@@ -115,25 +115,25 @@ public void uriTemplateReuseCurrentRequestVars() throws Exception {
 	}
 
 	@Test
-	public void uriTemplateNullValue() throws Exception {
+	void uriTemplateNullValue() throws Exception {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new RedirectView("/{foo}").renderMergedOutputModel(new ModelMap(), this.request, this.response));
 	}
 
 	@Test
-	public void emptyRedirectString() throws Exception {
+	void emptyRedirectString() throws Exception {
 		Map<String, Object> model = new HashMap<>();
 
 		RedirectView redirectView = new RedirectView("");
 		redirectView.renderMergedOutputModel(model, this.request, this.response);
 
-		assertThat(this.response.getRedirectedUrl()).isEqualTo("");
+		assertThat(this.response.getRedirectedUrl()).isEmpty();
 	}
 
 	// SPR-9016
 
 	@Test
-	public void dontApplyUriVariables() throws Exception {
+	void dontApplyUriVariables() throws Exception {
 		String url = "/test#{'one','abc'}";
 		RedirectView redirectView = new RedirectView(url, true);
 		redirectView.setExpandUriTemplateVariables(false);

From 31b651a1149767382fe49186063f40f90baeb5e8 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 8 Aug 2021 11:22:15 +0200
Subject: [PATCH 035/140] Polish contribution

See gh-27248
---
 .../beans/AbstractPropertyAccessorTests.java        | 13 +++++++------
 .../beans/propertyeditors/CustomEditorTests.java    |  6 +-----
 .../org/springframework/util/ObjectUtilsTests.java  |  1 -
 .../adapter/MessageListenerAdapterTests.java        |  1 -
 .../MappingJackson2MessageConverterTests.java       |  1 -
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
index b0a3d012591d..a8c779126f97 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
@@ -357,7 +357,8 @@ public void testErrorMessageOfNestedProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		try {
 			accessor.getPropertyValue("spouse.bla");
-		} catch (NotReadablePropertyException ex) {
+		}
+		catch (NotReadablePropertyException ex) {
 			assertThat(ex.getMessage().contains(TestBean.class.getName())).isTrue();
 		}
 	}
@@ -912,12 +913,12 @@ public void setAsText(String text) {
 		accessor.setPropertyValue("intArray", new int[]{4, 5, 2, 3});
 		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-				target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
 
 		accessor.setPropertyValue("intArray", new String[]{"3", "4", "1", "2"});
 		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
 		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-				target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
 
 		accessor.setPropertyValue("intArray", 1);
 		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
@@ -1002,7 +1003,7 @@ public void setPrimitiveArrayPropertyWithAutoGrow() throws Exception {
 		accessor.setPropertyValue("array[2]", 3);
 		assertThat(target.getArray()).hasSize(3);
 		assertThat(target.getArray()[0] == 1 && target.getArray()[1] == 0 &&
-				target.getArray()[2] == 3).as("correct values").isTrue();
+		target.getArray()[2] == 3).as("correct values").isTrue();
 	}
 
 	@Test
@@ -1267,7 +1268,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 		badValues.add("map[key2]", "");
 		assertThatExceptionOfType(PropertyBatchUpdateException.class).isThrownBy(() ->
 				accessor.setPropertyValues(badValues))
-				.satisfies(ex -> assertThat(ex.getPropertyAccessException("map[key2]")).isInstanceOf(TypeMismatchException.class));
+			.satisfies(ex -> assertThat(ex.getPropertyAccessException("map[key2]")).isInstanceOf(TypeMismatchException.class));
 	}
 
 	@Test
@@ -1318,7 +1319,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 		assertThat(((TestBean) target.getMap().get(2)).getName()).isEqualTo("rob");
 	}
 
-	@SuppressWarnings({"unchecked", "rawtypes"}) // must work with raw map in this test
+	@SuppressWarnings({ "unchecked", "rawtypes" }) // must work with raw map in this test
 	@Test
 	public void setRawMapPropertyWithNoEditorRegistered() {
 		IndexedTestBean target = new IndexedTestBean();
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
index 36fc01ddc649..e3dddf62db2e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
@@ -16,10 +16,6 @@
 
 package org.springframework.beans.propertyeditors;
 
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.*;
-import org.springframework.beans.testfixture.beans.*;
-
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;
 import java.beans.PropertyVetoException;
@@ -753,7 +749,7 @@ void testCustomDateEditorWithExactDateLength() {
 		editor.setAsText(validDate);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				editor.setAsText(invalidDate))
-				.withMessageContaining("10");
+			.withMessageContaining("10");
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index 68a1cc018da1..b18710a1bfde 100644
--- a/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index d4140d33e183..ceeab1c3b36a 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -32,7 +32,6 @@
 import javax.jms.TextMessage;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import org.springframework.jms.support.converter.MessageConversionException;
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
index 2d2b48fbfb41..4f428c270939 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -31,7 +31,6 @@
 import com.fasterxml.jackson.annotation.JsonView;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import org.springframework.core.MethodParameter;

From 451bcfc832dacbd601969e675dcd8e01fe92aa48 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 9 Aug 2021 10:00:22 +0200
Subject: [PATCH 036/140] Start building against Reactor 2020.0.10 snapshots

See gh-27250
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 85555c9e06f1..b6ebc475a057 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
 			mavenBom "io.netty:netty-bom:4.1.66.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.9"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.10-SNAPSHOT"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
@@ -290,6 +290,7 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
+			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From 3a35d79c72b1152313aec5d499f678fb57a96099 Mon Sep 17 00:00:00 2001
From: joshua-qa <jgchoi.qa@gmail.com>
Date: Wed, 11 Aug 2021 22:12:50 +0900
Subject: [PATCH 037/140] Fix typo in DefaultPartHttpMessageReader

See gh-27260
---
 .../http/codec/multipart/DefaultPartHttpMessageReader.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
index fcd2e3e7906c..d4248c8442d3 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java
@@ -191,7 +191,7 @@ public void setStreaming(boolean streaming) {
 	 * Defaults to UTF-8 as per RFC 7578.
 	 * @param headersCharset the charset to use for decoding headers
 	 * @since 5.3.6
-	 * @see <a href="https://tools.ietf.org/html/rfc7578#section-5.1">RFC-7578 Section 5.2</a>
+	 * @see <a href="https://tools.ietf.org/html/rfc7578#section-5.1">RFC-7578 Section 5.1</a>
 	 */
 	public void setHeadersCharset(Charset headersCharset) {
 		Assert.notNull(headersCharset, "HeadersCharset must not be null");

From 7b80f4feebd2fc2775a4214fac79c3c5037d0393 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 12 Aug 2021 09:04:39 +0200
Subject: [PATCH 038/140] Upgrade to Reactor 2020.0.10

Closes gh-27250
---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b6ebc475a057..c5b372df70f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
 			mavenBom "io.netty:netty-bom:4.1.66.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.10-SNAPSHOT"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
@@ -290,7 +290,6 @@ configure(allprojects) { project ->
 		repositories {
 			mavenCentral()
 			maven { url "https://repo.spring.io/libs-spring-framework-build" }
-			maven { url "https://repo.spring.io/snapshot" } // reactor
 		}
 	}
 	configurations.all {

From 77a562dfee04cfb4a76a84257cf33fd73ab6b696 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 12 Aug 2021 19:58:50 +0100
Subject: [PATCH 039/140] Add doOnDiscard hook for streaming mode

Potential fix for issue reported at
https://github.com/reactor/reactor-netty/issues/1746
---
 .../http/codec/EncoderHttpMessageWriter.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
index 3fe192077388..cf1d14644673 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -141,16 +141,18 @@ public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType eleme
 		}
 
 		if (isStreamingMediaType(contentType)) {
-			return message.writeAndFlushWith(body.map(buffer -> {
-				Hints.touchDataBuffer(buffer, hints, logger);
-				return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
-			}));
+			return message
+					.writeAndFlushWith(body.map(buffer -> {
+						Hints.touchDataBuffer(buffer, hints, logger);
+						return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+					}))
+					.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 		}
 
 		if (logger.isDebugEnabled()) {
 			body = body.doOnNext(buffer -> Hints.touchDataBuffer(buffer, hints, logger));
 		}
-		return message.writeWith(body);
+		return message.writeWith(body).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 	}
 
 	@Nullable

From 44951873f9cffe8ddf0f96442efe4fd20739b107 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 17 Aug 2021 17:19:21 +0200
Subject: [PATCH 040/140] Introduce accessors for
 allowCircularReferences/allowRawInjectionDespiteWrapping

Closes gh-27289
---
 .../AbstractAutowireCapableBeanFactory.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
index ff76dcdd3710..02b27fe30443 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -246,6 +246,15 @@ public void setAllowCircularReferences(boolean allowCircularReferences) {
 		this.allowCircularReferences = allowCircularReferences;
 	}
 
+	/**
+	 * Return whether to allow circular references between beans.
+	 * @since 5.3.10
+	 * @see #setAllowCircularReferences
+	 */
+	public boolean isAllowCircularReferences() {
+		return this.allowCircularReferences;
+	}
+
 	/**
 	 * Set whether to allow the raw injection of a bean instance into some other
 	 * bean's property, despite the injected bean eventually getting wrapped
@@ -264,6 +273,15 @@ public void setAllowRawInjectionDespiteWrapping(boolean allowRawInjectionDespite
 		this.allowRawInjectionDespiteWrapping = allowRawInjectionDespiteWrapping;
 	}
 
+	/**
+	 * Return whether to allow the raw injection of a bean instance.
+	 * @since 5.3.10
+	 * @see #setAllowRawInjectionDespiteWrapping
+	 */
+	public boolean isAllowRawInjectionDespiteWrapping() {
+		return this.allowRawInjectionDespiteWrapping;
+	}
+
 	/**
 	 * Ignore the given dependency type for autowiring:
 	 * for example, String. Default is none.

From 9bdc545a958c1824ec0e549fb701311e7490d4b1 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 17 Aug 2021 17:19:32 +0200
Subject: [PATCH 041/140] Upgrade to Tomcat 9.0.52, Undertow 2.2.10, RxJava
 3.1, HtmlUnit 2.52, Checkstyle 8.45.1

---
 build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5b372df70f6..7f41d37257b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.0.13"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
@@ -127,18 +127,18 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.50') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.52') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.50') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.52') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.9.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
@@ -204,10 +204,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.11.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.51.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.51.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -336,7 +336,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.44"
+		toolVersion = "8.45.1"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 

From 6177f00a630021e207424b11fe447edec596739f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 17:10:40 +0200
Subject: [PATCH 042/140] Polish PropertyAccessor tests

---
 .../beans/AbstractPropertyAccessorTests.java  | 359 +++++++-----------
 .../beans/BeanWrapperTests.java               |  43 ++-
 .../beans/DirectFieldAccessorTests.java       |   6 +-
 3 files changed, 170 insertions(+), 238 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
index a8c779126f97..2dd52740b6ae 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyAccessorTests.java
@@ -68,25 +68,25 @@
  * @author Dave Syer
  * @author Stephane Nicoll
  */
-public abstract class AbstractPropertyAccessorTests {
+abstract class AbstractPropertyAccessorTests {
 
 	protected abstract AbstractPropertyAccessor createAccessor(Object target);
 
 
 	@Test
-	public void createWithNullTarget() {
+	void createWithNullTarget() {
 		assertThatIllegalArgumentException().isThrownBy(() -> createAccessor(null));
 	}
 
 	@Test
-	public void isReadableProperty() {
+	void isReadableProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(new Simple("John", 2));
 
 		assertThat(accessor.isReadableProperty("name")).isTrue();
 	}
 
 	@Test
-	public void isReadablePropertyNotReadable() {
+	void isReadablePropertyNotReadable() {
 		AbstractPropertyAccessor accessor = createAccessor(new NoRead());
 
 		assertThat(accessor.isReadableProperty("age")).isFalse();
@@ -96,42 +96,42 @@ public void isReadablePropertyNotReadable() {
 	 * Shouldn't throw an exception: should just return false
 	 */
 	@Test
-	public void isReadablePropertyNoSuchProperty() {
+	void isReadablePropertyNoSuchProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(new NoRead());
 
 		assertThat(accessor.isReadableProperty("xxxxx")).isFalse();
 	}
 
 	@Test
-	public void isReadablePropertyNull() {
+	void isReadablePropertyNull() {
 		AbstractPropertyAccessor accessor = createAccessor(new NoRead());
 
 		assertThatIllegalArgumentException().isThrownBy(() -> accessor.isReadableProperty(null));
 	}
 
 	@Test
-	public void isWritableProperty() {
+	void isWritableProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(new Simple("John", 2));
 
 		assertThat(accessor.isWritableProperty("name")).isTrue();
 	}
 
 	@Test
-	public void isWritablePropertyNull() {
+	void isWritablePropertyNull() {
 		AbstractPropertyAccessor accessor = createAccessor(new NoRead());
 
 		assertThatIllegalArgumentException().isThrownBy(() -> accessor.isWritableProperty(null));
 	}
 
 	@Test
-	public void isWritablePropertyNoSuchProperty() {
+	void isWritablePropertyNoSuchProperty() {
 		AbstractPropertyAccessor accessor = createAccessor(new NoRead());
 
 		assertThat(accessor.isWritableProperty("xxxxx")).isFalse();
 	}
 
 	@Test
-	public void isReadableWritableForIndexedProperties() {
+	void isReadableWritableForIndexedProperties() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -177,28 +177,28 @@ public void isReadableWritableForIndexedProperties() {
 	}
 
 	@Test
-	public void getSimpleProperty() {
+	void getSimpleProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThat(accessor.getPropertyValue("name")).isEqualTo("John");
 	}
 
 	@Test
-	public void getNestedProperty() {
+	void getNestedProperty() {
 		Person target = createPerson("John", "London", "UK");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThat(accessor.getPropertyValue("address.city")).isEqualTo("London");
 	}
 
 	@Test
-	public void getNestedDeepProperty() {
+	void getNestedDeepProperty() {
 		Person target = createPerson("John", "London", "UK");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThat(accessor.getPropertyValue("address.country.name")).isEqualTo("UK");
 	}
 
 	@Test
-	public void getAnotherNestedDeepProperty() {
+	void getAnotherNestedDeepProperty() {
 		ITestBean target = new TestBean("rod", 31);
 		ITestBean kerry = new TestBean("kerry", 35);
 		target.setSpouse(kerry);
@@ -213,7 +213,7 @@ public void getAnotherNestedDeepProperty() {
 	}
 
 	@Test
-	public void getPropertyIntermediatePropertyIsNull() {
+	void getPropertyIntermediatePropertyIsNull() {
 		Person target = createPerson("John", "London", "UK");
 		target.address = null;
 		AbstractPropertyAccessor accessor = createAccessor(target);
@@ -226,7 +226,7 @@ public void getPropertyIntermediatePropertyIsNull() {
 	}
 
 	@Test
-	public void getPropertyIntermediatePropertyIsNullWithAutoGrow() {
+	void getPropertyIntermediatePropertyIsNullWithAutoGrow() {
 		Person target = createPerson("John", "London", "UK");
 		target.address = null;
 		AbstractPropertyAccessor accessor = createAccessor(target);
@@ -236,7 +236,7 @@ public void getPropertyIntermediatePropertyIsNullWithAutoGrow() {
 	}
 
 	@Test
-	public void getPropertyIntermediateMapEntryIsNullWithAutoGrow() {
+	void getPropertyIntermediateMapEntryIsNullWithAutoGrow() {
 		Foo target = new Foo();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setConversionService(new DefaultConversionService());
@@ -246,7 +246,7 @@ public void getPropertyIntermediateMapEntryIsNullWithAutoGrow() {
 	}
 
 	@Test
-	public void getUnknownProperty() {
+	void getUnknownProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(NotReadablePropertyException.class).isThrownBy(() ->
@@ -258,7 +258,7 @@ public void getUnknownProperty() {
 	}
 
 	@Test
-	public void getUnknownNestedProperty() {
+	void getUnknownNestedProperty() {
 		Person target = createPerson("John", "London", "UK");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -267,7 +267,7 @@ public void getUnknownNestedProperty() {
 	}
 
 	@Test
-	public void setSimpleProperty() {
+	void setSimpleProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -278,7 +278,7 @@ public void setSimpleProperty() {
 	}
 
 	@Test
-	public void setNestedProperty() {
+	void setNestedProperty() {
 		Person target = createPerson("John", "Paris", "FR");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -287,7 +287,7 @@ public void setNestedProperty() {
 	}
 
 	@Test
-	public void setNestedPropertyPolymorphic() throws Exception {
+	void setNestedPropertyPolymorphic() throws Exception {
 		ITestBean target = new TestBean("rod", 31);
 		ITestBean kerry = new Employee();
 
@@ -308,7 +308,7 @@ public void setNestedPropertyPolymorphic() throws Exception {
 	}
 
 	@Test
-	public void setAnotherNestedProperty() throws Exception {
+	void setAnotherNestedProperty() throws Exception {
 		ITestBean target = new TestBean("rod", 31);
 		ITestBean kerry = new TestBean("kerry", 0);
 
@@ -328,7 +328,7 @@ public void setAnotherNestedProperty() throws Exception {
 	}
 
 	@Test
-	public void setYetAnotherNestedProperties() {
+	void setYetAnotherNestedProperties() {
 		String doctorCompany = "";
 		String lawyerCompany = "Dr. Sueem";
 		TestBean target = new TestBean();
@@ -340,7 +340,7 @@ public void setYetAnotherNestedProperties() {
 	}
 
 	@Test
-	public void setNestedDeepProperty() {
+	void setNestedDeepProperty() {
 		Person target = createPerson("John", "Paris", "FR");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -349,7 +349,7 @@ public void setNestedDeepProperty() {
 	}
 
 	@Test
-	public void testErrorMessageOfNestedProperty() {
+	void testErrorMessageOfNestedProperty() {
 		ITestBean target = new TestBean();
 		ITestBean child = new DifferentTestBean();
 		child.setName("test");
@@ -364,7 +364,7 @@ public void testErrorMessageOfNestedProperty() {
 	}
 
 	@Test
-	public void setPropertyIntermediatePropertyIsNull() {
+	void setPropertyIntermediatePropertyIsNull() {
 		Person target = createPerson("John", "Paris", "FR");
 		target.address.country = null;
 		AbstractPropertyAccessor accessor = createAccessor(target);
@@ -378,7 +378,7 @@ public void setPropertyIntermediatePropertyIsNull() {
 	}
 
 	@Test
-	public void setAnotherPropertyIntermediatePropertyIsNull() throws Exception {
+	void setAnotherPropertyIntermediatePropertyIsNull() throws Exception {
 		ITestBean target = new TestBean("rod", 31);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(NullValueInNestedPathException.class).isThrownBy(() ->
@@ -387,7 +387,7 @@ public void setAnotherPropertyIntermediatePropertyIsNull() throws Exception {
 	}
 
 	@Test
-	public void setPropertyIntermediatePropertyIsNullWithAutoGrow() {
+	void setPropertyIntermediatePropertyIsNullWithAutoGrow() {
 		Person target = createPerson("John", "Paris", "FR");
 		target.address.country = null;
 		AbstractPropertyAccessor accessor = createAccessor(target);
@@ -398,7 +398,7 @@ public void setPropertyIntermediatePropertyIsNullWithAutoGrow() {
 	}
 
 	@Test
-	public void setPropertyIntermediateListIsNullWithAutoGrow() {
+	void setPropertyIntermediateListIsNullWithAutoGrow() {
 		Foo target = new Foo();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setConversionService(new DefaultConversionService());
@@ -410,7 +410,7 @@ public void setPropertyIntermediateListIsNullWithAutoGrow() {
 	}
 
 	@Test
-	public void setPropertyIntermediateListIsNullWithNoConversionService() {
+	void setPropertyIntermediateListIsNullWithNoConversionService() {
 		Foo target = new Foo();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
@@ -419,7 +419,7 @@ public void setPropertyIntermediateListIsNullWithNoConversionService() {
 	}
 
 	@Test
-	public void setPropertyIntermediateListIsNullWithBadConversionService() {
+	void setPropertyIntermediateListIsNullWithBadConversionService() {
 		Foo target = new Foo();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setConversionService(new GenericConversionService() {
@@ -435,7 +435,7 @@ public Object convert(@Nullable Object source, @Nullable TypeDescriptor sourceTy
 
 
 	@Test
-	public void setEmptyPropertyValues() {
+	void setEmptyPropertyValues() {
 		TestBean target = new TestBean();
 		int age = 50;
 		String name = "Tony";
@@ -452,7 +452,7 @@ public void setEmptyPropertyValues() {
 
 
 	@Test
-	public void setValidPropertyValues() {
+	void setValidPropertyValues() {
 		TestBean target = new TestBean();
 		String newName = "tony";
 		int newAge = 65;
@@ -469,7 +469,7 @@ public void setValidPropertyValues() {
 	}
 
 	@Test
-	public void setIndividualValidPropertyValues() {
+	void setIndividualValidPropertyValues() {
 		TestBean target = new TestBean();
 		String newName = "tony";
 		int newAge = 65;
@@ -484,7 +484,7 @@ public void setIndividualValidPropertyValues() {
 	}
 
 	@Test
-	public void setPropertyIsReflectedImmediately() {
+	void setPropertyIsReflectedImmediately() {
 		TestBean target = new TestBean();
 		int newAge = 33;
 		AbstractPropertyAccessor accessor = createAccessor(target);
@@ -495,7 +495,7 @@ public void setPropertyIsReflectedImmediately() {
 	}
 
 	@Test
-	public void setPropertyToNull() {
+	void setPropertyToNull() {
 		TestBean target = new TestBean();
 		target.setName("Frank");    // we need to change it back
 		target.setSpouse(target);
@@ -510,7 +510,7 @@ public void setPropertyToNull() {
 	}
 
 	@Test
-	public void setIndexedPropertyIgnored() {
+	void setIndexedPropertyIgnored() {
 		MutablePropertyValues values = new MutablePropertyValues();
 		values.add("toBeIgnored[0]", 42);
 		AbstractPropertyAccessor accessor = createAccessor(new Object());
@@ -518,7 +518,7 @@ public void setIndexedPropertyIgnored() {
 	}
 
 	@Test
-	public void setPropertyWithPrimitiveConversion() {
+	void setPropertyWithPrimitiveConversion() {
 		MutablePropertyValues values = new MutablePropertyValues();
 		values.add("name", 42);
 		TestBean target = new TestBean();
@@ -528,7 +528,7 @@ public void setPropertyWithPrimitiveConversion() {
 	}
 
 	@Test
-	public void setPropertyWithCustomEditor() {
+	void setPropertyWithCustomEditor() {
 		MutablePropertyValues values = new MutablePropertyValues();
 		values.add("name", Integer.class);
 		TestBean target = new TestBean();
@@ -544,7 +544,7 @@ public void setValue(Object value) {
 	}
 
 	@Test
-	public void setStringPropertyWithCustomEditor() throws Exception {
+	void setStringPropertyWithCustomEditor() throws Exception {
 		TestBean target = new TestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
@@ -567,7 +567,7 @@ public void setValue(Object value) {
 	}
 
 	@Test
-	public void setBooleanProperty() {
+	void setBooleanProperty() {
 		BooleanTestBean target = new BooleanTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -581,7 +581,7 @@ public void setBooleanProperty() {
 	}
 
 	@Test
-	public void setNumberProperties() {
+	void setNumberProperties() {
 		NumberTestBean target = new NumberTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("short2", "2");
@@ -608,7 +608,7 @@ public void setNumberProperties() {
 	}
 
 	@Test
-	public void setNumberPropertiesWithCoercion() {
+	void setNumberPropertiesWithCoercion() {
 		NumberTestBean target = new NumberTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("short2", 2);
@@ -635,7 +635,7 @@ public void setNumberPropertiesWithCoercion() {
 	}
 
 	@Test
-	public void setPrimitiveProperties() {
+	void setPrimitiveProperties() {
 		NumberPropertyBean target = new NumberPropertyBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -684,7 +684,7 @@ public void setPrimitiveProperties() {
 	}
 
 	@Test
-	public void setEnumProperty() {
+	void setEnumProperty() {
 		EnumTester target = new EnumTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -699,7 +699,7 @@ public void setEnumProperty() {
 	}
 
 	@Test
-	public void setGenericEnumProperty() {
+	void setGenericEnumProperty() {
 		EnumConsumer target = new EnumConsumer();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("enumValue", TestEnum.class.getName() + ".TEST_VALUE");
@@ -707,7 +707,7 @@ public void setGenericEnumProperty() {
 	}
 
 	@Test
-	public void setWildcardEnumProperty() {
+	void setWildcardEnumProperty() {
 		WildcardEnumConsumer target = new WildcardEnumConsumer();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("enumValue", TestEnum.class.getName() + ".TEST_VALUE");
@@ -715,7 +715,7 @@ public void setWildcardEnumProperty() {
 	}
 
 	@Test
-	public void setPropertiesProperty() throws Exception {
+	void setPropertiesProperty() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("name", "ptest");
@@ -733,44 +733,32 @@ public void setPropertiesProperty() throws Exception {
 	}
 
 	@Test
-	public void setStringArrayProperty() throws Exception {
+	void setStringArrayProperty() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
 		accessor.setPropertyValue("stringArray", new String[]{"foo", "fi", "fi", "fum"});
-		assertThat(target.stringArray.length == 4).as("stringArray length = 4").isTrue();
-		assertThat(target.stringArray[0].equals("foo") && target.stringArray[1].equals("fi") &&
-		target.stringArray[2].equals("fi") && target.stringArray[3].equals("fum")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("foo", "fi", "fi", "fum");
 
-		List<String> list = new ArrayList<>();
-		list.add("foo");
-		list.add("fi");
-		list.add("fi");
-		list.add("fum");
-		accessor.setPropertyValue("stringArray", list);
-		assertThat(target.stringArray.length == 4).as("stringArray length = 4").isTrue();
-		assertThat(target.stringArray[0].equals("foo") && target.stringArray[1].equals("fi") &&
-		target.stringArray[2].equals("fi") && target.stringArray[3].equals("fum")).as("correct values").isTrue();
+		accessor.setPropertyValue("stringArray", Arrays.asList("foo", "fi", "fi", "fum"));
+		assertThat(target.stringArray).containsExactly("foo", "fi", "fi", "fum");
 
 		Set<String> set = new HashSet<>();
 		set.add("foo");
 		set.add("fi");
 		set.add("fum");
 		accessor.setPropertyValue("stringArray", set);
-		assertThat(target.stringArray.length == 3).as("stringArray length = 3").isTrue();
-		List<String> result = Arrays.asList(target.stringArray);
-		assertThat(result.contains("foo") && result.contains("fi") && result.contains("fum")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactlyInAnyOrder("foo", "fi", "fum");
 
 		accessor.setPropertyValue("stringArray", "one");
-		assertThat(target.stringArray.length == 1).as("stringArray length = 1").isTrue();
-		assertThat(target.stringArray[0]).as("stringArray elt is ok").isEqualTo("one");
+		assertThat(target.stringArray).containsExactly("one");
 
 		accessor.setPropertyValue("stringArray", null);
 		assertThat(target.stringArray).as("stringArray is null").isNull();
 	}
 
 	@Test
-	public void setStringArrayPropertyWithCustomStringEditor() throws Exception {
+	void setStringArrayPropertyWithCustomStringEditor() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() {
@@ -781,126 +769,90 @@ public void setAsText(String text) {
 		});
 
 		accessor.setPropertyValue("stringArray", new String[] {"4foo", "7fi", "6fi", "5fum"});
-		assertThat(target.stringArray.length == 4).as("stringArray length = 4").isTrue();
-		assertThat(target.stringArray[0].equals("foo") && target.stringArray[1].equals("fi") &&
-		target.stringArray[2].equals("fi") && target.stringArray[3].equals("fum")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("foo", "fi", "fi", "fum");
 
-		List<String> list = new ArrayList<>();
-		list.add("4foo");
-		list.add("7fi");
-		list.add("6fi");
-		list.add("5fum");
+		List<String> list = Arrays.asList("4foo", "7fi", "6fi", "5fum");
 		accessor.setPropertyValue("stringArray", list);
-		assertThat(target.stringArray.length == 4).as("stringArray length = 4").isTrue();
-		assertThat(target.stringArray[0].equals("foo") && target.stringArray[1].equals("fi") &&
-		target.stringArray[2].equals("fi") && target.stringArray[3].equals("fum")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("foo", "fi", "fi", "fum");
 
 		Set<String> set = new HashSet<>();
 		set.add("4foo");
 		set.add("7fi");
 		set.add("6fum");
 		accessor.setPropertyValue("stringArray", set);
-		assertThat(target.stringArray.length == 3).as("stringArray length = 3").isTrue();
-		List<String> result = Arrays.asList(target.stringArray);
-		assertThat(result.contains("foo") && result.contains("fi") && result.contains("fum")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactlyInAnyOrder("foo", "fi", "fum");
 
 		accessor.setPropertyValue("stringArray", "8one");
-		assertThat(target.stringArray.length == 1).as("stringArray length = 1").isTrue();
-		assertThat(target.stringArray[0].equals("one")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("one");
 	}
 
 	@Test
-	public void setStringArrayPropertyWithStringSplitting() throws Exception {
+	void setStringArrayPropertyWithStringSplitting() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.useConfigValueEditors();
 		accessor.setPropertyValue("stringArray", "a1,b2");
-		assertThat(target.stringArray.length == 2).as("stringArray length = 2").isTrue();
-		assertThat(target.stringArray[0].equals("a1") && target.stringArray[1].equals("b2")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("a1", "b2");
 	}
 
 	@Test
-	public void setStringArrayPropertyWithCustomStringDelimiter() throws Exception {
+	void setStringArrayPropertyWithCustomStringDelimiter() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(String[].class, "stringArray", new StringArrayPropertyEditor("-"));
 		accessor.setPropertyValue("stringArray", "a1-b2");
-		assertThat(target.stringArray.length == 2).as("stringArray length = 2").isTrue();
-		assertThat(target.stringArray[0].equals("a1") && target.stringArray[1].equals("b2")).as("correct values").isTrue();
+		assertThat(target.stringArray).containsExactly("a1", "b2");
 	}
 
 	@Test
-	public void setStringArrayWithAutoGrow() throws Exception {
+	void setStringArrayWithAutoGrow() throws Exception {
 		StringArrayBean target = new StringArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
 
 		accessor.setPropertyValue("array[0]", "Test0");
-		assertThat(target.getArray()).hasSize(1);
+		assertThat(target.getArray()).containsExactly("Test0");
 
 		accessor.setPropertyValue("array[2]", "Test2");
-		assertThat(target.getArray()).hasSize(3);
-		assertThat(target.getArray()[0].equals("Test0") && target.getArray()[1] == null &&
-		target.getArray()[2].equals("Test2")).as("correct values").isTrue();
+		assertThat(target.getArray()).containsExactly("Test0", null, "Test2");
 	}
 
 	@Test
-	public void setIntArrayProperty() {
+	void setIntArrayProperty() {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
-		accessor.setPropertyValue("intArray", new int[]{4, 5, 2, 3});
-		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		accessor.setPropertyValue("intArray", new int[] {4, 5, 2, 3});
+		assertThat(target.intArray).containsExactly(4, 5, 2, 3);
 
 		accessor.setPropertyValue("intArray", new String[] {"4", "5", "2", "3"});
-		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
-
-		List<Object> list = new ArrayList<>();
-		list.add(4);
-		list.add("5");
-		list.add(2);
-		list.add("3");
-		accessor.setPropertyValue("intArray", list);
-		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(4, 5, 2, 3);
+
+		accessor.setPropertyValue("intArray", Arrays.asList(4, "5", 2, "3"));
+		assertThat(target.intArray).containsExactly(4, 5, 2, 3);
 
 		Set<Object> set = new HashSet<>();
 		set.add("4");
 		set.add(5);
 		set.add("3");
 		accessor.setPropertyValue("intArray", set);
-		assertThat(target.intArray.length == 3).as("intArray length = 3").isTrue();
-		List<Integer> result = new ArrayList<>();
-		result.add(target.intArray[0]);
-		result.add(target.intArray[1]);
-		result.add(target.intArray[2]);
-		assertThat(result.contains(4) && result.contains(5) &&
-		result.contains(3)).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactlyInAnyOrder(4, 5, 3);
 
 		accessor.setPropertyValue("intArray", new Integer[] {1});
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 
 		accessor.setPropertyValue("intArray", 1);
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 
 		accessor.setPropertyValue("intArray", new String[] {"1"});
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 
 		accessor.setPropertyValue("intArray", "1");
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 	}
 
 	@Test
-	public void setIntArrayPropertyWithCustomEditor() {
+	void setIntArrayPropertyWithCustomEditor() {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(int.class, new PropertyEditorSupport() {
@@ -910,51 +862,41 @@ public void setAsText(String text) {
 			}
 		});
 
-		accessor.setPropertyValue("intArray", new int[]{4, 5, 2, 3});
-		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		accessor.setPropertyValue("intArray", new int[] {4, 5, 2, 3});
+		assertThat(target.intArray).containsExactly(4, 5, 2, 3);
 
-		accessor.setPropertyValue("intArray", new String[]{"3", "4", "1", "2"});
-		assertThat(target.intArray.length == 4).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5 &&
-		target.intArray[2] == 2 && target.intArray[3] == 3).as("correct values").isTrue();
+		accessor.setPropertyValue("intArray", new String[] {"3", "4", "1", "2"});
+		assertThat(target.intArray).containsExactly(4, 5, 2, 3);
 
 		accessor.setPropertyValue("intArray", 1);
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 
 		accessor.setPropertyValue("intArray", new String[]{"0"});
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 
 		accessor.setPropertyValue("intArray", "0");
-		assertThat(target.intArray.length == 1).as("intArray length = 4").isTrue();
-		assertThat(target.intArray[0] == 1).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(1);
 	}
 
 	@Test
-	public void setIntArrayPropertyWithStringSplitting() throws Exception {
+	void setIntArrayPropertyWithStringSplitting() throws Exception {
 		PropsTester target = new PropsTester();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.useConfigValueEditors();
 		accessor.setPropertyValue("intArray", "4,5");
-		assertThat(target.intArray.length == 2).as("intArray length = 2").isTrue();
-		assertThat(target.intArray[0] == 4 && target.intArray[1] == 5).as("correct values").isTrue();
+		assertThat(target.intArray).containsExactly(4, 5);
 	}
 
 	@Test
-	public void setPrimitiveArrayProperty() {
+	void setPrimitiveArrayProperty() {
 		PrimitiveArrayBean target = new PrimitiveArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("array", new String[]{"1", "2"});
-		assertThat(target.getArray()).hasSize(2);
-		assertThat(target.getArray()[0]).isEqualTo(1);
-		assertThat(target.getArray()[1]).isEqualTo(2);
+		assertThat(target.getArray()).containsExactly(1, 2);
 	}
 
 	@Test
-	public void setPrimitiveArrayPropertyLargeMatchingWithSpecificEditor() {
+	void setPrimitiveArrayPropertyLargeMatchingWithSpecificEditor() {
 		PrimitiveArrayBean target = new PrimitiveArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(int.class, "array", new PropertyEditorSupport() {
@@ -965,15 +907,14 @@ public void setValue(Object value) {
 				}
 			}
 		});
-		int[] input = new int[1024];
+		int[] input = new int[10];
 		accessor.setPropertyValue("array", input);
-		assertThat(target.getArray()).hasSize(1024);
-		assertThat(target.getArray()[0]).isEqualTo(1);
-		assertThat(target.getArray()[1]).isEqualTo(1);
+		assertThat(target.getArray()).hasSize(10);
+		assertThat(Arrays.stream(target.getArray())).allMatch(n -> n == 1);
 	}
 
 	@Test
-	public void setPrimitiveArrayPropertyLargeMatchingWithIndexSpecificEditor() {
+	void setPrimitiveArrayPropertyLargeMatchingWithIndexSpecificEditor() {
 		PrimitiveArrayBean target = new PrimitiveArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(int.class, "array[1]", new PropertyEditorSupport() {
@@ -984,49 +925,38 @@ public void setValue(Object value) {
 				}
 			}
 		});
-		int[] input = new int[1024];
+		int[] input = new int[10];
 		accessor.setPropertyValue("array", input);
-		assertThat(target.getArray()).hasSize(1024);
+		assertThat(target.getArray()).hasSize(10);
 		assertThat(target.getArray()[0]).isZero();
 		assertThat(target.getArray()[1]).isEqualTo(1);
+		assertThat(Arrays.stream(target.getArray()).skip(2)).allMatch(n -> n == 0);
 	}
 
 	@Test
-	public void setPrimitiveArrayPropertyWithAutoGrow() throws Exception {
+	void setPrimitiveArrayPropertyWithAutoGrow() throws Exception {
 		PrimitiveArrayBean target = new PrimitiveArrayBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
 
 		accessor.setPropertyValue("array[0]", 1);
-		assertThat(target.getArray()).hasSize(1);
+		assertThat(target.getArray()).containsExactly(1);
 
 		accessor.setPropertyValue("array[2]", 3);
-		assertThat(target.getArray()).hasSize(3);
-		assertThat(target.getArray()[0] == 1 && target.getArray()[1] == 0 &&
-		target.getArray()[2] == 3).as("correct values").isTrue();
+		assertThat(target.getArray()).containsExactly(1, 0, 3);
 	}
 
 	@Test
-	@SuppressWarnings("rawtypes")
-	public void setGenericArrayProperty() {
+	void setGenericArrayProperty() {
+		@SuppressWarnings("rawtypes")
 		SkipReaderStub target = new SkipReaderStub();
 		AbstractPropertyAccessor accessor = createAccessor(target);
-		List<String> values = new ArrayList<>();
-		values.add("1");
-		values.add("2");
-		values.add("3");
-		values.add("4");
-		accessor.setPropertyValue("items", values);
-		Object[] result = target.items;
-		assertThat(result).hasSize(4);
-		assertThat(result[0]).isEqualTo("1");
-		assertThat(result[1]).isEqualTo("2");
-		assertThat(result[2]).isEqualTo("3");
-		assertThat(result[3]).isEqualTo("4");
+		accessor.setPropertyValue("items", Arrays.asList("1", "2", "3", "4"));
+		assertThat(target.items).containsExactly("1", "2", "3", "4");
 	}
 
 	@Test
-	public void setArrayPropertyToObject() {
+	void setArrayPropertyToObject() {
 		ArrayToObject target = new ArrayToObject();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1040,7 +970,7 @@ public void setArrayPropertyToObject() {
 	}
 
 	@Test
-	public void setCollectionProperty() {
+	void setCollectionProperty() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<String> coll = new HashSet<>();
@@ -1061,9 +991,9 @@ public void setCollectionProperty() {
 		assertThat((List<?>) target.getList()).isSameAs(list);
 	}
 
-	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
 	@Test
-	public void setCollectionPropertyNonMatchingType() {
+	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
+	void setCollectionPropertyNonMatchingType() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<String> coll = new ArrayList<>();
@@ -1088,9 +1018,9 @@ public void setCollectionPropertyNonMatchingType() {
 		assertThat(target.getList().containsAll(list)).isTrue();
 	}
 
-	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
 	@Test
-	public void setCollectionPropertyWithArrayValue() {
+	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
+	void setCollectionPropertyWithArrayValue() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<String> coll = new HashSet<>();
@@ -1115,9 +1045,9 @@ public void setCollectionPropertyWithArrayValue() {
 		assertThat(target.getList().containsAll(list)).isTrue();
 	}
 
-	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
 	@Test
-	public void setCollectionPropertyWithIntArrayValue() {
+	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
+	void setCollectionPropertyWithIntArrayValue() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<Integer> coll = new HashSet<>();
@@ -1142,9 +1072,9 @@ public void setCollectionPropertyWithIntArrayValue() {
 		assertThat(target.getList().containsAll(list)).isTrue();
 	}
 
-	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
 	@Test
-	public void setCollectionPropertyWithIntegerValue() {
+	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
+	void setCollectionPropertyWithIntegerValue() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Collection<Integer> coll = new HashSet<>();
@@ -1169,9 +1099,9 @@ public void setCollectionPropertyWithIntegerValue() {
 		assertThat(target.getList().containsAll(list)).isTrue();
 	}
 
-	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
 	@Test
-	public void setCollectionPropertyWithStringValue() {
+	@SuppressWarnings("unchecked") // list cannot be properly parameterized as it breaks other tests
+	void setCollectionPropertyWithStringValue() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		List<String> set = new ArrayList<>();
@@ -1192,7 +1122,7 @@ public void setCollectionPropertyWithStringValue() {
 	}
 
 	@Test
-	public void setCollectionPropertyWithStringValueAndCustomEditor() {
+	void setCollectionPropertyWithStringValueAndCustomEditor() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(String.class, "set", new StringTrimmerEditor(false));
@@ -1213,7 +1143,7 @@ public void setCollectionPropertyWithStringValueAndCustomEditor() {
 	}
 
 	@Test
-	public void setMapProperty() {
+	void setMapProperty() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Map<String, String> map = new HashMap<>();
@@ -1227,7 +1157,8 @@ public void setMapProperty() {
 	}
 
 	@Test
-	public void setMapPropertyNonMatchingType() {
+	@SuppressWarnings("unchecked")
+	void setMapPropertyNonMatchingType() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Map<String, String> map = new TreeMap<>();
@@ -1243,7 +1174,7 @@ public void setMapPropertyNonMatchingType() {
 	}
 
 	@Test
-	public void setMapPropertyWithTypeConversion() {
+	void setMapPropertyWithTypeConversion() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
@@ -1272,7 +1203,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void setMapPropertyWithUnmodifiableMap() {
+	void setMapPropertyWithUnmodifiableMap() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
@@ -1296,7 +1227,7 @@ public void setAsText(String text) throws IllegalArgumentException {
 	}
 
 	@Test
-	public void setMapPropertyWithCustomUnmodifiableMap() {
+	void setMapPropertyWithCustomUnmodifiableMap() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
@@ -1319,9 +1250,9 @@ public void setAsText(String text) throws IllegalArgumentException {
 		assertThat(((TestBean) target.getMap().get(2)).getName()).isEqualTo("rob");
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" }) // must work with raw map in this test
 	@Test
-	public void setRawMapPropertyWithNoEditorRegistered() {
+	@SuppressWarnings({ "unchecked", "rawtypes" }) // must work with raw map in this test
+	void setRawMapPropertyWithNoEditorRegistered() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		Map inputMap = new HashMap();
@@ -1336,7 +1267,7 @@ public void setRawMapPropertyWithNoEditorRegistered() {
 	}
 
 	@Test
-	public void setUnknownProperty() {
+	void setUnknownProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -1349,7 +1280,7 @@ public void setUnknownProperty() {
 	}
 
 	@Test
-	public void setUnknownPropertyWithPossibleMatches() {
+	void setUnknownPropertyWithPossibleMatches() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -1361,7 +1292,7 @@ public void setUnknownPropertyWithPossibleMatches() {
 	}
 
 	@Test
-	public void setUnknownOptionalProperty() {
+	void setUnknownOptionalProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		PropertyValue value = new PropertyValue("foo", "value");
@@ -1370,7 +1301,7 @@ public void setUnknownOptionalProperty() {
 	}
 
 	@Test
-	public void setPropertyInProtectedBaseBean() {
+	void setPropertyInProtectedBaseBean() {
 		DerivedFromProtectedBaseBean target = new DerivedFromProtectedBaseBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("someProperty", "someValue");
@@ -1379,7 +1310,7 @@ public void setPropertyInProtectedBaseBean() {
 	}
 
 	@Test
-	public void setPropertyTypeMismatch() {
+	void setPropertyTypeMismatch() {
 		TestBean target = new TestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(TypeMismatchException.class).isThrownBy(() ->
@@ -1387,7 +1318,7 @@ public void setPropertyTypeMismatch() {
 	}
 
 	@Test
-	public void setEmptyValueForPrimitiveProperty() {
+	void setEmptyValueForPrimitiveProperty() {
 		TestBean target = new TestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThatExceptionOfType(TypeMismatchException.class).isThrownBy(() ->
@@ -1395,7 +1326,7 @@ public void setEmptyValueForPrimitiveProperty() {
 	}
 
 	@Test
-	public void setUnknownNestedProperty() {
+	void setUnknownNestedProperty() {
 		Person target = createPerson("John", "Paris", "FR");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1404,7 +1335,7 @@ public void setUnknownNestedProperty() {
 	}
 
 	@Test
-	public void setPropertyValuesIgnoresInvalidNestedOnRequest() {
+	void setPropertyValuesIgnoresInvalidNestedOnRequest() {
 		ITestBean target = new TestBean();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.addPropertyValue(new PropertyValue("name", "rod"));
@@ -1418,7 +1349,7 @@ public void setPropertyValuesIgnoresInvalidNestedOnRequest() {
 	}
 
 	@Test
-	public void getAndSetIndexedProperties() {
+	void getAndSetIndexedProperties() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		TestBean tb0 = target.getArray()[0];
@@ -1488,7 +1419,7 @@ public void getAndSetIndexedProperties() {
 	}
 
 	@Test
-	public void getAndSetIndexedPropertiesWithDirectAccess() {
+	void getAndSetIndexedPropertiesWithDirectAccess() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		TestBean tb0 = target.getArray()[0];
@@ -1547,7 +1478,7 @@ public void getAndSetIndexedPropertiesWithDirectAccess() {
 	}
 
 	@Test
-	public void propertyType() {
+	void propertyType() {
 		Person target = createPerson("John", "Paris", "FR");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1555,7 +1486,7 @@ public void propertyType() {
 	}
 
 	@Test
-	public void propertyTypeUnknownProperty() {
+	void propertyTypeUnknownProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1563,7 +1494,7 @@ public void propertyTypeUnknownProperty() {
 	}
 
 	@Test
-	public void propertyTypeDescriptor() {
+	void propertyTypeDescriptor() {
 		Person target = createPerson("John", "Paris", "FR");
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1571,7 +1502,7 @@ public void propertyTypeDescriptor() {
 	}
 
 	@Test
-	public void propertyTypeDescriptorUnknownProperty() {
+	void propertyTypeDescriptorUnknownProperty() {
 		Simple target = new Simple("John", 2);
 		AbstractPropertyAccessor accessor = createAccessor(target);
 
@@ -1579,7 +1510,7 @@ public void propertyTypeDescriptorUnknownProperty() {
 	}
 
 	@Test
-	public void propertyTypeIndexedProperty() {
+	void propertyTypeIndexedProperty() {
 		IndexedTestBean target = new IndexedTestBean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		assertThat(accessor.getPropertyType("map[key0]")).isNull();
@@ -1594,7 +1525,7 @@ public void propertyTypeIndexedProperty() {
 	}
 
 	@Test
-	public void cornerSpr10115() {
+	void cornerSpr10115() {
 		Spr10115Bean target = new Spr10115Bean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("prop1", "val1");
@@ -1602,7 +1533,7 @@ public void cornerSpr10115() {
 	}
 
 	@Test
-	public void cornerSpr13837() {
+	void cornerSpr13837() {
 		Spr13837Bean target = new Spr13837Bean();
 		AbstractPropertyAccessor accessor = createAccessor(target);
 		accessor.setPropertyValue("something", 42);
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
index 0711189b5f59..8856e31a0e05 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * Specific {@link BeanWrapperImpl} tests.
@@ -37,7 +38,7 @@
  * @author Chris Beams
  * @author Dave Syer
  */
-public class BeanWrapperTests extends AbstractPropertyAccessorTests {
+class BeanWrapperTests extends AbstractPropertyAccessorTests {
 
 	@Override
 	protected BeanWrapperImpl createAccessor(Object target) {
@@ -46,7 +47,7 @@ protected BeanWrapperImpl createAccessor(Object target) {
 
 
 	@Test
-	public void setterDoesNotCallGetter() {
+	void setterDoesNotCallGetter() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("name", "tom");
@@ -55,7 +56,7 @@ public void setterDoesNotCallGetter() {
 	}
 
 	@Test
-	public void getterSilentlyFailWithOldValueExtraction() {
+	void getterSilentlyFailWithOldValueExtraction() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setExtractOldValueForEditor(true); // This will call the getter
@@ -65,7 +66,7 @@ public void getterSilentlyFailWithOldValueExtraction() {
 	}
 
 	@Test
-	public void aliasedSetterThroughDefaultMethod() {
+	void aliasedSetterThroughDefaultMethod() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("aliasedName", "tom");
@@ -74,7 +75,7 @@ public void aliasedSetterThroughDefaultMethod() {
 	}
 
 	@Test
-	public void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
+	void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
 		TestBean target = new TestBean();
 		String newName = "tony";
 		String invalidTouchy = ".valid";
@@ -91,12 +92,12 @@ public void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
 						.getNewValue()).isEqualTo(invalidTouchy);
 			});
 		// Test validly set property matches
-		assertThat(target.getName().equals(newName)).as("Valid set property must stick").isTrue();
-		assertThat(target.getAge() == 0).as("Invalid set property must retain old value").isTrue();
+		assertThat(target.getName()).as("Valid set property must stick").isEqualTo(newName);
+		assertThat(target.getAge()).as("Invalid set property must retain old value").isEqualTo(0);
 	}
 
 	@Test
-	public void checkNotWritablePropertyHoldPossibleMatches() {
+	void checkNotWritablePropertyHoldPossibleMatches() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -105,15 +106,15 @@ public void checkNotWritablePropertyHoldPossibleMatches() {
 	}
 
 	@Test // Can't be shared; there is no such thing as a read-only field
-	public void setReadOnlyMapProperty() {
+	void setReadOnlyMapProperty() {
 		TypedReadOnlyMap map = new TypedReadOnlyMap(Collections.singletonMap("key", new TestBean()));
 		TypedReadOnlyMapClient target = new TypedReadOnlyMapClient();
 		BeanWrapper accessor = createAccessor(target);
-		accessor.setPropertyValue("map", map);
+		assertThatNoException().isThrownBy(() -> accessor.setPropertyValue("map", map));
 	}
 
 	@Test
-	public void notWritablePropertyExceptionContainsAlternativeMatch() {
+	void notWritablePropertyExceptionContainsAlternativeMatch() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -121,12 +122,12 @@ public void notWritablePropertyExceptionContainsAlternativeMatch() {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(1);
+			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(1);
 		}
 	}
 
 	@Test
-	public void notWritablePropertyExceptionContainsAlternativeMatches() {
+	void notWritablePropertyExceptionContainsAlternativeMatches() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -134,23 +135,23 @@ public void notWritablePropertyExceptionContainsAlternativeMatches() {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(3);
+			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(3);
 		}
 	}
 
 	@Override
 	@Test  // Can't be shared: no type mismatch with a field
-	public void setPropertyTypeMismatch() {
+	void setPropertyTypeMismatch() {
 		PropertyTypeMismatch target = new PropertyTypeMismatch();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("object", "a String");
 		assertThat(target.value).isEqualTo("a String");
-		assertThat(target.getObject() == 8).isTrue();
+		assertThat(target.getObject()).isEqualTo(8);
 		assertThat(accessor.getPropertyValue("object")).isEqualTo(8);
 	}
 
 	@Test
-	public void propertyDescriptors() {
+	void propertyDescriptors() {
 		TestBean target = new TestBean();
 		target.setSpouse(new TestBean());
 		BeanWrapper accessor = createAccessor(target);
@@ -166,7 +167,7 @@ public void propertyDescriptors() {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void getPropertyWithOptional() {
+	void getPropertyWithOptional() {
 		GetterWithOptional target = new GetterWithOptional();
 		TestBean tb = new TestBean("x");
 		BeanWrapper accessor = createAccessor(target);
@@ -189,7 +190,7 @@ public void getPropertyWithOptional() {
 	}
 
 	@Test
-	public void getPropertyWithOptionalAndAutoGrow() {
+	void getPropertyWithOptionalAndAutoGrow() {
 		GetterWithOptional target = new GetterWithOptional();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
@@ -201,7 +202,7 @@ public void getPropertyWithOptionalAndAutoGrow() {
 	}
 
 	@Test
-	public void incompletelyQuotedKeyLeadsToPropertyException() {
+	void incompletelyQuotedKeyLeadsToPropertyException() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
diff --git a/spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java b/spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
index 1ca8ddc60298..2cbe8f2ff41c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
  * @author Chris Beams
  * @author Stephane Nicoll
  */
-public class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
+class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
 
 	@Override
 	protected DirectFieldAccessor createAccessor(Object target) {
@@ -38,7 +38,7 @@ protected DirectFieldAccessor createAccessor(Object target) {
 
 
 	@Test
-	public void withShadowedField() {
+	void withShadowedField() {
 		final StringBuilder sb = new StringBuilder();
 
 		TestBean target = new TestBean() {

From 6770e4b3ccab93dadf6450658aeb49facf4586af Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 18 Aug 2021 17:33:50 +0200
Subject: [PATCH 043/140] Fix and document
 CompositeUriComponentsContributor#hasContributors()

Prior to this commit, the hasContributors() method incorrectly returned
false if contributors had been configured.

This commit fixes the logic in hasContributors() and documents it.

Closes #27271
---
 .../CompositeUriComponentsContributor.java    | 23 +++++++++++--------
 ...ompositeUriComponentsContributorTests.java | 21 +++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java b/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
index 18a3726920c4..9c20b6f3bbd4 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@
 
 /**
  * A {@link UriComponentsContributor} containing a list of other contributors
- * to delegate and also encapsulating a specific {@link ConversionService} to
- * use for formatting method argument values to Strings.
+ * to delegate to and also encapsulating a specific {@link ConversionService} to
+ * use for formatting method argument values as Strings.
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
@@ -52,7 +52,7 @@ public class CompositeUriComponentsContributor implements UriComponentsContribut
 	 * {@code HandlerMethodArgumentResolvers} in {@code RequestMappingHandlerAdapter}
 	 * and provide that to this constructor.
 	 * @param contributors a collection of {@link UriComponentsContributor}
-	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
+	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}
 	 */
 	public CompositeUriComponentsContributor(UriComponentsContributor... contributors) {
 		this.contributors = Arrays.asList((Object[]) contributors);
@@ -66,7 +66,7 @@ public CompositeUriComponentsContributor(UriComponentsContributor... contributor
 	 * {@code HandlerMethodArgumentResolvers} in {@code RequestMappingHandlerAdapter}
 	 * and provide that to this constructor.
 	 * @param contributors a collection of {@link UriComponentsContributor}
-	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
+	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}
 	 */
 	public CompositeUriComponentsContributor(Collection<?> contributors) {
 		this(contributors, null);
@@ -82,7 +82,7 @@ public CompositeUriComponentsContributor(Collection<?> contributors) {
 	 * {@link org.springframework.format.support.DefaultFormattingConversionService}
 	 * will be used by default.
 	 * @param contributors a collection of {@link UriComponentsContributor}
-	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}.
+	 * or {@link HandlerMethodArgumentResolver HandlerMethodArgumentResolvers}
 	 * @param cs a ConversionService to use when method argument values
 	 * need to be formatted as Strings before being added to the URI
 	 */
@@ -91,9 +91,14 @@ public CompositeUriComponentsContributor(@Nullable Collection<?> contributors, @
 		this.conversionService = (cs != null ? cs : new DefaultFormattingConversionService());
 	}
 
-
+	/**
+	 * Determine if this {@code CompositeUriComponentsContributor} has any
+	 * contributors.
+	 * @return {@code true} if this {@code CompositeUriComponentsContributor}
+	 * was created with contributors to delegate to
+	 */
 	public boolean hasContributors() {
-		return this.contributors.isEmpty();
+		return !this.contributors.isEmpty();
 	}
 
 	@Override
@@ -139,7 +144,7 @@ else if (contributor instanceof HandlerMethodArgumentResolver) {
 	public void contributeMethodArgument(MethodParameter parameter, Object value, UriComponentsBuilder builder,
 			Map<String, Object> uriVariables) {
 
-		this.contributeMethodArgument(parameter, value, builder, uriVariables, this.conversionService);
+		contributeMethodArgument(parameter, value, builder, uriVariables, this.conversionService);
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java b/spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java
index a9030b3ab796..1b698914abaa 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,30 +32,33 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Unit tests for
- * {@link org.springframework.web.method.support.CompositeUriComponentsContributor}.
+ * Unit tests for {@link CompositeUriComponentsContributor}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  */
-public class CompositeUriComponentsContributorTests {
-
+class CompositeUriComponentsContributorTests {
 
 	@Test
-	public void supportsParameter() {
-
+	void supportsParameter() {
 		List<HandlerMethodArgumentResolver> resolvers = new ArrayList<>();
 		resolvers.add(new RequestParamMethodArgumentResolver(false));
 		resolvers.add(new RequestHeaderMethodArgumentResolver(null));
 		resolvers.add(new RequestParamMethodArgumentResolver(true));
 
-		Method method = ClassUtils.getMethod(this.getClass(), "handleRequest", String.class, String.class, String.class);
-
 		CompositeUriComponentsContributor contributor = new CompositeUriComponentsContributor(resolvers);
+		Method method = ClassUtils.getMethod(this.getClass(), "handleRequest", String.class, String.class, String.class);
 		assertThat(contributor.supportsParameter(new MethodParameter(method, 0))).isTrue();
 		assertThat(contributor.supportsParameter(new MethodParameter(method, 1))).isTrue();
 		assertThat(contributor.supportsParameter(new MethodParameter(method, 2))).isFalse();
 	}
 
+	@Test
+	void hasContributors() {
+		assertThat(new CompositeUriComponentsContributor().hasContributors()).isFalse();
+		assertThat(new CompositeUriComponentsContributor(new RequestParamMethodArgumentResolver(true)).hasContributors()).isTrue();
+	}
+
 
 	public void handleRequest(@RequestParam String p1, String p2, @RequestHeader String h) {
 	}

From ac722772588633508690940ca40b928c81f90a63 Mon Sep 17 00:00:00 2001
From: Sanghyuk Jung <sanghyuk.jung@navercorp.com>
Date: Thu, 19 Aug 2021 01:17:42 +0900
Subject: [PATCH 044/140] Fix duplicate "the" in Javadoc and XSD

See gh-27291
---
 .../java/org/springframework/asm/RecordComponentWriter.java | 2 +-
 .../java/org/springframework/cglib/core/KeyFactory.java     | 2 +-
 .../java/org/springframework/util/ConcurrentLruCache.java   | 2 +-
 .../simp/config/AbstractMessageBrokerConfiguration.java     | 2 +-
 .../r2dbc/core/AbstractDatabaseClientIntegrationTests.java  | 2 +-
 ...AbstractTransactionalDatabaseClientIntegrationTests.java | 2 +-
 .../springframework/web/reactive/socket/HandshakeInfo.java  | 2 +-
 .../web/servlet/mvc/condition/PatternsRequestCondition.java | 6 +++---
 .../web/servlet/mvc/method/RequestMappingInfo.java          | 2 +-
 .../method/annotation/ServletInvocableHandlerMethod.java    | 2 +-
 .../socket/config/annotation/SockJsServiceRegistration.java | 2 +-
 .../web/socket/sockjs/support/AbstractSockJsService.java    | 2 +-
 .../springframework/web/socket/config/spring-websocket.xsd  | 4 ++--
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
index bd007ac26d61..c36d2054fcb3 100644
--- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
+++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
@@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor {
   /** The name_index field of the Record attribute. */
   private final int nameIndex;
 
-  /** The descriptor_index field of the the Record attribute. */
+  /** The descriptor_index field of the Record attribute. */
   private final int descriptorIndex;
 
   /**
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
index e1503b85c13b..efcbc4c04486 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
@@ -28,7 +28,7 @@
 
 /**
  * Generates classes to handle multi-valued keys, for use in things such as Maps and Sets.
- * Code for <code>equals</code> and <code>hashCode</code> methods follow the
+ * Code for <code>equals</code> and <code>hashCode</code> methods follow
  * the rules laid out in <i>Effective Java</i> by Joshua Bloch.
  * <p>
  * To generate a <code>KeyFactory</code>, you need to supply an interface which
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
index 2f1f2e08965d..ceee603e1720 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
@@ -174,7 +174,7 @@ public int size() {
 	}
 
 	/**
-	 * Return the the maximum number of entries in the cache
+	 * Return the maximum number of entries in the cache
 	 * (0 indicates no caching, always generating a new value).
 	 * @see #size()
 	 */
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index df9b5320fb1f..b2e180686f12 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -82,7 +82,7 @@
  * <li>{@link #userDestinationMessageHandler}</li>
  * </ul>
  *
- * <p>{@link #brokerChannel} delivers messages from within the application to the
+ * <p>{@link #brokerChannel} delivers messages from within the application to
  * the respective message handlers. {@link #brokerMessagingTemplate} can be injected
  * into any application component to send messages.
  *
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
index dff746cd59e6..d315a10290ac 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
@@ -59,7 +59,7 @@ public void before() {
 	protected abstract ConnectionFactory createConnectionFactory();
 
 	/**
-	 * Return the the CREATE TABLE statement for table {@code legoset} with the following
+	 * Return the CREATE TABLE statement for table {@code legoset} with the following
 	 * three columns:
 	 * <ul>
 	 * <li>id integer (primary key), not null</li>
diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
index 1d90bc7a45cd..acebde10d4a2 100644
--- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
+++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
@@ -89,7 +89,7 @@ public void tearDown() {
 	protected abstract ConnectionFactory createConnectionFactory();
 
 	/**
-	 * Return the the CREATE TABLE statement for table {@code legoset} with the following three columns:
+	 * Return the CREATE TABLE statement for table {@code legoset} with the following three columns:
 	 * <ul>
 	 * <li>id integer (primary key), not null</li>
 	 * <li>name varchar(255), nullable</li>
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
index 657a20408c84..0bef75a832ca 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
@@ -77,7 +77,7 @@ public HandshakeInfo(URI uri, HttpHeaders headers, Mono<Principal> principal, @N
 	}
 
 	/**
-	 * Constructor targeting server-side use with extra information such as the
+	 * Constructor targeting server-side use with extra information such as
 	 * the remote address, attributes, and a log prefix.
 	 * @param uri the endpoint URL
 	 * @param headers server request headers
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index d04b26942f4c..875002618eeb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -87,7 +87,7 @@ public PatternsRequestCondition(String[] patterns,  boolean useTrailingSlashMatc
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and whether to match
 	 * trailing slashes.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @since 5.2.4
@@ -105,7 +105,7 @@ public PatternsRequestCondition(String[] patterns, @Nullable UrlPathHelper urlPa
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
 	 * with suffixes and trailing slashes.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @deprecated as of 5.2.4. See class-level note in
@@ -123,7 +123,7 @@ public PatternsRequestCondition(String[] patterns, @Nullable UrlPathHelper urlPa
 	 * Variant of {@link #PatternsRequestCondition(String...)} with a
 	 * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching
 	 * with suffixes and trailing slashes, along with specific extensions.
-	 * <p>As of 5.3 the the path is obtained through the static method
+	 * <p>As of 5.3 the path is obtained through the static method
 	 * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper}
 	 * does not need to be passed in.
 	 * @deprecated as of 5.2.4. See class-level note in
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
index a0dadcd798a1..79622c386169 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java
@@ -47,7 +47,7 @@
 import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
- * Request mapping information. A composite for the the following conditions:
+ * Request mapping information. A composite for the following conditions:
  * <ol>
  * <li>{@link PathPatternsRequestCondition} with parsed {@code PathPatterns} or
  * {@link PatternsRequestCondition} with String patterns via {@code PathMatcher}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 8b2ba44f3ecb..1cc9d203ae4b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -194,7 +194,7 @@ private String formatErrorForReturnValue(@Nullable Object returnValue) {
 	}
 
 	/**
-	 * Create a nested ServletInvocableHandlerMethod subclass that returns the
+	 * Create a nested ServletInvocableHandlerMethod subclass that returns
 	 * the given value (or raises an Exception if the value is one) rather than
 	 * actually invoking the controller method. This is useful when processing
 	 * async return values (e.g. Callable, DeferredResult, ListenableFuture).
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
index 0a49af7309e4..6cd9c30cbb74 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
@@ -106,7 +106,7 @@ public SockJsServiceRegistration setTaskScheduler(TaskScheduler scheduler) {
 	 * also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html",
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
index 682ac8dbcf06..e3a941937107 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -153,7 +153,7 @@ public String getName() {
 	 * However, it can also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.
diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
index 1870ad7ee5ab..271332f5cb0e 100644
--- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
+++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd
@@ -141,8 +141,8 @@
 
 	Note that it's possible to specify a relative URL in which case the URL
 	must be relative to the iframe URL. For example assuming a SockJS endpoint
-	mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then the
-	The relative URL must start with "../../" to traverse up to the location
+	mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
+	the relative URL must start with "../../" to traverse up to the location
 	above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	traversal may be needed.
                 ]]></xsd:documentation>

From af6fd6c303252a2bf83770419bfd829849d12e70 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 19 Aug 2021 08:54:15 +0200
Subject: [PATCH 045/140] Polish "Fix duplicate "the" in Javadoc and XSD"

See gh-27291
---
 .../java/org/springframework/asm/RecordComponentWriter.java   | 2 +-
 .../main/java/org/springframework/cglib/core/KeyFactory.java  | 2 +-
 .../java/org/springframework/util/ConcurrentLruCache.java     | 2 +-
 .../simp/config/AbstractMessageBrokerConfiguration.java       | 4 ++--
 .../web/servlet/mvc/condition/PatternsRequestCondition.java   | 2 +-
 .../mvc/method/annotation/ServletInvocableHandlerMethod.java  | 4 ++--
 .../socket/config/annotation/SockJsServiceRegistration.java   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
index c36d2054fcb3..bd007ac26d61 100644
--- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
+++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java
@@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor {
   /** The name_index field of the Record attribute. */
   private final int nameIndex;
 
-  /** The descriptor_index field of the Record attribute. */
+  /** The descriptor_index field of the the Record attribute. */
   private final int descriptorIndex;
 
   /**
diff --git a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
index efcbc4c04486..e1503b85c13b 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/KeyFactory.java
@@ -28,7 +28,7 @@
 
 /**
  * Generates classes to handle multi-valued keys, for use in things such as Maps and Sets.
- * Code for <code>equals</code> and <code>hashCode</code> methods follow
+ * Code for <code>equals</code> and <code>hashCode</code> methods follow the
  * the rules laid out in <i>Effective Java</i> by Joshua Bloch.
  * <p>
  * To generate a <code>KeyFactory</code>, you need to supply an interface which
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
index ceee603e1720..1d99b4cd093f 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentLruCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
index b2e180686f12..fb4150ad7b0e 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -82,8 +82,8 @@
  * <li>{@link #userDestinationMessageHandler}</li>
  * </ul>
  *
- * <p>{@link #brokerChannel} delivers messages from within the application to
- * the respective message handlers. {@link #brokerMessagingTemplate} can be injected
+ * <p>{@link #brokerChannel} delivers messages from within the application to the
+ * respective message handlers. {@link #brokerMessagingTemplate} can be injected
  * into any application component to send messages.
  *
  * <p>Subclasses are responsible for the parts of the configuration that feed messages
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
index 875002618eeb..9539415ae388 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PatternsRequestCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index 1cc9d203ae4b..ae3473873dee 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -194,8 +194,8 @@ private String formatErrorForReturnValue(@Nullable Object returnValue) {
 	}
 
 	/**
-	 * Create a nested ServletInvocableHandlerMethod subclass that returns
-	 * the given value (or raises an Exception if the value is one) rather than
+	 * Create a nested ServletInvocableHandlerMethod subclass that returns the
+	 * given value (or raises an Exception if the value is one) rather than
 	 * actually invoking the controller method. This is useful when processing
 	 * async return values (e.g. Callable, DeferredResult, ListenableFuture).
 	 */
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
index 6cd9c30cbb74..edc4e568a871 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/SockJsServiceRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ public SockJsServiceRegistration setTaskScheduler(TaskScheduler scheduler) {
 	 * also be set to point to a URL served by the application.
 	 * <p>Note that it's possible to specify a relative URL in which case the URL
 	 * must be relative to the iframe URL. For example assuming a SockJS endpoint
-	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html",
+	 * mapped to "/sockjs", and resulting iframe URL "/sockjs/iframe.html", then
 	 * the relative URL must start with "../../" to traverse up to the location
 	 * above the SockJS mapping. In case of a prefix-based Servlet mapping one more
 	 * traversal may be needed.

From caf6760ddd5f616a8d71cd7445d5709f61296690 Mon Sep 17 00:00:00 2001
From: LEE Juchan <juchanei.lee@gmail.com>
Date: Thu, 19 Aug 2021 23:21:15 +0900
Subject: [PATCH 046/140] Fix grammatical errors in Javadoc

Closes gh-27298
---
 .../src/main/java/org/aopalliance/intercept/Joinpoint.java      | 2 +-
 .../main/java/org/springframework/web/util/UrlPathHelper.java   | 2 +-
 .../web/reactive/function/server/RequestPredicate.java          | 2 +-
 .../springframework/web/servlet/function/RequestPredicate.java  | 2 +-
 .../adapter/standard/ConvertingEncoderDecoderSupport.java       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
index 780275e9782c..3b75cfdc8f6c 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
@@ -26,7 +26,7 @@
  * terminology).
  *
  * <p>A runtime joinpoint is an <i>event</i> that occurs on a static
- * joinpoint (i.e. a location in a the program). For instance, an
+ * joinpoint (i.e. a location in a program). For instance, an
  * invocation is the runtime joinpoint on a method (static joinpoint).
  * The static part of a given joinpoint can be generically retrieved
  * using the {@link #getStaticPart()} method.
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index c216c25ae6f4..575f822f957f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -190,7 +190,7 @@ private void checkReadOnly() {
 
 	/**
 	 * {@link #getLookupPathForRequest Resolve} the lookupPath and cache it in a
-	 * a request attribute with the key {@link #PATH_ATTRIBUTE} for subsequent
+	 * request attribute with the key {@link #PATH_ATTRIBUTE} for subsequent
 	 * access via {@link #getResolvedLookupPath(ServletRequest)}.
 	 * @param request the current request
 	 * @return the resolved path
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
index 57f18db299e6..c9bd4f30a6f8 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
@@ -71,7 +71,7 @@ default RequestPredicate or(RequestPredicate other) {
 
 	/**
 	 * Transform the given request into a request used for a nested route. For instance,
-	 * a path-based predicate can return a {@code ServerRequest} with a the path remaining
+	 * a path-based predicate can return a {@code ServerRequest} with a path remaining
 	 * after a match.
 	 * <p>The default implementation returns an {@code Optional} wrapping the given request if
 	 * {@link #test(ServerRequest)} evaluates to {@code true}; or {@link Optional#empty()}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
index 4e9ec82d5b71..a0cabe7e54fd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
@@ -71,7 +71,7 @@ default RequestPredicate or(RequestPredicate other) {
 
 	/**
 	 * Transform the given request into a request used for a nested route. For instance,
-	 * a path-based predicate can return a {@code ServerRequest} with a the path remaining
+	 * a path-based predicate can return a {@code ServerRequest} with a path remaining
 	 * after a match.
 	 * <p>The default implementation returns an {@code Optional} wrapping the given request if
 	 * {@link #test(ServerRequest)} evaluates to {@code true}; or {@link Optional#empty()}
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
index 9570c929bc1a..328f32558892 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
@@ -183,7 +183,7 @@ public boolean willDecode(M bytes) {
 	}
 
 	/**
-	 * Decode the a message into an object.
+	 * Decode the message into an object.
 	 * @see javax.websocket.Decoder.Text#decode(String)
 	 * @see javax.websocket.Decoder.Binary#decode(ByteBuffer)
 	 */

From 9f7a94058a4bbc967fe47bfe6a82d88cb3feddfb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 19 Aug 2021 16:23:38 +0200
Subject: [PATCH 047/140] Update copyright date

See gh-27298
---
 .../src/main/java/org/aopalliance/intercept/Joinpoint.java      | 2 +-
 .../web/reactive/function/server/RequestPredicate.java          | 2 +-
 .../springframework/web/servlet/function/RequestPredicate.java  | 2 +-
 .../adapter/standard/ConvertingEncoderDecoderSupport.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
index 3b75cfdc8f6c..480d9f087cf5 100644
--- a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
+++ b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
index c9bd4f30a6f8..0743dcec4dec 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
index a0cabe7e54fd..3c1ac3474c14 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
index 328f32558892..05e1a4b75c0d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 462e19d417dc1e3513211ef5d5a3ea4c351f1c14 Mon Sep 17 00:00:00 2001
From: Erik van Paassen <erik@evpwebdesign.nl>
Date: Sun, 22 Aug 2021 14:10:25 +0200
Subject: [PATCH 048/140] Fix UrlPathHelper#shouldRemoveSemicolonContent()
 (#27303)

The checkReadOnly() method should only be called from
methods that modify properties to prevent modification
of read-only instances.

Fixes #27256
---
 .../java/org/springframework/web/util/UrlPathHelper.java    | 1 -
 .../org/springframework/web/util/UrlPathHelperTests.java    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 575f822f957f..663dbb7566c4 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -147,7 +147,6 @@ public void setRemoveSemicolonContent(boolean removeSemicolonContent) {
 	 * Whether configured to remove ";" (semicolon) content from the request URI.
 	 */
 	public boolean shouldRemoveSemicolonContent() {
-		checkReadOnly();
 		return this.removeSemicolonContent;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 0aea5a0b51d9..1b2921205f51 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -22,6 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -165,6 +166,11 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 		assertThat(helper.getLookupPathForRequest(request)).isEqualTo("/welcome.html;c=d");
 	}
 
+	@Test // gh-27303
+	public void shouldRemoveSemicolonContentWithReadOnlyInstance() {
+		assertThatCode(UrlPathHelper.defaultInstance::shouldRemoveSemicolonContent).doesNotThrowAnyException();
+	}
+
 
 	//
 	// suite of tests root requests for default servlets (SRV 11.2) on Websphere vs Tomcat and other containers

From 99970a5ddc063b6747970973c3bfdf803e21b1b3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:22:51 +0200
Subject: [PATCH 049/140] Polish contribution

See gh-27303
---
 .../web/util/UrlPathHelperTests.java          | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 1b2921205f51..3c1bbd282015 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -167,8 +167,24 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	}
 
 	@Test // gh-27303
-	public void shouldRemoveSemicolonContentWithReadOnlyInstance() {
-		assertThatCode(UrlPathHelper.defaultInstance::shouldRemoveSemicolonContent).doesNotThrowAnyException();
+	public void defaultInstanceReadOnlyBehavior() {
+		UrlPathHelper helper = UrlPathHelper.defaultInstance;
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setAlwaysUseFullPath(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setUrlDecode(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setRemoveSemicolonContent(true))
+			.withMessage("This instance cannot be modified");
+		assertThatExceptionOfType(IllegalArgumentException.class)
+			.isThrownBy(() -> helper.setDefaultEncoding("UTF-8"))
+			.withMessage("This instance cannot be modified");
+
+		assertThat(helper.isUrlDecode()).isTrue();
+		assertThat(helper.shouldRemoveSemicolonContent()).isTrue();
 	}
 
 

From 6c71cf2f96d8ccb46965753d5a47847b2adfdcdf Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:27:47 +0200
Subject: [PATCH 050/140] Polishing

---
 .../web/util/UrlPathHelperTests.java          | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 3c1bbd282015..094e33d419fd 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -31,7 +31,7 @@
  * @author Juergen Hoeller
  * @author Costin Leau
  */
-public class UrlPathHelperTests {
+class UrlPathHelperTests {
 
 	private static final String WEBSPHERE_URI_ATTRIBUTE = "com.ibm.websphere.servlet.uri_non_decoded";
 
@@ -41,7 +41,7 @@ public class UrlPathHelperTests {
 
 
 	@Test
-	public void getPathWithinApplication() {
+	void getPathWithinApplication() {
 		request.setContextPath("/petclinic");
 		request.setRequestURI("/petclinic/welcome.html");
 
@@ -49,7 +49,7 @@ public void getPathWithinApplication() {
 	}
 
 	@Test
-	public void getPathWithinApplicationForRootWithNoLeadingSlash() {
+	void getPathWithinApplicationForRootWithNoLeadingSlash() {
 		request.setContextPath("/petclinic");
 		request.setRequestURI("/petclinic");
 
@@ -57,7 +57,7 @@ public void getPathWithinApplicationForRootWithNoLeadingSlash() {
 	}
 
 	@Test
-	public void getPathWithinApplicationForSlashContextPath() {
+	void getPathWithinApplicationForSlashContextPath() {
 		request.setContextPath("/");
 		request.setRequestURI("/welcome.html");
 
@@ -65,7 +65,7 @@ public void getPathWithinApplicationForSlashContextPath() {
 	}
 
 	@Test
-	public void getPathWithinServlet() {
+	void getPathWithinServlet() {
 		request.setContextPath("/petclinic");
 		request.setServletPath("/main");
 		request.setRequestURI("/petclinic/main/welcome.html");
@@ -74,7 +74,7 @@ public void getPathWithinServlet() {
 	}
 
 	@Test
-	public void alwaysUseFullPath() {
+	void alwaysUseFullPath() {
 		helper.setAlwaysUseFullPath(true);
 		request.setContextPath("/petclinic");
 		request.setServletPath("/main");
@@ -84,7 +84,7 @@ public void alwaysUseFullPath() {
 	}
 
 	@Test // SPR-11101
-	public void getPathWithinServletWithoutUrlDecoding() {
+	void getPathWithinServletWithoutUrlDecoding() {
 		request.setContextPath("/SPR-11101");
 		request.setServletPath("/test_url_decoding/a/b");
 		request.setRequestURI("/test_url_decoding/a%2Fb");
@@ -96,7 +96,7 @@ public void getPathWithinServletWithoutUrlDecoding() {
 	}
 
 	@Test
-	public void getRequestUri() {
+	void getRequestUri() {
 		request.setRequestURI("/welcome.html");
 		assertThat(helper.getRequestUri(request)).isEqualTo("/welcome.html");
 
@@ -111,7 +111,7 @@ public void getRequestUri() {
 	}
 
 	@Test
-	public void getRequestRemoveSemicolonContent() {
+	void getRequestRemoveSemicolonContent() {
 		helper.setRemoveSemicolonContent(true);
 		request.setRequestURI("/foo;f=F;o=O;o=O/bar;b=B;a=A;r=R");
 		assertThat(helper.getRequestUri(request)).isEqualTo("/foo/bar");
@@ -126,7 +126,7 @@ public void getRequestRemoveSemicolonContent() {
 	}
 
 	@Test
-	public void getRequestKeepSemicolonContent() {
+	void getRequestKeepSemicolonContent() {
 		helper.setRemoveSemicolonContent(false);
 
 		testKeepSemicolonContent("/foo;a=b;c=d", "/foo;a=b;c=d");
@@ -145,7 +145,7 @@ private void testKeepSemicolonContent(String requestUri, String expectedPath) {
 	}
 
 	@Test
-	public void getLookupPathWithSemicolonContent() {
+	void getLookupPathWithSemicolonContent() {
 		helper.setRemoveSemicolonContent(false);
 
 		request.setContextPath("/petclinic");
@@ -156,7 +156,7 @@ public void getLookupPathWithSemicolonContent() {
 	}
 
 	@Test
-	public void getLookupPathWithSemicolonContentAndNullPathInfo() {
+	void getLookupPathWithSemicolonContentAndNullPathInfo() {
 		helper.setRemoveSemicolonContent(false);
 
 		request.setContextPath("/petclinic");
@@ -167,7 +167,7 @@ public void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	}
 
 	@Test // gh-27303
-	public void defaultInstanceReadOnlyBehavior() {
+	void defaultInstanceReadOnlyBehavior() {
 		UrlPathHelper helper = UrlPathHelper.defaultInstance;
 
 		assertThatExceptionOfType(IllegalArgumentException.class)
@@ -199,7 +199,7 @@ public void defaultInstanceReadOnlyBehavior() {
 	//
 
 	@Test
-	public void tomcatDefaultServletRoot() {
+	void tomcatDefaultServletRoot() {
 		request.setContextPath("/test");
 		request.setServletPath("/");
 		request.setPathInfo(null);
@@ -208,7 +208,7 @@ public void tomcatDefaultServletRoot() {
 	}
 
 	@Test
-	public void tomcatDefaultServletFile() {
+	void tomcatDefaultServletFile() {
 		request.setContextPath("/test");
 		request.setServletPath("/foo");
 		request.setPathInfo(null);
@@ -218,7 +218,7 @@ public void tomcatDefaultServletFile() {
 	}
 
 	@Test
-	public void tomcatDefaultServletFolder() {
+	void tomcatDefaultServletFolder() {
 		request.setContextPath("/test");
 		request.setServletPath("/foo/");
 		request.setPathInfo(null);
@@ -228,7 +228,7 @@ public void tomcatDefaultServletFolder() {
 	}
 
 	@Test //SPR-12372, SPR-13455
-	public void removeDuplicateSlashesInPath() {
+	void removeDuplicateSlashesInPath() {
 		request.setContextPath("/SPR-12372");
 		request.setPathInfo(null);
 		request.setServletPath("/foo/bar/");
@@ -249,7 +249,7 @@ public void removeDuplicateSlashesInPath() {
 	}
 
 	@Test
-	public void wasDefaultServletRoot() {
+	void wasDefaultServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo("/");
 		request.setServletPath("");
@@ -260,13 +260,13 @@ public void wasDefaultServletRoot() {
 	}
 
 	@Test
-	public void wasDefaultServletRootWithCompliantSetting() {
+	void wasDefaultServletRootWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/");
 		tomcatDefaultServletRoot();
 	}
 
 	@Test
-	public void wasDefaultServletFile() {
+	void wasDefaultServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("");
@@ -277,13 +277,13 @@ public void wasDefaultServletFile() {
 	}
 
 	@Test
-	public void wasDefaultServletFileWithCompliantSetting() {
+	void wasDefaultServletFileWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo");
 		tomcatDefaultServletFile();
 	}
 
 	@Test
-	public void wasDefaultServletFolder() {
+	void wasDefaultServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("");
@@ -294,7 +294,7 @@ public void wasDefaultServletFolder() {
 	}
 
 	@Test
-	public void wasDefaultServletFolderWithCompliantSetting() {
+	void wasDefaultServletFolderWithCompliantSetting() {
 		UrlPathHelper.websphereComplianceFlag = true;
 		try {
 			request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/");
@@ -311,7 +311,7 @@ public void wasDefaultServletFolderWithCompliantSetting() {
 	//
 
 	@Test
-	public void tomcatCasualServletRoot() {
+	void tomcatCasualServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo("/");
 		request.setServletPath("/foo");
@@ -321,9 +321,9 @@ public void tomcatCasualServletRoot() {
 	}
 
 	@Disabled
-	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
 	@Test
-	public void tomcatCasualServletRootWithMissingSlash() {
+	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
+	void tomcatCasualServletRootWithMissingSlash() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo");
@@ -333,7 +333,7 @@ public void tomcatCasualServletRootWithMissingSlash() {
 	}
 
 	@Test
-	public void tomcatCasualServletFile() {
+	void tomcatCasualServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("/foo");
@@ -343,7 +343,7 @@ public void tomcatCasualServletFile() {
 	}
 
 	@Test
-	public void tomcatCasualServletFolder() {
+	void tomcatCasualServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("/foo");
@@ -353,7 +353,7 @@ public void tomcatCasualServletFolder() {
 	}
 
 	@Test
-	public void wasCasualServletRoot() {
+	void wasCasualServletRoot() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo/");
@@ -364,15 +364,15 @@ public void wasCasualServletRoot() {
 	}
 
 	@Test
-	public void wasCasualServletRootWithCompliantSetting() {
+	void wasCasualServletRootWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/");
 		tomcatCasualServletRoot();
 	}
 
 	@Disabled
-	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
 	@Test
-	public void wasCasualServletRootWithMissingSlash() {
+	// test the root mapping for /foo/* w/o a trailing slash - <host>/<context>/foo
+	void wasCasualServletRootWithMissingSlash() {
 		request.setContextPath("/test");
 		request.setPathInfo(null);
 		request.setServletPath("/foo");
@@ -384,13 +384,13 @@ public void wasCasualServletRootWithMissingSlash() {
 
 	@Disabled
 	@Test
-	public void wasCasualServletRootWithMissingSlashWithCompliantSetting() {
+	void wasCasualServletRootWithMissingSlashWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo");
 		tomcatCasualServletRootWithMissingSlash();
 	}
 
 	@Test
-	public void wasCasualServletFile() {
+	void wasCasualServletFile() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo");
 		request.setServletPath("/foo");
@@ -401,13 +401,13 @@ public void wasCasualServletFile() {
 	}
 
 	@Test
-	public void wasCasualServletFileWithCompliantSetting() {
+	void wasCasualServletFileWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/foo");
 		tomcatCasualServletFile();
 	}
 
 	@Test
-	public void wasCasualServletFolder() {
+	void wasCasualServletFolder() {
 		request.setContextPath("/test");
 		request.setPathInfo("/foo/");
 		request.setServletPath("/foo");
@@ -418,33 +418,33 @@ public void wasCasualServletFolder() {
 	}
 
 	@Test
-	public void wasCasualServletFolderWithCompliantSetting() {
+	void wasCasualServletFolderWithCompliantSetting() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/test/foo/foo/");
 		tomcatCasualServletFolder();
 	}
 
 	@Test
-	public void getOriginatingRequestUri() {
+	void getOriginatingRequestUri() {
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/path");
 	}
 
 	@Test
-	public void getOriginatingRequestUriWebsphere() {
+	void getOriginatingRequestUriWebsphere() {
 		request.setAttribute(WEBSPHERE_URI_ATTRIBUTE, "/path");
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/path");
 	}
 
 	@Test
-	public void getOriginatingRequestUriDefault() {
+	void getOriginatingRequestUriDefault() {
 		request.setRequestURI("/forwarded");
 		assertThat(helper.getOriginatingRequestUri(request)).isEqualTo("/forwarded");
 	}
 
 	@Test
-	public void getOriginatingQueryString() {
+	void getOriginatingQueryString() {
 		request.setQueryString("forward=on");
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		request.setAttribute(WebUtils.FORWARD_QUERY_STRING_ATTRIBUTE, "original=on");
@@ -452,13 +452,13 @@ public void getOriginatingQueryString() {
 	}
 
 	@Test
-	public void getOriginatingQueryStringNotPresent() {
+	void getOriginatingQueryStringNotPresent() {
 		request.setQueryString("forward=true");
 		assertThat(this.helper.getOriginatingQueryString(request)).isEqualTo("forward=true");
 	}
 
 	@Test
-	public void getOriginatingQueryStringIsNull() {
+	void getOriginatingQueryStringIsNull() {
 		request.setQueryString("forward=true");
 		request.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/path");
 		assertThat(this.helper.getOriginatingQueryString(request)).isNull();

From b28f403bf8314d27704b789a0eeda11f74aaf886 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 14:45:55 +0200
Subject: [PATCH 051/140] Fix Checkstyle violation

See gh-27303
---
 .../springframework/web/util/UrlPathHelperTests.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
index 094e33d419fd..e3281e55273f 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -22,7 +22,7 @@
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 /**
  * Unit tests for {@link UrlPathHelper}.
@@ -170,16 +170,16 @@ void getLookupPathWithSemicolonContentAndNullPathInfo() {
 	void defaultInstanceReadOnlyBehavior() {
 		UrlPathHelper helper = UrlPathHelper.defaultInstance;
 
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setAlwaysUseFullPath(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setUrlDecode(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setRemoveSemicolonContent(true))
 			.withMessage("This instance cannot be modified");
-		assertThatExceptionOfType(IllegalArgumentException.class)
+		assertThatIllegalArgumentException()
 			.isThrownBy(() -> helper.setDefaultEncoding("UTF-8"))
 			.withMessage("This instance cannot be modified");
 

From 7da7a976e67fad30b2e5e5caaf9bf2fa8045d5d1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 15:54:35 +0200
Subject: [PATCH 052/140] Document when prepareTestInstance() is invoked by the
 SpringMethodRule

Closes gh-27305
---
 .../test/annotation/Repeat.java               |  8 ++++++--
 .../test/context/TestContextManager.java      | 10 +++++++---
 .../test/context/TestExecutionListener.java   | 20 +++++++++++--------
 .../junit4/rules/SpringMethodRule.java        |  6 +++++-
 src/docs/asciidoc/testing.adoc                |  6 ++++--
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
index e81bb9c85690..dfa062ceb2ba 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,11 @@
  *
  * <p>Note that the scope of execution to be repeated includes execution of the
  * test method itself as well as any <em>set up</em> or <em>tear down</em> of
- * the test fixture.
+ * the test fixture. When used with the
+ * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+ * SpringMethodRule}, the scope additionally includes
+ * {@linkplain org.springframework.test.context.TestExecutionListener#prepareTestInstance
+ * preparation of the test instance}.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em>.
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
index 30d67923e4fb..d93b78d88d56 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -221,8 +221,12 @@ public void beforeTestClass() throws Exception {
 
 	/**
 	 * Hook for preparing a test instance prior to execution of any individual
-	 * test methods, for example for injecting dependencies, etc. Should be
-	 * called immediately after instantiation of the test instance.
+	 * test methods &mdash; for example, to inject dependencies.
+	 * <p>This method should be called immediately after instantiation of the test
+	 * class or as soon after instantiation as possible (as is the case with the
+	 * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+	 * SpringMethodRule}). In any case, this method must be called prior to any
+	 * framework-specific lifecycle callbacks.
 	 * <p>The managed {@link TestContext} will be updated with the supplied
 	 * {@code testInstance}.
 	 * <p>An attempt will be made to give each registered
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
index a9b188e6e92d..e10d2422bdcc 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,10 +86,14 @@ default void beforeTestClass(TestContext testContext) throws Exception {
 	}
 
 	/**
-	 * Prepares the {@link Object test instance} of the supplied
-	 * {@link TestContext test context}, for example by injecting dependencies.
+	 * Prepares the {@linkplain Object test instance} of the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, to inject
+	 * dependencies.
 	 * <p>This method should be called immediately after instantiation of the test
-	 * instance but prior to any framework-specific lifecycle callbacks.
+	 * class or as soon after instantiation as possible (as is the case with the
+	 * {@link org.springframework.test.context.junit4.rules.SpringMethodRule
+	 * SpringMethodRule}). In any case, this method must be called prior to any
+	 * framework-specific lifecycle callbacks.
 	 * <p>The default implementation is <em>empty</em>. Can be overridden by
 	 * concrete classes as necessary.
 	 * @param testContext the test context for the test; never {@code null}
@@ -123,8 +127,8 @@ default void beforeTestMethod(TestContext testContext) throws Exception {
 
 	/**
 	 * Pre-processes a test <em>immediately before</em> execution of the
-	 * {@link java.lang.reflect.Method test method} in the supplied
-	 * {@link TestContext test context} &mdash; for example, for timing
+	 * {@linkplain java.lang.reflect.Method test method} in the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, for timing
 	 * or logging purposes.
 	 * <p>This method <strong>must</strong> be called after framework-specific
 	 * <em>before</em> lifecycle callbacks.
@@ -143,8 +147,8 @@ default void beforeTestExecution(TestContext testContext) throws Exception {
 
 	/**
 	 * Post-processes a test <em>immediately after</em> execution of the
-	 * {@link java.lang.reflect.Method test method} in the supplied
-	 * {@link TestContext test context} &mdash; for example, for timing
+	 * {@linkplain java.lang.reflect.Method test method} in the supplied
+	 * {@linkplain TestContext test context} &mdash; for example, for timing
 	 * or logging purposes.
 	 * <p>This method <strong>must</strong> be called before framework-specific
 	 * <em>after</em> lifecycle callbacks.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
index 639ee9d6f623..57478d4bd8a6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,6 +79,10 @@
  * <p><strong>NOTE:</strong> As of Spring Framework 4.3, this class requires JUnit 4.12 or higher.
  *
  * <p><strong>WARNING:</strong> Due to the shortcomings of JUnit rules, the
+ * {@code SpringMethodRule}
+ * {@linkplain org.springframework.test.context.TestExecutionListener#prepareTestInstance
+ * prepares the test instance} before {@code @Before} lifecycle methods instead of
+ * immediately after instantiation of the test class. In addition, the
  * {@code SpringMethodRule} does <strong>not</strong> support the
  * {@code beforeTestExecution()} and {@code afterTestExecution()} callbacks of the
  * {@link org.springframework.test.context.TestExecutionListener TestExecutionListener}
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 81455ea5ac12..90c463fbe6fa 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -1657,8 +1657,10 @@ before failing.
 times that the test method is to be run is specified in the annotation.
 
 The scope of execution to be repeated includes execution of the test method itself as
-well as any setting up or tearing down of the test fixture. The following example shows
-how to use the `@Repeat` annotation:
+well as any setting up or tearing down of the test fixture. When used with the
+<<testcontext-junit4-rules, `SpringMethodRule`>>, the scope additionally includes
+preparation of the test instance by `TestExecutionListener` implementations. The
+following example shows how to use the `@Repeat` annotation:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java

From 8a7c4fc10d60168ebded312e2b02b3a052c46d33 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 17:44:14 +0200
Subject: [PATCH 053/140] Support HtmlFileInput.setData() with HtmlUnit and
 MockMvc

Prior to this commit, if the user tested file upload support with
HtmlUnit and MockMvc by invoking HtmlFileInput.setData() instead of
HtmlFileInput.setFiles(), the in-memory file data was simply ignored.

This commit addresses this issue by creating a MockPart from the
in-memory data in HtmlUnitRequestBuilder.

Closes gh-27199
---
 .../htmlunit/HtmlUnitRequestBuilder.java      | 14 +++++---
 .../htmlunit/HtmlUnitRequestBuilderTests.java | 32 +++++++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index fa52c987c667..7d76e63e7511 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -377,12 +377,18 @@ private void params(MockHttpServletRequest request, UriComponents uriComponents)
 				MockPart part;
 				if (file != null) {
 					part = new MockPart(pair.getName(), file.getName(), readAllBytes(file));
-					part.getHeaders().setContentType(MediaType.valueOf(pair.getMimeType()));
 				}
-				else { // mimic empty file upload
-					part = new MockPart(pair.getName(), "", null);
-					part.getHeaders().setContentType(MediaType.APPLICATION_OCTET_STREAM);
+				else {
+					// Support empty file upload OR file upload via setData().
+					// For an empty file upload, getValue() returns an empty string, and
+					// getData() returns null.
+					// For a file upload via setData(), getData() returns the file data, and
+					// getValue() returns the file name (if set) or an empty string.
+					part = new MockPart(pair.getName(), pair.getValue(), pair.getData());
 				}
+				MediaType mediaType = (pair.getMimeType() != null ? MediaType.valueOf(pair.getMimeType()) :
+						MediaType.APPLICATION_OCTET_STREAM);
+				part.getHeaders().setContentType(mediaType);
 				request.addPart(part);
 			}
 			else {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index b1f73b4741f9..96ebbb4ed529 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.test.web.servlet.htmlunit;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -443,6 +444,33 @@ public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithFile
 		assertThat(part.getContentType()).isEqualTo(MimeType.TEXT_PLAIN);
 	}
 
+	@Test // gh-27199
+	public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithFileDataAsParameter() throws Exception {
+		String data = "{}";
+		KeyDataPair keyDataPair = new KeyDataPair("key", new File("test.json"), null, MimeType.APPLICATION_JSON, StandardCharsets.UTF_8);
+		keyDataPair.setData(data.getBytes());
+
+		webRequest.setRequestParameters(Collections.singletonList(keyDataPair));
+
+		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
+
+		assertThat(actualRequest.getParts()).hasSize(1);
+		Part part = actualRequest.getPart("key");
+
+		assertSoftly(softly -> {
+			softly.assertThat(part).as("part").isNotNull();
+			softly.assertThat(part.getName()).as("name").isEqualTo("key");
+			softly.assertThat(part.getSubmittedFileName()).as("file name").isEqualTo("test.json");
+			softly.assertThat(part.getContentType()).as("content type").isEqualTo(MimeType.APPLICATION_JSON);
+			try {
+				softly.assertThat(IOUtils.toString(part.getInputStream(), StandardCharsets.UTF_8)).as("content").isEqualTo(data);
+			}
+			catch (IOException ex) {
+				softly.fail("failed to get InputStream", ex);
+			}
+		});
+	}
+
 	@Test // gh-26799
 	public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithNullFileToUploadAsParameter() throws Exception {
 		webRequest.setRequestParameters(Collections.singletonList(new KeyDataPair("key", null, null, null, (Charset) null)));
@@ -453,11 +481,11 @@ public void buildRequestParameterMapViaWebRequestDotSetRequestParametersWithNull
 		Part part = actualRequest.getPart("key");
 
 		assertSoftly(softly -> {
-			softly.assertThat(part).isNotNull();
+			softly.assertThat(part).as("part").isNotNull();
 			softly.assertThat(part.getName()).as("name").isEqualTo("key");
 			softly.assertThat(part.getSize()).as("size").isEqualTo(0);
 			try {
-				softly.assertThat(part.getInputStream()).isEmpty();
+				softly.assertThat(part.getInputStream()).as("input stream").isEmpty();
 			}
 			catch (IOException ex) {
 				softly.fail("failed to get InputStream", ex);

From 81a6ba42a36230ad7cdbf1d4e699e09dad012ad1 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 11:37:22 +0200
Subject: [PATCH 054/140] Introduce ExceptionCollector testing utility

This commit introduces a new ExceptionCollector testing utility in order
to support "soft assertion" use cases.

Closes gh-27316
---
 .../test/util/ExceptionCollector.java         | 127 +++++++++++++++
 .../test/util/ExceptionCollectorTests.java    | 151 ++++++++++++++++++
 2 files changed, 278 insertions(+)
 create mode 100644 spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
 create mode 100644 spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
new file mode 100644
index 000000000000..1c5ffaa33236
--- /dev/null
+++ b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * {@code ExceptionCollector} is a test utility for executing code blocks,
+ * collecting exceptions, and generating a single {@link AssertionError}
+ * containing any exceptions encountered as {@linkplain Throwable#getSuppressed()
+ * suppressed exceptions}.
+ *
+ * <p>This utility is intended to support <em>soft assertion</em> use cases
+ * similar to the {@code SoftAssertions} support in AssertJ and the
+ * {@code assertAll()} support in JUnit Jupiter.
+ *
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
+public class ExceptionCollector {
+
+	private final List<Throwable> exceptions = new ArrayList<>();
+
+
+	/**
+	 * Execute the supplied {@link Executable} and track any exception thrown.
+	 * @param executable the {@code Executable} to execute
+	 * @see #getExceptions()
+	 * @see #assertEmpty()
+	 */
+	public void execute(Executable executable) {
+		try {
+			executable.execute();
+		}
+		catch (Throwable ex) {
+			this.exceptions.add(ex);
+		}
+	}
+
+	/**
+	 * Get the list of exceptions encountered in {@link #execute(Executable)}.
+	 * @return an unmodifiable copy of the list of exceptions, potentially empty
+	 * @see #assertEmpty()
+	 */
+	public List<Throwable> getExceptions() {
+		return Collections.unmodifiableList(this.exceptions);
+	}
+
+	/**
+	 * Assert that this {@code ExceptionCollector} does not contain any
+	 * {@linkplain #getExceptions() exceptions}.
+	 * <p>If this collector is empty, this method is effectively a no-op.
+	 * <p>If this collector contains a single {@link Error} or {@link Exception},
+	 * this method rethrows the error or exception.
+	 * <p>If this collector contains a single {@link Throwable}, this method throws
+	 * an {@link AssertionError} with the error message of the {@code Throwable}
+	 * and with the {@code Throwable} as the {@linkplain Throwable#getCause() cause}.
+	 * <p>If this collector contains multiple exceptions, this method throws an
+	 * {@code AssertionError} whose message is "Multiple Exceptions (#):"
+	 * followed by a new line with the error message of each exception separated
+	 * by a new line, with {@code #} replaced with the number of exceptions present.
+	 * In addition, each exception will be added to the {@code AssertionError} as
+	 * a {@link Throwable#addSuppressed(Throwable) suppressed exception}.
+	 * @see #execute(Executable)
+	 * @see #getExceptions()
+	 */
+	public void assertEmpty() throws Exception {
+		if (this.exceptions.isEmpty()) {
+			return;
+		}
+
+		if (this.exceptions.size() == 1) {
+			Throwable exception = this.exceptions.get(0);
+			if (exception instanceof Error) {
+				throw (Error) exception;
+			}
+			if (exception instanceof Exception) {
+				throw (Exception) exception;
+			}
+			AssertionError assertionError = new AssertionError(exception.getMessage());
+			assertionError.initCause(exception);
+			throw assertionError;
+		}
+
+		StringBuilder message = new StringBuilder();
+		message.append("Multiple Exceptions (").append(this.exceptions.size()).append("):");
+		for (Throwable exception : this.exceptions) {
+			message.append('\n');
+			message.append(exception.getMessage());
+		}
+		AssertionError assertionError = new AssertionError(message);
+		this.exceptions.forEach(assertionError::addSuppressed);
+		throw assertionError;
+	}
+
+
+	/**
+	 * {@code Executable} is a functional interface that can be used to implement
+	 * any generic block of code that potentially throws a {@link Throwable}.
+	 *
+	 * <p>The {@code Executable} interface is similar to {@link java.lang.Runnable},
+	 * except that an {@code Executable} can throw any kind of exception.
+	 */
+	@FunctionalInterface
+	interface Executable {
+
+		void execute() throws Throwable;
+
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java b/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java
new file mode 100644
index 000000000000..6bb39d407b01
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/util/ExceptionCollectorTests.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.util;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.util.ExceptionCollector.Executable;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
+/**
+ * Unit tests for {@link ExceptionCollector}.
+ *
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
+public class ExceptionCollectorTests {
+
+	private static final char EOL = '\n';
+
+	private final ExceptionCollector collector = new ExceptionCollector();
+
+
+	@Test
+	void noExceptions() {
+		this.collector.execute(() -> {});
+
+		assertThat(this.collector.getExceptions()).isEmpty();
+		assertThatNoException().isThrownBy(this.collector::assertEmpty);
+	}
+
+	@Test
+	void oneError() {
+		this.collector.execute(error());
+
+		assertOneFailure(Error.class, "error");
+	}
+
+	@Test
+	void oneAssertionError() {
+		this.collector.execute(assertionError());
+
+		assertOneFailure(AssertionError.class, "assertion");
+	}
+
+	@Test
+	void oneCheckedException() {
+		this.collector.execute(checkedException());
+
+		assertOneFailure(Exception.class, "checked");
+	}
+
+	@Test
+	void oneUncheckedException() {
+		this.collector.execute(uncheckedException());
+
+		assertOneFailure(RuntimeException.class, "unchecked");
+	}
+
+	@Test
+	void oneThrowable() {
+		this.collector.execute(throwable());
+
+		assertThatExceptionOfType(AssertionError.class)
+			.isThrownBy(this.collector::assertEmpty)
+			.withMessage("throwable")
+			.withCauseExactlyInstanceOf(Throwable.class)
+			.satisfies(error -> assertThat(error.getCause()).hasMessage("throwable"))
+			.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	private void assertOneFailure(Class<? extends Throwable> expectedType, String failureMessage) {
+		assertThatExceptionOfType(expectedType)
+			.isThrownBy(this.collector::assertEmpty)
+			.satisfies(exception ->
+				assertThat(exception)
+					.isExactlyInstanceOf(expectedType)
+					.hasNoSuppressedExceptions()
+					.hasNoCause()
+					.hasMessage(failureMessage));
+	}
+
+	@Test
+	void multipleFailures() {
+		this.collector.execute(assertionError());
+		this.collector.execute(checkedException());
+		this.collector.execute(uncheckedException());
+		this.collector.execute(error());
+		this.collector.execute(throwable());
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(this.collector::assertEmpty)
+				.withMessage("Multiple Exceptions (5):" + EOL + //
+					"assertion" + EOL + //
+					"checked" + EOL + //
+					"unchecked" + EOL + //
+					"error" + EOL + //
+					"throwable"//
+				)
+				.satisfies(exception ->
+					assertThat(exception.getSuppressed()).extracting(Object::getClass).map(Class::getSimpleName)
+						.containsExactly("AssertionError", "Exception", "RuntimeException", "Error", "Throwable"));
+	}
+
+	private Executable throwable() {
+		return () -> {
+			throw new Throwable("throwable");
+		};
+	}
+
+	private Executable error() {
+		return () -> {
+			throw new Error("error");
+		};
+	}
+
+	private Executable assertionError() {
+		return () -> {
+			throw new AssertionError("assertion");
+		};
+	}
+
+	private Executable checkedException() {
+		return () -> {
+			throw new Exception("checked");
+		};
+	}
+
+	private Executable uncheckedException() {
+		return () -> {
+			throw new RuntimeException("unchecked");
+		};
+	}
+
+}

From 4c153b80eef662af0d5ae3b316aa4f9f3d874e8a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 11:57:54 +0200
Subject: [PATCH 055/140] Make ExceptionCollector.Executable public

See gh-27316
---
 .../java/org/springframework/test/util/ExceptionCollector.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
index 1c5ffaa33236..f53190b7aff7 100644
--- a/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
+++ b/spring-test/src/main/java/org/springframework/test/util/ExceptionCollector.java
@@ -118,7 +118,7 @@ public void assertEmpty() throws Exception {
 	 * except that an {@code Executable} can throw any kind of exception.
 	 */
 	@FunctionalInterface
-	interface Executable {
+	public interface Executable {
 
 		void execute() throws Throwable;
 

From 35bec8102b014feac18c5b096b39c3592c27b76e Mon Sep 17 00:00:00 2001
From: Michal Rowicki <Michal.Rowicki@vimn.com>
Date: Sun, 9 May 2021 23:57:41 +0200
Subject: [PATCH 056/140] Introduce soft assertions for MockMvc

It happens very often that MockMvc is used in heavyweight integration
tests. It's no use to waste time to check if another condition has been
fixed or not. Soft assertions help a lot by checking all conditions at
once even if one of them fails.

See gh-26917

Co-authored-by: Sach Nguyen <sachnbbkhn@gmail.com>
---
 .../test/web/servlet/ResultActions.java       | 12 +++-
 .../test/web/servlet/ResultMatcher.java       | 29 ++++++++
 .../test/web/servlet/ResultMatcherTests.java  | 66 +++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index d63a5dd4884e..bbcb0a2e127d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -42,7 +42,7 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>Or alternatively provide all matchers as a vararg:
+	 * <p>Either provide all matchers as a vararg:
 	 * <pre class="code">
 	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
 	 *
@@ -56,6 +56,16 @@ public interface ResultActions {
 	 *       flash().attribute("message", "success!"))
 	 *   );
 	 * </pre>
+	 *
+	 * <p>Or provide all matchers to be evaluated no matter if one of them fail:
+	 * <pre class="code">
+	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
+	 * mockMvc.perform(post("/form"))
+	 *   .andExpect(matchAllSoftly(
+	 *       status().isOk(),
+	 *       redirectedUrl("/person/1")
+	 *   );
+	 * </pre>
 	 */
 	ResultActions andExpect(ResultMatcher matcher) throws Exception;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 1b6b409806d4..6c4d054d2359 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,6 +16,9 @@
 
 package org.springframework.test.web.servlet;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -70,4 +73,30 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 		};
 	}
 
+	/**
+	 * Static method for matching with an array of result matchers whose assertion failures are caught and stored.
+	 * Only when all of them would be called a {@link AssertionError} be thrown containing the error messages of those
+	 * previously caught assertion failures.
+	 * @param matchers the matchers
+	 * @author Michał Rowicki
+	 * @since 5.2
+	 */
+	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
+		return result -> {
+			List<String> failedMessages = new ArrayList<>();
+			for (int i = 0; i < matchers.length; i++) {
+				ResultMatcher matcher = matchers[i];
+				try {
+					matcher.match(result);
+				}
+				catch (AssertionError assertionException) {
+					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				}
+			}
+			if (!failedMessages.isEmpty()) {
+				throw new AssertionError(String.join("\n", failedMessages));
+			}
+		};
+	}
+
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
new file mode 100644
index 000000000000..40cbb56063f9
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.web.servlet;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
+class ResultMatcherTests {
+
+	@Test
+	void whenProvidedMatcherPassesThenSoftAssertionsAlsoPasses() {
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+
+		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
+	}
+
+	@Test
+	void whenOneOfMatcherFailsThenSoftAssertionFailsWithTheVerySameMessage() {
+		String failMessage = "fail message";
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(failMessage));
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage("[0] " + failMessage);
+	}
+
+	@Test
+	void whenMultipleMatchersFailsThenSoftAssertionFailsWithOneErrorWithMessageContainingAllErrorMessagesWithTheSameOrder() {
+		String firstFail = "firstFail";
+		String secondFail = "secondFail";
+		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(firstFail), failMatcher(secondFail));
+
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage("[0] " + firstFail + "\n[1] " + secondFail);
+	}
+
+	@NotNull
+	private ResultMatcher failMatcher(String failMessage) {
+		return result -> {
+			throw new AssertionError(failMessage);
+		};
+	}
+
+	void doNothing(MvcResult mvcResult) {}
+}

From 5f47d3be227e115c57b03e73f5df97993c44fdd8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 18:32:05 +0200
Subject: [PATCH 057/140] Polish soft assertions for MockMvc

See gh-26917
---
 .../test/web/servlet/ResultActions.java       | 19 ++++----
 .../test/web/servlet/ResultMatcher.java       | 32 ++++++-------
 .../test/web/servlet/ResultMatcherTests.java  | 45 ++++++++++++-------
 3 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index bbcb0a2e127d..8259a19508b7 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,11 @@ public interface ResultActions {
 	/**
 	 * Perform an expectation.
 	 *
-	 * <h4>Example</h4>
+	 * <h4>Examples</h4>
+	 *
+	 * <p>You can invoke {@code andExpect()} multiple times.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
 	 * mockMvc.perform(get("/person/1"))
 	 *   .andExpect(status().isOk())
@@ -42,9 +44,9 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>Either provide all matchers as a vararg:
+	 * <p>You can provide all matchers as a var-arg list with {@code matchAll()}.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
 	 *
 	 * mockMvc.perform(post("/form"))
 	 *   .andExpect(matchAll(
@@ -57,13 +59,14 @@ public interface ResultActions {
 	 *   );
 	 * </pre>
 	 *
-	 * <p>Or provide all matchers to be evaluated no matter if one of them fail:
+	 * <p>Alternatively, you can provide all matchers to be evaluated using
+	 * <em>soft assertions</em> with {@code matchAllSoftly()}.
 	 * <pre class="code">
-	 * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
 	 * mockMvc.perform(post("/form"))
 	 *   .andExpect(matchAllSoftly(
 	 *       status().isOk(),
-	 *       redirectedUrl("/person/1")
+	 *       redirectedUrl("/person/1"))
 	 *   );
 	 * </pre>
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 6c4d054d2359..13624102988f 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.test.web.servlet;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -47,6 +44,7 @@
  *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 3.2
  */
 @FunctionalInterface
@@ -74,27 +72,29 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 	}
 
 	/**
-	 * Static method for matching with an array of result matchers whose assertion failures are caught and stored.
-	 * Only when all of them would be called a {@link AssertionError} be thrown containing the error messages of those
-	 * previously caught assertion failures.
+	 * Static method for matching with an array of result matchers whose assertion
+	 * failures are caught and stored. Once all matchers have been called, if any
+	 * failures occurred, an {@link AssertionError} will be thrown containing the
+	 * error messages of all assertion failures.
 	 * @param matchers the matchers
-	 * @author Michał Rowicki
-	 * @since 5.2
+	 * @since 5.3.10
 	 */
 	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
 		return result -> {
-			List<String> failedMessages = new ArrayList<>();
-			for (int i = 0; i < matchers.length; i++) {
-				ResultMatcher matcher = matchers[i];
+			String message = "";
+			for (ResultMatcher matcher : matchers) {
 				try {
 					matcher.match(result);
 				}
-				catch (AssertionError assertionException) {
-					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				catch (Error | Exception ex) {
+					if (!message.isEmpty()) {
+						message += System.lineSeparator();
+					}
+					message += ex.getMessage();
 				}
 			}
-			if (!failedMessages.isEmpty()) {
-				throw new AssertionError(String.join("\n", failedMessages));
+			if (!message.isEmpty()) {
+				throw new AssertionError(message);
 			}
 		};
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
index 40cbb56063f9..17ff0588269f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -16,51 +16,62 @@
 
 package org.springframework.test.web.servlet;
 
-import org.jetbrains.annotations.NotNull;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
+/**
+ * Unit tests for {@link ResultMatcher}.
+ *
+ * @author Michał Rowicki
+ * @author Sam Brannen
+ * @since 5.3.10
+ */
 class ResultMatcherTests {
 
+	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
+
+
 	@Test
-	void whenProvidedMatcherPassesThenSoftAssertionsAlsoPasses() {
+	void softAssertionsWithNoFailures() {
 		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
 
 		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
 	}
 
 	@Test
-	void whenOneOfMatcherFailsThenSoftAssertionFailsWithTheVerySameMessage() {
-		String failMessage = "fail message";
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(failMessage));
+	void softAssertionsWithOneFailure() {
+		String failureMessage = "failure message";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(failureMessage));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("[0] " + failMessage);
+				.withMessage(failureMessage);
 	}
 
 	@Test
-	void whenMultipleMatchersFailsThenSoftAssertionFailsWithOneErrorWithMessageContainingAllErrorMessagesWithTheSameOrder() {
-		String firstFail = "firstFail";
-		String secondFail = "secondFail";
-		StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failMatcher(firstFail), failMatcher(secondFail));
+	void softAssertionsWithTwoFailures() {
+		String firstFailure = "firstFailure";
+		String secondFailure = "secondFailure";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(firstFailure), exceptionalMatcher(secondFailure));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("[0] " + firstFail + "\n[1] " + secondFail);
+				.withMessage(firstFailure + System.lineSeparator() + secondFailure);
 	}
 
-	@NotNull
-	private ResultMatcher failMatcher(String failMessage) {
+	private ResultMatcher failingMatcher(String failureMessage) {
+		return result -> Assertions.fail(failureMessage);
+	}
+
+	private ResultMatcher exceptionalMatcher(String failureMessage) {
 		return result -> {
-			throw new AssertionError(failMessage);
+			throw new RuntimeException(failureMessage);
 		};
 	}
 
 	void doNothing(MvcResult mvcResult) {}
+
 }

From cd078eaad83e2c6cb441719086b460e665c20f35 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 22 Aug 2021 19:03:32 +0200
Subject: [PATCH 058/140] Use ExceptionCollector for soft assertions in MockMvc

See gh-26917
---
 .../test/web/servlet/ResultMatcher.java       | 18 ++----
 .../test/web/servlet/ResultMatcherTests.java  | 62 +++++++++++++++----
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index 13624102988f..ac40b9d71619 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet;
 
+import org.springframework.test.util.ExceptionCollector;
+
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -81,21 +83,11 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 	 */
 	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
 		return result -> {
-			String message = "";
+			ExceptionCollector exceptionCollector = new ExceptionCollector();
 			for (ResultMatcher matcher : matchers) {
-				try {
-					matcher.match(result);
-				}
-				catch (Error | Exception ex) {
-					if (!message.isEmpty()) {
-						message += System.lineSeparator();
-					}
-					message += ex.getMessage();
-				}
-			}
-			if (!message.isEmpty()) {
-				throw new AssertionError(message);
+				exceptionCollector.execute(() -> matcher.match(result));
 			}
+			exceptionCollector.assertEmpty();
 		};
 	}
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
index 17ff0588269f..dd7cd3527cd5 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
@@ -16,9 +16,9 @@
 
 package org.springframework.test.web.servlet;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 
@@ -31,6 +31,8 @@
  */
 class ResultMatcherTests {
 
+	private static final String EOL = "\n";
+
 	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
 
 
@@ -42,36 +44,74 @@ void softAssertionsWithNoFailures() {
 	}
 
 	@Test
-	void softAssertionsWithOneFailure() {
-		String failureMessage = "failure message";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(failureMessage));
+	void softAssertionsWithOneAssertionError() {
+		String failureMessage = "error";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(failureMessage));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage);
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	void softAssertionsWithOneRuntimeException() {
+		String failureMessage = "exception";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(uncheckedExceptionMatcher(failureMessage));
+
+		assertThatExceptionOfType(RuntimeException.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	void softAssertionsWithOneCheckedException() {
+		String failureMessage = "exception";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(checkedExceptionMatcher(failureMessage));
+
+		assertThatExceptionOfType(Exception.class)
+				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
+				.withMessage(failureMessage)
+				.withNoCause()
+				.satisfies(exception -> assertThat(exception).hasNoSuppressedExceptions());
 	}
 
 	@Test
 	void softAssertionsWithTwoFailures() {
 		String firstFailure = "firstFailure";
 		String secondFailure = "secondFailure";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(failingMatcher(firstFailure), exceptionalMatcher(secondFailure));
+		String thirdFailure = "thirdFailure";
+		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(firstFailure),
+			checkedExceptionMatcher(secondFailure), uncheckedExceptionMatcher(thirdFailure));
 
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(firstFailure + System.lineSeparator() + secondFailure);
+				.withMessage("Multiple Exceptions (3):" + EOL + firstFailure + EOL + secondFailure + EOL + thirdFailure)
+				.satisfies(error -> assertThat(error.getSuppressed()).hasSize(3));
 	}
 
-	private ResultMatcher failingMatcher(String failureMessage) {
-		return result -> Assertions.fail(failureMessage);
+	private ResultMatcher assertionErrorMatcher(String failureMessage) {
+		return result -> {
+			throw new AssertionError(failureMessage);
+		};
 	}
 
-	private ResultMatcher exceptionalMatcher(String failureMessage) {
+	private ResultMatcher uncheckedExceptionMatcher(String failureMessage) {
 		return result -> {
 			throw new RuntimeException(failureMessage);
 		};
 	}
 
-	void doNothing(MvcResult mvcResult) {}
+	private ResultMatcher checkedExceptionMatcher(String failureMessage) {
+		return result -> {
+			throw new Exception(failureMessage);
+		};
+	}
+
+	void doNothing(MvcResult mvcResult) {
+	}
 
 }

From dd9b99e13d6b30462fb168799e6bbca1456123da Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 13:05:50 +0200
Subject: [PATCH 059/140] Introduce ResultActions.andExpectAll() for soft
 assertions in MockMvc

Closes gh-26917
---
 .../test/web/servlet/ResultActions.java       |  65 ++++++----
 .../test/web/servlet/ResultMatcher.java       |  29 +----
 .../test/web/servlet/ResultMatcherTests.java  | 117 ------------------
 .../samples/context/JavaConfigTests.java      |  40 +++++-
 src/docs/asciidoc/testing.adoc                |  20 ++-
 5 files changed, 102 insertions(+), 169 deletions(-)
 delete mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
index 8259a19508b7..f4fd6da14b58 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -16,6 +16,8 @@
 
 package org.springframework.test.web.servlet;
 
+import org.springframework.test.util.ExceptionCollector;
+
 /**
  * Allows applying actions, such as expectations, on the result of an executed
  * request.
@@ -25,6 +27,8 @@
  * {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 3.2
  */
 public interface ResultActions {
@@ -32,9 +36,9 @@ public interface ResultActions {
 	/**
 	 * Perform an expectation.
 	 *
-	 * <h4>Examples</h4>
-	 *
-	 * <p>You can invoke {@code andExpect()} multiple times.
+	 * <h4>Example</h4>
+	 * <p>You can invoke {@code andExpect()} multiple times as in the following
+	 * example.
 	 * <pre class="code">
 	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
@@ -44,33 +48,48 @@ public interface ResultActions {
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 * </pre>
 	 *
-	 * <p>You can provide all matchers as a var-arg list with {@code matchAll()}.
+	 * @see #andExpectAll(ResultMatcher...)
+	 */
+	ResultActions andExpect(ResultMatcher matcher) throws Exception;
+
+	/**
+	 * Perform multiple expectations, with the guarantee that all expectations
+	 * will be asserted even if one or more expectations fail with an exception.
+	 * <p>If a single {@link Error} or {@link Exception} is thrown, it will
+	 * be rethrown.
+	 * <p>If multiple exceptions are thrown, this method will throw an
+	 * {@link AssertionError} whose error message is a summary of all of the
+	 * exceptions. In addition, each exception will be added as a
+	 * {@linkplain Throwable#addSuppressed(Throwable) suppressed exception} to
+	 * the {@code AssertionError}.
+	 * <p>This feature is similar to the {@code SoftAssertions} support in AssertJ
+	 * and the {@code assertAll()} support in JUnit Jupiter.
+	 *
+	 * <h4>Example</h4>
+	 * <p>Instead of invoking {@code andExpect()} multiple times, you can invoke
+	 * {@code andExpectAll()} as in the following example.
 	 * <pre class="code">
-	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
+	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*
 	 *
-	 * mockMvc.perform(post("/form"))
-	 *   .andExpect(matchAll(
+	 * mockMvc.perform(get("/person/1"))
+	 *   .andExpectAll(
 	 *       status().isOk(),
-	 *       redirectedUrl("/person/1"),
-	 *   	 model().size(1),
-	 *       model().attributeExists("person"),
-	 *       flash().attributeCount(1),
-	 *       flash().attribute("message", "success!"))
+	 *       content().contentType(MediaType.APPLICATION_JSON),
+	 *       jsonPath("$.person.name").value("Jason")
 	 *   );
 	 * </pre>
 	 *
-	 * <p>Alternatively, you can provide all matchers to be evaluated using
-	 * <em>soft assertions</em> with {@code matchAllSoftly()}.
-	 * <pre class="code">
-	 * // static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
-	 * mockMvc.perform(post("/form"))
-	 *   .andExpect(matchAllSoftly(
-	 *       status().isOk(),
-	 *       redirectedUrl("/person/1"))
-	 *   );
-	 * </pre>
+	 * @since 5.3.10
+	 * @see #andExpect(ResultMatcher)
 	 */
-	ResultActions andExpect(ResultMatcher matcher) throws Exception;
+	default ResultActions andExpectAll(ResultMatcher... matchers) throws Exception {
+		ExceptionCollector exceptionCollector = new ExceptionCollector();
+		for (ResultMatcher matcher : matchers) {
+			exceptionCollector.execute(() -> this.andExpect(matcher));
+		}
+		exceptionCollector.assertEmpty();
+		return this;
+	}
 
 	/**
 	 * Perform a general action.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
index ac40b9d71619..44aae68e150c 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java
@@ -16,8 +16,6 @@
 
 package org.springframework.test.web.servlet;
 
-import org.springframework.test.util.ExceptionCollector;
-
 /**
  * A {@code ResultMatcher} matches the result of an executed request against
  * some expectation.
@@ -40,13 +38,13 @@
  * MockMvc mockMvc = webAppContextSetup(wac).build();
  *
  * mockMvc.perform(get("/form"))
- *   .andExpect(status().isOk())
- *   .andExpect(content().mimeType(MediaType.APPLICATION_JSON));
+ *   .andExpectAll(
+ *       status().isOk(),
+ *       content().mimeType(MediaType.APPLICATION_JSON));
  * </pre>
  *
  * @author Rossen Stoyanchev
  * @author Sam Brannen
- * @author Michał Rowicki
  * @since 3.2
  */
 @FunctionalInterface
@@ -64,7 +62,10 @@ public interface ResultMatcher {
 	 * Static method for matching with an array of result matchers.
 	 * @param matchers the matchers
 	 * @since 5.1
+	 * @deprecated as of Spring Framework 5.3.10, in favor of
+	 * {@link ResultActions#andExpectAll(ResultMatcher...)}
 	 */
+	@Deprecated
 	static ResultMatcher matchAll(ResultMatcher... matchers) {
 		return result -> {
 			for (ResultMatcher matcher : matchers) {
@@ -73,22 +74,4 @@ static ResultMatcher matchAll(ResultMatcher... matchers) {
 		};
 	}
 
-	/**
-	 * Static method for matching with an array of result matchers whose assertion
-	 * failures are caught and stored. Once all matchers have been called, if any
-	 * failures occurred, an {@link AssertionError} will be thrown containing the
-	 * error messages of all assertion failures.
-	 * @param matchers the matchers
-	 * @since 5.3.10
-	 */
-	static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
-		return result -> {
-			ExceptionCollector exceptionCollector = new ExceptionCollector();
-			for (ResultMatcher matcher : matchers) {
-				exceptionCollector.execute(() -> matcher.match(result));
-			}
-			exceptionCollector.assertEmpty();
-		};
-	}
-
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
deleted file mode 100644
index dd7cd3527cd5..000000000000
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/ResultMatcherTests.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2002-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.test.web.servlet;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatNoException;
-
-/**
- * Unit tests for {@link ResultMatcher}.
- *
- * @author Michał Rowicki
- * @author Sam Brannen
- * @since 5.3.10
- */
-class ResultMatcherTests {
-
-	private static final String EOL = "\n";
-
-	private final StubMvcResult stubMvcResult = new StubMvcResult(null, null, null, null, null, null, null);
-
-
-	@Test
-	void softAssertionsWithNoFailures() {
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(this::doNothing);
-
-		assertThatNoException().isThrownBy(() -> resultMatcher.match(stubMvcResult));
-	}
-
-	@Test
-	void softAssertionsWithOneAssertionError() {
-		String failureMessage = "error";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(failureMessage));
-
-		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithOneRuntimeException() {
-		String failureMessage = "exception";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(uncheckedExceptionMatcher(failureMessage));
-
-		assertThatExceptionOfType(RuntimeException.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithOneCheckedException() {
-		String failureMessage = "exception";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(checkedExceptionMatcher(failureMessage));
-
-		assertThatExceptionOfType(Exception.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage(failureMessage)
-				.withNoCause()
-				.satisfies(exception -> assertThat(exception).hasNoSuppressedExceptions());
-	}
-
-	@Test
-	void softAssertionsWithTwoFailures() {
-		String firstFailure = "firstFailure";
-		String secondFailure = "secondFailure";
-		String thirdFailure = "thirdFailure";
-		ResultMatcher resultMatcher = ResultMatcher.matchAllSoftly(assertionErrorMatcher(firstFailure),
-			checkedExceptionMatcher(secondFailure), uncheckedExceptionMatcher(thirdFailure));
-
-		assertThatExceptionOfType(AssertionError.class)
-				.isThrownBy(() -> resultMatcher.match(stubMvcResult))
-				.withMessage("Multiple Exceptions (3):" + EOL + firstFailure + EOL + secondFailure + EOL + thirdFailure)
-				.satisfies(error -> assertThat(error.getSuppressed()).hasSize(3));
-	}
-
-	private ResultMatcher assertionErrorMatcher(String failureMessage) {
-		return result -> {
-			throw new AssertionError(failureMessage);
-		};
-	}
-
-	private ResultMatcher uncheckedExceptionMatcher(String failureMessage) {
-		return result -> {
-			throw new RuntimeException(failureMessage);
-		};
-	}
-
-	private ResultMatcher checkedExceptionMatcher(String failureMessage) {
-		return result -> {
-			throw new Exception(failureMessage);
-		};
-	}
-
-	void doNothing(MvcResult mvcResult) {
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index e96c0c1f6cbe..9cde95fe2ce3 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,13 @@
 import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -61,6 +63,7 @@
  * @author Rossen Stoyanchev
  * @author Sam Brannen
  * @author Sebastien Deleuze
+ * @author Michał Rowicki
  */
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration("classpath:META-INF/web-resources")
@@ -93,9 +96,38 @@ public void setup() {
 	public void person() throws Exception {
 		this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
 			.andDo(print())
-			.andExpect(status().isOk())
-			.andExpect(request().asyncNotStarted())
-			.andExpect(content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"));
+			.andExpectAll(
+				status().isOk(),
+				request().asyncNotStarted(),
+				content().string("{\"name\":\"Joe\",\"someDouble\":0.0,\"someBoolean\":false}"),
+				jsonPath("$.name").value("Joe")
+			);
+	}
+
+	@Test
+	public void andExpectAllWithOneFailure() {
+		assertThatExceptionOfType(AssertionError.class)
+			.isThrownBy(() -> this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
+					.andExpectAll(
+						status().isBadGateway(),
+						request().asyncNotStarted(),
+						jsonPath("$.name").value("Joe")))
+			.withMessage("Status expected:<502> but was:<200>")
+			.satisfies(error -> assertThat(error).hasNoSuppressedExceptions());
+	}
+
+	@Test
+	public void andExpectAllWithMultipleFailures() {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
+			this.mockMvc.perform(get("/person/5").accept(MediaType.APPLICATION_JSON))
+				.andExpectAll(
+					status().isBadGateway(),
+					request().asyncNotStarted(),
+					jsonPath("$.name").value("Joe"),
+					jsonPath("$.name").value("Jane")
+				))
+			.withMessage("Multiple Exceptions (2):\nStatus expected:<502> but was:<200>\nJSON path \"$.name\" expected:<Jane> but was:<Joe>")
+			.satisfies(error -> assertThat(error.getSuppressed()).hasSize(2));
 	}
 
 	@Test
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 90c463fbe6fa..bc3af10d0891 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -7219,8 +7219,9 @@ they must be specified on every request.
 [[spring-mvc-test-server-defining-expectations]]
 ===== Defining Expectations
 
-You can define expectations by appending one or more `.andExpect(..)` calls after
-performing a request, as the following example shows:
+You can define expectations by appending one or more `andExpect(..)` calls after
+performing a request, as the following example shows. As soon as one expectation fails,
+no other expectations will be asserted.
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -7240,6 +7241,21 @@ performing a request, as the following example shows:
 	}
 ----
 
+You can define multiple expectations by appending `andExpectAll(..)` after performing a
+request, as the following example shows. In contrast to `andExpect(..)`,
+`andExpectAll(..)` guarantees that all supplied expectations will be asserted and that
+all failures will be tracked and reported.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	// static import of MockMvcRequestBuilders.* and MockMvcResultMatchers.*
+
+	mockMvc.perform(get("/accounts/1")).andExpectAll(
+		status().isOk(),
+		content().contentType("application/json;charset=UTF-8"));
+----
+
 `MockMvcResultMatchers.*` provides a number of expectations, some of which are further
 nested with more detailed expectations.
 

From 25dca404138e85e8864e4bfa4b37c88f236a559e Mon Sep 17 00:00:00 2001
From: Michal Rowicki <Michal.Rowicki@vimn.com>
Date: Sun, 23 May 2021 13:21:31 +0200
Subject: [PATCH 060/140] Introduce soft assertions for WebTestClient

It happens very often that WebTestClient is used in heavyweight
integration tests, and it's a hindrance to developer productivity to
fix one failed assertion after another. Soft assertions help a lot by
checking all conditions at once even if one of them fails.

This commit introduces a new expectAllSoftly(..) method in
WebTestClient to address this issue.

client.get().uri("/hello")
	.exchange()
	.expectAllSoftly(
		spec -> spec.expectStatus().isOk(),
		spec -> spec.expectBody(String.class).isEqualTo("Hello, World")
	);

Closes gh-26969
---
 .../reactive/server/DefaultWebTestClient.java | 19 +++++
 .../web/reactive/server/WebTestClient.java    |  6 ++
 .../server/samples/SoftAssertionTests.java    | 75 +++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 8d0ec7de0c5d..06dab2ea38a6 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -21,6 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -507,6 +508,24 @@ public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elem
 			Flux<T> body = this.response.bodyToFlux(elementTypeRef);
 			return new FluxExchangeResult<>(this.exchangeResult, body);
 		}
+
+		@Override
+		public ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts) {
+			List<String> failedMessages = new ArrayList<>();
+			for (int i = 0; i < asserts.length; i++) {
+				ResponseSpecMatcher anAssert = asserts[i];
+				try {
+					anAssert.accept(this);
+				}
+				catch (AssertionError assertionException) {
+					failedMessages.add("[" + i + "] " + assertionException.getMessage());
+				}
+			}
+			if (!failedMessages.isEmpty()) {
+				throw new AssertionError(String.join("\n", failedMessages));
+			}
+			return this;
+		}
 	}
 
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 6d2fcefebd70..8f0159aa70ad 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -845,6 +845,11 @@ interface ResponseSpec {
 		 * about a target type with generics.
 		 */
 		<T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef);
+
+		/**
+		 * Array of assertions to test together a.k.a. soft assertions.
+		 */
+		ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts);
 	}
 
 
@@ -1006,4 +1011,5 @@ default XpathAssertions xpath(String expression, Object... args) {
 		EntityExchangeResult<byte[]> returnResult();
 	}
 
+	interface ResponseSpecMatcher extends Consumer<ResponseSpec> {}
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
new file mode 100644
index 000000000000..17d5cc1a3d34
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.test.web.reactive.server.samples;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+/**
+ * Samples of tests using {@link WebTestClient} with soft assertions.
+ *
+ * @author Michał Rowicki
+ * @since 5.3
+ */
+public class SoftAssertionTests {
+
+	private WebTestClient client;
+
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		this.client = WebTestClient.bindToController(new TestController()).build();
+	}
+
+
+	@Test
+	public void test() throws Exception {
+		this.client.get().uri("/test")
+				.exchange()
+				.expectAllSoftly(
+						exchange -> exchange.expectStatus().isOk(),
+						exchange -> exchange.expectBody(String.class).isEqualTo("It works!")
+				);
+	}
+
+	@Test
+	public void testAllFails() throws Exception {
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
+				this.client.get().uri("/test")
+						.exchange()
+						.expectAllSoftly(
+								exchange -> exchange.expectStatus().isBadRequest(),
+								exchange -> exchange.expectBody(String.class).isEqualTo("It won't work :(")
+						)
+		).withMessage("[0] Status expected:<400 BAD_REQUEST> but was:<200 OK>\n[1] Response body expected:<It won't work :(> but was:<It works!>");
+	}
+
+
+	@RestController
+	static class TestController {
+
+		@GetMapping("/test")
+		public String handle() {
+			return "It works!";
+		}
+	}
+}

From 3c2dfebf4ec5e9d791c1f3c9fa0ad35a5a9fcd6b Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 23 Aug 2021 18:59:41 +0200
Subject: [PATCH 061/140] Polish soft assertion support for WebTestClient

See gh-26969
---
 .../reactive/server/DefaultWebTestClient.java | 34 ++++++++-----
 .../web/reactive/server/WebTestClient.java    | 40 +++++++++++++--
 .../server/samples/SoftAssertionTests.java    | 51 +++++++++----------
 .../testing/testing-webtestclient.adoc        | 33 +++++++++---
 4 files changed, 106 insertions(+), 52 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
index 06dab2ea38a6..8628ef262261 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java
@@ -21,7 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -45,6 +44,7 @@
 import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.lang.Nullable;
 import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.util.ExceptionCollector;
 import org.springframework.test.util.JsonExpectationsHelper;
 import org.springframework.test.util.XmlExpectationsHelper;
 import org.springframework.util.Assert;
@@ -64,6 +64,8 @@
  * Default implementation of {@link WebTestClient}.
  *
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 5.0
  */
 class DefaultWebTestClient implements WebTestClient {
@@ -510,19 +512,25 @@ public <T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elem
 		}
 
 		@Override
-		public ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts) {
-			List<String> failedMessages = new ArrayList<>();
-			for (int i = 0; i < asserts.length; i++) {
-				ResponseSpecMatcher anAssert = asserts[i];
-				try {
-					anAssert.accept(this);
-				}
-				catch (AssertionError assertionException) {
-					failedMessages.add("[" + i + "] " + assertionException.getMessage());
-				}
+		public ResponseSpec expectAll(ResponseSpecConsumer... consumers) {
+			ExceptionCollector exceptionCollector = new ExceptionCollector();
+			for (ResponseSpecConsumer consumer : consumers) {
+				exceptionCollector.execute(() -> consumer.accept(this));
+			}
+			try {
+				exceptionCollector.assertEmpty();
+			}
+			catch (RuntimeException ex) {
+				throw ex;
 			}
-			if (!failedMessages.isEmpty()) {
-				throw new AssertionError(String.join("\n", failedMessages));
+			catch (Exception ex) {
+				// In theory, a ResponseSpecConsumer should never throw an Exception
+				// that is not a RuntimeException, but since ExceptionCollector may
+				// throw a checked Exception, we handle this to appease the compiler
+				// and in case someone uses a "sneaky throws" technique.
+				AssertionError assertionError = new AssertionError(ex.getMessage());
+				assertionError.initCause(ex);
+				throw assertionError;
 			}
 			return this;
 		}
diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
index 8f0159aa70ad..84adf85013c5 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
@@ -86,6 +86,8 @@
  *
  * @author Rossen Stoyanchev
  * @author Brian Clozel
+ * @author Sam Brannen
+ * @author Michał Rowicki
  * @since 5.0
  * @see StatusAssertions
  * @see HeaderAssertions
@@ -781,6 +783,34 @@ interface RequestBodyUriSpec extends RequestBodySpec, RequestHeadersUriSpec<Requ
 	 */
 	interface ResponseSpec {
 
+		/**
+		 * Apply multiple assertions to a response with the given
+		 * {@linkplain ResponseSpecConsumer consumers}, with the guarantee that
+		 * all assertions will be applied even if one or more assertions fails
+		 * with an exception.
+		 * <p>If a single {@link Error} or {@link RuntimeException} is thrown,
+		 * it will be rethrown.
+		 * <p>If multiple exceptions are thrown, this method will throw an
+		 * {@link AssertionError} whose error message is a summary of all of the
+		 * exceptions. In addition, each exception will be added as a
+		 * {@linkplain Throwable#addSuppressed(Throwable) suppressed exception} to
+		 * the {@code AssertionError}.
+		 * <p>This feature is similar to the {@code SoftAssertions} support in
+		 * AssertJ and the {@code assertAll()} support in JUnit Jupiter.
+		 *
+		 * <h4>Example</h4>
+		 * <pre class="code">
+		 * webTestClient.get().uri("/hello").exchange()
+		 *     .expectAll(
+		 *         responseSpec -> responseSpec.expectStatus().isOk(),
+		 *         responseSpec -> responseSpec.expectBody(String.class).isEqualTo("Hello, World!")
+		 *     );
+		 * </pre>
+		 * @param consumers the list of {@code ResponseSpec} consumers
+		 * @since 5.3.10
+		 */
+		ResponseSpec expectAll(ResponseSpecConsumer... consumers);
+
 		/**
 		 * Assertions on the response status.
 		 */
@@ -847,9 +877,14 @@ interface ResponseSpec {
 		<T> FluxExchangeResult<T> returnResult(ParameterizedTypeReference<T> elementTypeRef);
 
 		/**
-		 * Array of assertions to test together a.k.a. soft assertions.
+		 * {@link Consumer} of a {@link ResponseSpec}.
+		 * @since 5.3.10
+		 * @see ResponseSpec#expectAll(ResponseSpecConsumer...)
 		 */
-		ResponseSpec expectAllSoftly(ResponseSpecMatcher... asserts);
+		@FunctionalInterface
+		interface ResponseSpecConsumer extends Consumer<ResponseSpec> {
+		}
+
 	}
 
 
@@ -1011,5 +1046,4 @@ default XpathAssertions xpath(String expression, Object... args) {
 		EntityExchangeResult<byte[]> returnResult();
 	}
 
-	interface ResponseSpecMatcher extends Consumer<ResponseSpec> {}
 }
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
index 17d5cc1a3d34..a4d4bb8c72fe 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.test.web.reactive.server.samples;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -25,42 +25,36 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
- * Samples of tests using {@link WebTestClient} with soft assertions.
+ * Integration tests for {@link WebTestClient} with soft assertions.
  *
  * @author Michał Rowicki
- * @since 5.3
+ * @author Sam Brannen
+ * @since 5.3.10
  */
-public class SoftAssertionTests {
-
-	private WebTestClient client;
+class SoftAssertionTests {
 
-
-	@BeforeEach
-	public void setUp() throws Exception {
-		this.client = WebTestClient.bindToController(new TestController()).build();
-	}
+	private final WebTestClient webTestClient = WebTestClient.bindToController(new TestController()).build();
 
 
 	@Test
-	public void test() throws Exception {
-		this.client.get().uri("/test")
-				.exchange()
-				.expectAllSoftly(
-						exchange -> exchange.expectStatus().isOk(),
-						exchange -> exchange.expectBody(String.class).isEqualTo("It works!")
-				);
+	void expectAll() {
+		this.webTestClient.get().uri("/test").exchange()
+			.expectAll(
+				responseSpec -> responseSpec.expectStatus().isOk(),
+				responseSpec -> responseSpec.expectBody(String.class).isEqualTo("hello")
+			);
 	}
 
 	@Test
-	public void testAllFails() throws Exception {
+	void expectAllWithMultipleFailures() throws Exception {
 		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-				this.client.get().uri("/test")
-						.exchange()
-						.expectAllSoftly(
-								exchange -> exchange.expectStatus().isBadRequest(),
-								exchange -> exchange.expectBody(String.class).isEqualTo("It won't work :(")
-						)
-		).withMessage("[0] Status expected:<400 BAD_REQUEST> but was:<200 OK>\n[1] Response body expected:<It won't work :(> but was:<It works!>");
+			this.webTestClient.get().uri("/test").exchange()
+				.expectAll(
+					responseSpec -> responseSpec.expectStatus().isBadRequest(),
+					responseSpec -> responseSpec.expectStatus().isOk(),
+					responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+				)
+		).withMessage("Multiple Exceptions (2):\nStatus expected:<400 BAD_REQUEST> but was:<200 OK>\nResponse body expected:<bogus> but was:<hello>");
 	}
 
 
@@ -68,8 +62,9 @@ public void testAllFails() throws Exception {
 	static class TestController {
 
 		@GetMapping("/test")
-		public String handle() {
-			return "It works!";
+		String handle() {
+			return "hello";
 		}
 	}
+
 }
diff --git a/src/docs/asciidoc/testing/testing-webtestclient.adoc b/src/docs/asciidoc/testing/testing-webtestclient.adoc
index 6c5dfb80da51..4335760e1048 100644
--- a/src/docs/asciidoc/testing/testing-webtestclient.adoc
+++ b/src/docs/asciidoc/testing/testing-webtestclient.adoc
@@ -262,19 +262,36 @@ To assert the response status and headers, use the following:
 .Java
 ----
 	client.get().uri("/persons/1")
-				.accept(MediaType.APPLICATION_JSON)
-				.exchange()
-				.expectStatus().isOk()
-				.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectStatus().isOk()
+		.expectHeader().contentType(MediaType.APPLICATION_JSON);
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	client.get().uri("/persons/1")
-			.accept(MediaType.APPLICATION_JSON)
-			.exchange()
-			.expectStatus().isOk()
-			.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectStatus().isOk()
+		.expectHeader().contentType(MediaType.APPLICATION_JSON)
+----
+
+If you would like for all expectations to be asserted even if one of them fails, you can
+use `expectAll(..)` instead of multiple chained `expect*(..)` calls. This feature is
+similar to the _soft assertions_ support in AssertJ and the `assertAll()` support in
+JUnit Jupiter.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	client.get().uri("/persons/1")
+		.accept(MediaType.APPLICATION_JSON)
+		.exchange()
+		.expectAll(
+			spec -> spec.expectStatus().isOk(),
+			spec -> spec.expectHeader().contentType(MediaType.APPLICATION_JSON)
+		);
 ----
 
 You can then choose to decode the response body through one of the following:

From e99b43b91e2a02b1cf18261ee85dccae5e6494e7 Mon Sep 17 00:00:00 2001
From: Axzial <axzial@protonmail.com>
Date: Sat, 21 Aug 2021 18:00:26 +0200
Subject: [PATCH 062/140] Support TimeUnit in the @Scheduled annotation

This commit introduces a new `timeUnit` attribute in the @Scheduled
annotation to allow the user to specify a time unit other than
milliseconds.

Closes gh-27309
---
 .../scheduling/annotation/Scheduled.java      |  36 ++-
 .../ScheduledAnnotationBeanPostProcessor.java |  15 +-
 ...duledAnnotationBeanPostProcessorTests.java | 216 +++++++++++++++++-
 3 files changed, 249 insertions(+), 18 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index 415c72381792..de7866073931 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -22,6 +22,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
@@ -46,6 +47,7 @@
  * @author Juergen Hoeller
  * @author Dave Syer
  * @author Chris Beams
+ * @author Victor Brown
  * @since 3.0
  * @see EnableScheduling
  * @see ScheduledAnnotationBeanPostProcessor
@@ -101,52 +103,64 @@
 	String zone() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between the
+	 * Execute the annotated method with a fixed period between the
 	 * end of the last invocation and the start of the next.
-	 * @return the delay in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the delay
 	 */
 	long fixedDelay() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between the
+	 * Execute the annotated method with a fixed period between the
 	 * end of the last invocation and the start of the next.
-	 * @return the delay in milliseconds as a String value, e.g. a placeholder
+	 * Using milliseconds by default with fixedDelayTimeUnit().
+	 * @return the delay as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedDelayString() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between
+	 * Execute the annotated method with a fixed period between
 	 * invocations.
-	 * @return the period in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the period
 	 */
 	long fixedRate() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period in milliseconds between
+	 * Execute the annotated method with a fixed period between
 	 * invocations.
-	 * @return the period in milliseconds as a String value, e.g. a placeholder
+	 * Using milliseconds by default with fixedRateTimeUnit().
+	 * @return the period as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedRateString() default "";
 
 	/**
-	 * Number of milliseconds to delay before the first execution of a
+	 * Number to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * @return the initial delay in milliseconds
+	 * Using milliseconds by default with timeUnit().
+	 * @return the initial
 	 * @since 3.2
 	 */
 	long initialDelay() default -1;
 
 	/**
-	 * Number of milliseconds to delay before the first execution of a
+	 * Number to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
+	 * Using milliseconds by default with initialDelayTimeUnit().
 	 * @return the initial delay in milliseconds as a String value, e.g. a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String initialDelayString() default "";
 
+	/**
+	 * Specify the {@link TimeUnit} to use for initialDelay, fixedRate and fixedDelay values.
+	 * @return the {@link TimeUnit}, by default milliseconds will be used.
+	 */
+	TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
+
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 14b73d6d7f7c..52fae5dbab98 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -30,6 +30,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -94,6 +95,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  * @author Elizabeth Chatman
+ * @author Victor Brown
  * @since 3.0
  * @see Scheduled
  * @see EnableScheduling
@@ -398,7 +400,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			Set<ScheduledTask> tasks = new LinkedHashSet<>(4);
 
 			// Determine initial delay
-			long initialDelay = scheduled.initialDelay();
+			long initialDelay = TimeUnit.MILLISECONDS.convert(scheduled.initialDelay(), scheduled.timeUnit());
 			String initialDelayString = scheduled.initialDelayString();
 			if (StringUtils.hasText(initialDelayString)) {
 				Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
@@ -407,7 +409,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 				}
 				if (StringUtils.hasLength(initialDelayString)) {
 					try {
-						initialDelay = parseDelayAsLong(initialDelayString);
+						initialDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(initialDelayString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -446,12 +448,13 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed delay
-			long fixedDelay = scheduled.fixedDelay();
+			long fixedDelay = TimeUnit.MILLISECONDS.convert(scheduled.fixedDelay(), scheduled.timeUnit());
 			if (fixedDelay >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
 				tasks.add(this.registrar.scheduleFixedDelayTask(new FixedDelayTask(runnable, fixedDelay, initialDelay)));
 			}
+
 			String fixedDelayString = scheduled.fixedDelayString();
 			if (StringUtils.hasText(fixedDelayString)) {
 				if (this.embeddedValueResolver != null) {
@@ -461,7 +464,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedDelay = parseDelayAsLong(fixedDelayString);
+						fixedDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedDelayString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -472,7 +475,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed rate
-			long fixedRate = scheduled.fixedRate();
+			long fixedRate = TimeUnit.MILLISECONDS.convert(scheduled.fixedRate(), scheduled.timeUnit());
 			if (fixedRate >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -487,7 +490,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedRate = parseDelayAsLong(fixedRateString);
+						fixedRate = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedRateString), scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 842910070227..494bf075c6df 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -67,6 +68,7 @@
  * @author Chris Beams
  * @author Sam Brannen
  * @author Stevo Slavić
+ * @author Victor Brown
  */
 public class ScheduledAnnotationBeanPostProcessorTests {
 
@@ -107,6 +109,62 @@ public void fixedDelayTask() {
 		assertThat(task.getInterval()).isEqualTo(5000L);
 	}
 
+	@Test
+	public void fixedDelayWithSecondsTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithSecondsTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
+		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedDelayTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(5000L);
+	}
+
+	@Test
+	public void fixedDelayWithMinutesTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithMinutesTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
+		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedDelayTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void fixedRateTask() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -135,6 +193,62 @@ public void fixedRateTask() {
 		assertThat(task.getInterval()).isEqualTo(3000L);
 	}
 
+	@Test
+	public void fixedRateWithSecondsTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(5000L);
+	}
+
+	@Test
+	public void fixedRateWithMinutesTimeUnitTask() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(0L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void fixedRateTaskWithInitialDelay() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -163,6 +277,62 @@ public void fixedRateTaskWithInitialDelay() {
 		assertThat(task.getInterval()).isEqualTo(3000L);
 	}
 
+	@Test
+	public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitInitialDelayTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(5000L);
+		assertThat(task.getInterval()).isEqualTo(3000L);
+	}
+
+	@Test
+	public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
+		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitInitialDelayTestBean.class);
+		context.registerBeanDefinition("postProcessor", processorDefinition);
+		context.registerBeanDefinition("target", targetDefinition);
+		context.refresh();
+
+		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
+		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
+
+		Object target = context.getBean("target");
+		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
+				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
+		@SuppressWarnings("unchecked")
+		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
+				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
+		assertThat(fixedRateTasks.size()).isEqualTo(1);
+		IntervalTask task = fixedRateTasks.get(0);
+		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
+		Object targetObject = runnable.getTarget();
+		Method targetMethod = runnable.getMethod();
+		assertThat(targetObject).isEqualTo(target);
+		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
+		assertThat(task.getInitialDelay()).isEqualTo(60000L);
+		assertThat(task.getInterval()).isEqualTo(180000L);
+	}
+
 	@Test
 	public void severalFixedRatesWithRepeatedScheduledAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
@@ -702,6 +872,22 @@ public void fixedDelay() {
 		}
 	}
 
+	static class FixedDelayWithSecondsTimeUnitTestBean {
+
+		@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedDelay() {
+		}
+
+	}
+
+	static class FixedDelayWithMinutesTimeUnitTestBean {
+
+		@Scheduled(fixedDelay = 3, timeUnit = TimeUnit.MINUTES)
+		public void fixedDelay() {
+		}
+
+	}
+
 
 	static class FixedRateTestBean {
 
@@ -709,6 +895,20 @@ static class FixedRateTestBean {
 		public void fixedRate() {
 		}
 	}
+	static class FixedRateWithSecondsTimeUnitTestBean {
+
+		@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedRate() {
+		}
+	}
+
+
+	static class FixedRateWithMinutesTimeUnitTestBean {
+
+		@Scheduled(fixedRate = 3, timeUnit = TimeUnit.MINUTES)
+		public void fixedRate() {
+		}
+	}
 
 
 	static class FixedRateWithInitialDelayTestBean {
@@ -718,6 +918,20 @@ public void fixedRate() {
 		}
 	}
 
+	static class FixedRateWithSecondsTimeUnitInitialDelayTestBean {
+
+		@Scheduled(fixedRate = 3, initialDelay = 5, timeUnit = TimeUnit.SECONDS)
+		public void fixedRate() {
+		}
+	}
+
+	static class FixedRateWithMinutesTimeUnitInitialDelayTestBean {
+
+		@Scheduled(fixedRate = 3, initialDelay = 1, timeUnit = TimeUnit.MINUTES)
+		public void fixedRate() {
+		}
+	}
+
 
 	static class SeveralFixedRatesWithSchedulesContainerAnnotationTestBean {
 

From bd72e4498b9d1824646c88fa6fa08c1780484d2f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 25 Aug 2021 20:46:51 +0200
Subject: [PATCH 063/140] Revise and document TimeUnit support in @Scheduled

This commit also fixes a bug introduced in commit e99b43b91e, where
java.time.Duration strings were converted to milliseconds and then
converted again using the configured TimeUnit.

See gh-27309
---
 .../scheduling/annotation/Scheduled.java      |  54 ++-
 .../ScheduledAnnotationBeanPostProcessor.java |  29 +-
 ...duledAnnotationBeanPostProcessorTests.java | 454 +++++++-----------
 src/docs/asciidoc/integration.adoc            |  41 +-
 4 files changed, 253 insertions(+), 325 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index de7866073931..ce55aeb82cbd 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -48,6 +48,7 @@
  * @author Dave Syer
  * @author Chris Beams
  * @author Victor Brown
+ * @author Sam Brannen
  * @since 3.0
  * @see EnableScheduling
  * @see ScheduledAnnotationBeanPostProcessor
@@ -103,63 +104,74 @@
 	String zone() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period between the
-	 * end of the last invocation and the start of the next.
-	 * Using milliseconds by default with timeUnit().
+	 * Execute the annotated method with a fixed period between the end of the
+	 * last invocation and the start of the next.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the delay
 	 */
 	long fixedDelay() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period between the
-	 * end of the last invocation and the start of the next.
-	 * Using milliseconds by default with fixedDelayTimeUnit().
-	 * @return the delay as a String value, e.g. a placeholder
+	 * Execute the annotated method with a fixed period between the end of the
+	 * last invocation and the start of the next.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the delay as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedDelayString() default "";
 
 	/**
-	 * Execute the annotated method with a fixed period between
-	 * invocations.
-	 * Using milliseconds by default with timeUnit().
+	 * Execute the annotated method with a fixed period between invocations.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the period
 	 */
 	long fixedRate() default -1;
 
 	/**
-	 * Execute the annotated method with a fixed period between
-	 * invocations.
-	 * Using milliseconds by default with fixedRateTimeUnit().
-	 * @return the period as a String value, e.g. a placeholder
+	 * Execute the annotated method with a fixed period between invocations.
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the period as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String fixedRateString() default "";
 
 	/**
-	 * Number to delay before the first execution of a
+	 * Number of units of time to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * Using milliseconds by default with timeUnit().
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
 	 * @return the initial
 	 * @since 3.2
 	 */
 	long initialDelay() default -1;
 
 	/**
-	 * Number to delay before the first execution of a
+	 * Number of units of time to delay before the first execution of a
 	 * {@link #fixedRate} or {@link #fixedDelay} task.
-	 * Using milliseconds by default with initialDelayTimeUnit().
-	 * @return the initial delay in milliseconds as a String value, e.g. a placeholder
+	 * <p>The time unit is milliseconds by default but can be overridden via
+	 * {@link #timeUnit}.
+	 * @return the initial delay as a String value &mdash; for example, a placeholder
 	 * or a {@link java.time.Duration#parse java.time.Duration} compliant value
 	 * @since 3.2.2
 	 */
 	String initialDelayString() default "";
 
 	/**
-	 * Specify the {@link TimeUnit} to use for initialDelay, fixedRate and fixedDelay values.
-	 * @return the {@link TimeUnit}, by default milliseconds will be used.
+	 * The {@link TimeUnit} to use for {@link #fixedDelay}, {@link #fixedDelayString},
+	 * {@link #fixedRate}, {@link #fixedRateString}, {@link #initialDelay}, and
+	 * {@link #initialDelayString}.
+	 * <p>Defaults to {@link TimeUnit#MICROSECONDS}.
+	 * <p>This attribute is ignored for {@linkplain #cron() cron expressions}
+	 * and for {@link java.time.Duration} values supplied via {@link #fixedDelayString},
+	 * {@link #fixedRateString}, or {@link #initialDelayString}.
+	 * @return the {@code TimeUnit} to use
+	 * @since 5.3.10
 	 */
 	TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 52fae5dbab98..5e47ccda548f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -96,6 +96,7 @@
  * @author Chris Beams
  * @author Elizabeth Chatman
  * @author Victor Brown
+ * @author Sam Brannen
  * @since 3.0
  * @see Scheduled
  * @see EnableScheduling
@@ -385,7 +386,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 
 	/**
 	 * Process the given {@code @Scheduled} method declaration on the given bean.
-	 * @param scheduled the @Scheduled annotation
+	 * @param scheduled the {@code @Scheduled} annotation
 	 * @param method the method that the annotation has been declared on
 	 * @param bean the target bean instance
 	 * @see #createRunnable(Object, Method)
@@ -400,7 +401,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			Set<ScheduledTask> tasks = new LinkedHashSet<>(4);
 
 			// Determine initial delay
-			long initialDelay = TimeUnit.MILLISECONDS.convert(scheduled.initialDelay(), scheduled.timeUnit());
+			long initialDelay = convertToMillis(scheduled.initialDelay(), scheduled.timeUnit());
 			String initialDelayString = scheduled.initialDelayString();
 			if (StringUtils.hasText(initialDelayString)) {
 				Assert.isTrue(initialDelay < 0, "Specify 'initialDelay' or 'initialDelayString', not both");
@@ -409,7 +410,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 				}
 				if (StringUtils.hasLength(initialDelayString)) {
 					try {
-						initialDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(initialDelayString), scheduled.timeUnit());
+						initialDelay = convertToMillis(initialDelayString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -448,7 +449,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed delay
-			long fixedDelay = TimeUnit.MILLISECONDS.convert(scheduled.fixedDelay(), scheduled.timeUnit());
+			long fixedDelay = convertToMillis(scheduled.fixedDelay(), scheduled.timeUnit());
 			if (fixedDelay >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -464,7 +465,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedDelay = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedDelayString), scheduled.timeUnit());
+						fixedDelay = convertToMillis(fixedDelayString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -475,7 +476,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 			}
 
 			// Check fixed rate
-			long fixedRate = TimeUnit.MILLISECONDS.convert(scheduled.fixedRate(), scheduled.timeUnit());
+			long fixedRate = convertToMillis(scheduled.fixedRate(), scheduled.timeUnit());
 			if (fixedRate >= 0) {
 				Assert.isTrue(!processedSchedule, errorMessage);
 				processedSchedule = true;
@@ -490,7 +491,7 @@ protected void processScheduled(Scheduled scheduled, Method method, Object bean)
 					Assert.isTrue(!processedSchedule, errorMessage);
 					processedSchedule = true;
 					try {
-						fixedRate = TimeUnit.MILLISECONDS.convert(parseDelayAsLong(fixedRateString), scheduled.timeUnit());
+						fixedRate = convertToMillis(fixedRateString, scheduled.timeUnit());
 					}
 					catch (RuntimeException ex) {
 						throw new IllegalArgumentException(
@@ -530,11 +531,19 @@ protected Runnable createRunnable(Object target, Method method) {
 		return new ScheduledMethodRunnable(target, invocableMethod);
 	}
 
-	private static long parseDelayAsLong(String value) throws RuntimeException {
-		if (value.length() > 1 && (isP(value.charAt(0)) || isP(value.charAt(1)))) {
+	private static long convertToMillis(long value, TimeUnit timeUnit) {
+		return TimeUnit.MILLISECONDS.convert(value, timeUnit);
+	}
+
+	private static long convertToMillis(String value, TimeUnit timeUnit) {
+		if (isDurationString(value)) {
 			return Duration.parse(value).toMillis();
 		}
-		return Long.parseLong(value);
+		return convertToMillis(Long.parseLong(value), timeUnit);
+	}
+
+	private static boolean isDurationString(String value) {
+		return (value.length() > 1 && (isP(value.charAt(0)) || isP(value.charAt(1))));
 	}
 
 	private static boolean isP(char ch) {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 494bf075c6df..04a08b00e64c 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -33,6 +33,12 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.converter.ArgumentConversionException;
+import org.junit.jupiter.params.converter.ArgumentConverter;
+import org.junit.jupiter.params.converter.ConvertWith;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.scope.ScopedProxyUtils;
@@ -61,8 +67,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 /**
+ * Tests for {@link ScheduledAnnotationBeanPostProcessor}.
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -70,77 +79,25 @@
  * @author Stevo Slavić
  * @author Victor Brown
  */
-public class ScheduledAnnotationBeanPostProcessorTests {
+class ScheduledAnnotationBeanPostProcessorTests {
 
 	private final StaticApplicationContext context = new StaticApplicationContext();
 
 
 	@AfterEach
-	public void closeContextAfterTest() {
+	void closeContextAfterTest() {
 		context.close();
 	}
 
-
-	@Test
-	public void fixedDelayTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedDelayTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedDelayWithSecondsTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithSecondsTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedDelayTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedDelayWithMinutesTimeUnitTask() {
+	@ParameterizedTest
+	@CsvSource({
+		"FixedDelay, 5000",
+		"FixedDelayInSeconds, 5000",
+		"FixedDelayInMinutes, 180000"
+	})
+	void fixedDelayTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedDelayWithMinutesTimeUnitTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -154,7 +111,7 @@ public void fixedDelayWithMinutesTimeUnitTask() {
 		@SuppressWarnings("unchecked")
 		List<IntervalTask> fixedDelayTasks = (List<IntervalTask>)
 				new DirectFieldAccessor(registrar).getPropertyValue("fixedDelayTasks");
-		assertThat(fixedDelayTasks.size()).isEqualTo(1);
+		assertThat(fixedDelayTasks).hasSize(1);
 		IntervalTask task = fixedDelayTasks.get(0);
 		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
 		Object targetObject = runnable.getTarget();
@@ -162,125 +119,18 @@ public void fixedDelayWithMinutesTimeUnitTask() {
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
 		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
-	}
-
-	@Test
-	public void fixedRateTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
-	}
-
-	@Test
-	public void fixedRateWithSecondsTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void fixedRateWithMinutesTimeUnitTask() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(0L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
-	}
-
-	@Test
-	public void fixedRateTaskWithInitialDelay() {
-		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithInitialDelayTestBean.class);
-		context.registerBeanDefinition("postProcessor", processorDefinition);
-		context.registerBeanDefinition("target", targetDefinition);
-		context.refresh();
-
-		ScheduledTaskHolder postProcessor = context.getBean("postProcessor", ScheduledTaskHolder.class);
-		assertThat(postProcessor.getScheduledTasks().size()).isEqualTo(1);
-
-		Object target = context.getBean("target");
-		ScheduledTaskRegistrar registrar = (ScheduledTaskRegistrar)
-				new DirectFieldAccessor(postProcessor).getPropertyValue("registrar");
-		@SuppressWarnings("unchecked")
-		List<IntervalTask> fixedRateTasks = (List<IntervalTask>)
-				new DirectFieldAccessor(registrar).getPropertyValue("fixedRateTasks");
-		assertThat(fixedRateTasks.size()).isEqualTo(1);
-		IntervalTask task = fixedRateTasks.get(0);
-		ScheduledMethodRunnable runnable = (ScheduledMethodRunnable) task.getRunnable();
-		Object targetObject = runnable.getTarget();
-		Method targetMethod = runnable.getMethod();
-		assertThat(targetObject).isEqualTo(target);
-		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
+		assertThat(task.getInterval()).isEqualTo(expectedInterval);
 	}
 
-	@Test
-	public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
+	@ParameterizedTest
+	@CsvSource({
+		"FixedRate, 3000",
+		"FixedRateInSeconds, 5000",
+		"FixedRateInMinutes, 180000"
+	})
+	void fixedRateTask(@NameToClass Class<?> beanClass, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithSecondsTimeUnitInitialDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -301,14 +151,21 @@ public void fixedRateTaskWithSecondsTimeUnitWithInitialDelay() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(5000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
-	}
-
-	@Test
-	public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(0);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
+	}
+
+	@ParameterizedTest
+	@CsvSource({
+		"FixedRateWithInitialDelay, 1000, 3000",
+		"FixedRateWithInitialDelayInSeconds, 5000, 3000",
+		"FixedRateWithInitialDelayInMinutes, 60000, 180000"
+	})
+	void fixedRateTaskWithInitialDelay(@NameToClass Class<?> beanClass, long expectedInitialDelay, long expectedInterval) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
-		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRateWithMinutesTimeUnitInitialDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
 		context.refresh();
@@ -329,40 +186,42 @@ public void fixedRateTaskWithMinutesTimeUnitWithInitialDelay() {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(60000L);
-		assertThat(task.getInterval()).isEqualTo(180000L);
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
 	}
 
 	@Test
-	public void severalFixedRatesWithRepeatedScheduledAnnotation() {
+	void severalFixedRatesWithRepeatedScheduledAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesWithSchedulesContainerAnnotation() {
+	void severalFixedRatesWithSchedulesContainerAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithSchedulesContainerAnnotationTestBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesOnBaseClass() {
+	void severalFixedRatesOnBaseClass() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRatesSubBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesOnDefaultMethod() {
+	void severalFixedRatesOnDefaultMethod() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(FixedRatesDefaultBean.class);
 		severalFixedRates(context, processorDefinition, targetDefinition);
 	}
 
 	@Test
-	public void severalFixedRatesAgainstNestedCglibProxy() {
+	void severalFixedRatesAgainstNestedCglibProxy() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean.class);
 		targetDefinition.setFactoryMethodName("nestedProxy");
@@ -405,7 +264,7 @@ private void severalFixedRates(StaticApplicationContext context,
 	}
 
 	@Test
-	public void cronTask() {
+	void cronTask() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -432,7 +291,7 @@ public void cronTask() {
 	}
 
 	@Test
-	public void cronTaskWithZone() {
+	void cronTaskWithZone() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronWithTimezoneTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -478,7 +337,7 @@ public void cronTaskWithZone() {
 	}
 
 	@Test
-	public void cronTaskWithInvalidZone() {
+	void cronTaskWithInvalidZone() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronWithInvalidTimezoneTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -488,7 +347,7 @@ public void cronTaskWithInvalidZone() {
 	}
 
 	@Test
-	public void cronTaskWithMethodValidation() {
+	void cronTaskWithMethodValidation() {
 		BeanDefinition validationDefinition = new RootBeanDefinition(MethodValidationPostProcessor.class);
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(CronTestBean.class);
@@ -500,7 +359,7 @@ public void cronTaskWithMethodValidation() {
 	}
 
 	@Test
-	public void cronTaskWithScopedProxy() {
+	void cronTaskWithScopedProxy() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		new AnnotatedBeanDefinitionReader(context).register(ProxiedCronTestBean.class, ProxiedCronTestBeanDependent.class);
@@ -525,7 +384,7 @@ public void cronTaskWithScopedProxy() {
 	}
 
 	@Test
-	public void metaAnnotationWithFixedRate() {
+	void metaAnnotationWithFixedRate() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(MetaAnnotationFixedRateTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -552,7 +411,7 @@ public void metaAnnotationWithFixedRate() {
 	}
 
 	@Test
-	public void composedAnnotationWithInitialDelayAndFixedRate() {
+	void composedAnnotationWithInitialDelayAndFixedRate() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(ComposedAnnotationFixedRateTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -580,7 +439,7 @@ public void composedAnnotationWithInitialDelayAndFixedRate() {
 	}
 
 	@Test
-	public void metaAnnotationWithCronExpression() {
+	void metaAnnotationWithCronExpression() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(MetaAnnotationCronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -607,7 +466,7 @@ public void metaAnnotationWithCronExpression() {
 	}
 
 	@Test
-	public void propertyPlaceholderWithCron() {
+	void propertyPlaceholderWithCron() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -640,7 +499,7 @@ public void propertyPlaceholderWithCron() {
 	}
 
 	@Test
-	public void propertyPlaceholderWithInactiveCron() {
+	void propertyPlaceholderWithInactiveCron() {
 		String businessHoursCronExpression = "-";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -657,24 +516,23 @@ public void propertyPlaceholderWithInactiveCron() {
 		assertThat(postProcessor.getScheduledTasks().isEmpty()).isTrue();
 	}
 
-	@Test
-	public void propertyPlaceholderWithFixedDelayInMillis() {
-		propertyPlaceholderWithFixedDelay(false);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedDelayInDuration() {
-		propertyPlaceholderWithFixedDelay(true);
-	}
+	@ParameterizedTest
+	@CsvSource({
+		"PropertyPlaceholderWithFixedDelay, 5000, 1000, 5000, 1000",
+		"PropertyPlaceholderWithFixedDelay, PT5S, PT1S, 5000, 1000",
+		"PropertyPlaceholderWithFixedDelayInSeconds, 5000, 1000, 5000000, 1000000",
+		"PropertyPlaceholderWithFixedDelayInSeconds, PT5S, PT1S, 5000, 1000"
+	})
+	void propertyPlaceholderWithFixedDelay(@NameToClass Class<?> beanClass, String fixedDelay, String initialDelay,
+			long expectedInterval, long expectedInitialDelay) {
 
-	private void propertyPlaceholderWithFixedDelay(boolean durationFormat) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
 		Properties properties = new Properties();
-		properties.setProperty("fixedDelay", (durationFormat ? "PT5S" : "5000"));
-		properties.setProperty("initialDelay", (durationFormat ? "PT1S" : "1000"));
+		properties.setProperty("fixedDelay", fixedDelay);
+		properties.setProperty("initialDelay", initialDelay);
 		placeholderDefinition.getPropertyValues().addPropertyValue("properties", properties);
-		BeanDefinition targetDefinition = new RootBeanDefinition(PropertyPlaceholderWithFixedDelayTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("placeholder", placeholderDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
@@ -696,28 +554,29 @@ private void propertyPlaceholderWithFixedDelay(boolean durationFormat) {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedDelay");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(5000L);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedRateInMillis() {
-		propertyPlaceholderWithFixedRate(false);
-	}
-
-	@Test
-	public void propertyPlaceholderWithFixedRateInDuration() {
-		propertyPlaceholderWithFixedRate(true);
-	}
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
+	}
+
+	@ParameterizedTest
+	@CsvSource({
+		"PropertyPlaceholderWithFixedRate, 3000, 1000, 3000, 1000",
+		"PropertyPlaceholderWithFixedRate, PT3S, PT1S, 3000, 1000",
+		"PropertyPlaceholderWithFixedRateInSeconds, 3000, 1000, 3000000, 1000000",
+		"PropertyPlaceholderWithFixedRateInSeconds, PT3S, PT1S, 3000, 1000"
+	})
+	void propertyPlaceholderWithFixedRate(@NameToClass Class<?> beanClass, String fixedRate, String initialDelay,
+			long expectedInterval, long expectedInitialDelay) {
 
-	private void propertyPlaceholderWithFixedRate(boolean durationFormat) {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
 		Properties properties = new Properties();
-		properties.setProperty("fixedRate", (durationFormat ? "PT3S" : "3000"));
-		properties.setProperty("initialDelay", (durationFormat ? "PT1S" : "1000"));
+		properties.setProperty("fixedRate", fixedRate);
+		properties.setProperty("initialDelay", initialDelay);
 		placeholderDefinition.getPropertyValues().addPropertyValue("properties", properties);
-		BeanDefinition targetDefinition = new RootBeanDefinition(PropertyPlaceholderWithFixedRateTestBean.class);
+		BeanDefinition targetDefinition = new RootBeanDefinition(beanClass);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
 		context.registerBeanDefinition("placeholder", placeholderDefinition);
 		context.registerBeanDefinition("target", targetDefinition);
@@ -739,12 +598,14 @@ private void propertyPlaceholderWithFixedRate(boolean durationFormat) {
 		Method targetMethod = runnable.getMethod();
 		assertThat(targetObject).isEqualTo(target);
 		assertThat(targetMethod.getName()).isEqualTo("fixedRate");
-		assertThat(task.getInitialDelay()).isEqualTo(1000L);
-		assertThat(task.getInterval()).isEqualTo(3000L);
+		assertSoftly(softly -> {
+			softly.assertThat(task.getInitialDelay()).as("initial delay").isEqualTo(expectedInitialDelay);
+			softly.assertThat(task.getInterval()).as("interval").isEqualTo(expectedInterval);
+		});
 	}
 
 	@Test
-	public void expressionWithCron() {
+	void expressionWithCron() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(ExpressionWithCronTestBean.class);
@@ -775,7 +636,7 @@ public void expressionWithCron() {
 	}
 
 	@Test
-	public void propertyPlaceholderForMetaAnnotation() {
+	void propertyPlaceholderForMetaAnnotation() {
 		String businessHoursCronExpression = "0 0 9-17 * * MON-FRI";
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition placeholderDefinition = new RootBeanDefinition(PropertySourcesPlaceholderConfigurer.class);
@@ -808,7 +669,7 @@ public void propertyPlaceholderForMetaAnnotation() {
 	}
 
 	@Test
-	public void nonVoidReturnType() {
+	void nonVoidReturnType() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(NonVoidReturnTypeTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -835,7 +696,7 @@ public void nonVoidReturnType() {
 	}
 
 	@Test
-	public void emptyAnnotation() {
+	void emptyAnnotation() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(EmptyAnnotationTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -845,7 +706,7 @@ public void emptyAnnotation() {
 	}
 
 	@Test
-	public void invalidCron() throws Throwable {
+	void invalidCron() throws Throwable {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(InvalidCronTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -855,7 +716,7 @@ public void invalidCron() throws Throwable {
 	}
 
 	@Test
-	public void nonEmptyParamList() {
+	void nonEmptyParamList() {
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(NonEmptyParamListTestBean.class);
 		context.registerBeanDefinition("postProcessor", processorDefinition);
@@ -865,70 +726,68 @@ public void nonEmptyParamList() {
 	}
 
 
-	static class FixedDelayTestBean {
+	static class FixedDelay {
 
 		@Scheduled(fixedDelay = 5000)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
 	}
 
-	static class FixedDelayWithSecondsTimeUnitTestBean {
+	static class FixedDelayInSeconds {
 
 		@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
-
 	}
 
-	static class FixedDelayWithMinutesTimeUnitTestBean {
+	static class FixedDelayInMinutes {
 
 		@Scheduled(fixedDelay = 3, timeUnit = TimeUnit.MINUTES)
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
-
 	}
 
 
-	static class FixedRateTestBean {
+	static class FixedRate {
 
 		@Scheduled(fixedRate = 3000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
-	static class FixedRateWithSecondsTimeUnitTestBean {
+
+	static class FixedRateInSeconds {
 
 		@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-
-	static class FixedRateWithMinutesTimeUnitTestBean {
+	static class FixedRateInMinutes {
 
 		@Scheduled(fixedRate = 3, timeUnit = TimeUnit.MINUTES)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
 
-	static class FixedRateWithInitialDelayTestBean {
+	static class FixedRateWithInitialDelay {
 
 		@Scheduled(fixedRate = 3000, initialDelay = 1000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-	static class FixedRateWithSecondsTimeUnitInitialDelayTestBean {
+	static class FixedRateWithInitialDelayInSeconds {
 
 		@Scheduled(fixedRate = 3, initialDelay = 5, timeUnit = TimeUnit.SECONDS)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
-	static class FixedRateWithMinutesTimeUnitInitialDelayTestBean {
+	static class FixedRateWithInitialDelayInMinutes {
 
 		@Scheduled(fixedRate = 3, initialDelay = 1, timeUnit = TimeUnit.MINUTES)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -936,7 +795,7 @@ public void fixedRate() {
 	static class SeveralFixedRatesWithSchedulesContainerAnnotationTestBean {
 
 		@Schedules({@Scheduled(fixedRate = 4000), @Scheduled(fixedRate = 4000, initialDelay = 2000)})
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -945,7 +804,7 @@ static class SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean {
 
 		@Scheduled(fixedRate = 4000)
 		@Scheduled(fixedRate = 4000, initialDelay = 2000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 
 		static SeveralFixedRatesWithRepeatedScheduledAnnotationTestBean nestedProxy() {
@@ -962,7 +821,7 @@ static class FixedRatesBaseBean {
 
 		@Scheduled(fixedRate = 4000)
 		@Scheduled(fixedRate = 4000, initialDelay = 2000)
-		public void fixedRate() {
+		void fixedRate() {
 		}
 	}
 
@@ -1006,7 +865,7 @@ protected void cron() throws IOException {
 	static class CronWithInvalidTimezoneTestBean {
 
 		@Scheduled(cron = "0 0 0-4,6-23 * * ?", zone = "FOO")
-		public void cron() throws IOException {
+		void cron() throws IOException {
 			throw new IOException("no no no");
 		}
 	}
@@ -1017,7 +876,7 @@ public void cron() throws IOException {
 	static class ProxiedCronTestBean {
 
 		@Scheduled(cron = "*/7 * * * * ?")
-		public void cron() throws IOException {
+		void cron() throws IOException {
 			throw new IOException("no no no");
 		}
 	}
@@ -1025,7 +884,7 @@ public void cron() throws IOException {
 
 	static class ProxiedCronTestBeanDependent {
 
-		public ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
+		ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
 		}
 	}
 
@@ -1033,7 +892,7 @@ public ProxiedCronTestBeanDependent(ProxiedCronTestBean testBean) {
 	static class NonVoidReturnTypeTestBean {
 
 		@Scheduled(cron = "0 0 9-17 * * MON-FRI")
-		public String cron() {
+		String cron() {
 			return "oops";
 		}
 	}
@@ -1042,7 +901,7 @@ public String cron() {
 	static class EmptyAnnotationTestBean {
 
 		@Scheduled
-		public void invalid() {
+		void invalid() {
 		}
 	}
 
@@ -1050,7 +909,7 @@ public void invalid() {
 	static class InvalidCronTestBean {
 
 		@Scheduled(cron = "abc")
-		public void invalid() {
+		void invalid() {
 		}
 	}
 
@@ -1058,7 +917,7 @@ public void invalid() {
 	static class NonEmptyParamListTestBean {
 
 		@Scheduled(fixedRate = 3000)
-		public void invalid(String oops) {
+		void invalid(String oops) {
 		}
 	}
 
@@ -1090,7 +949,7 @@ public void invalid(String oops) {
 	static class MetaAnnotationFixedRateTestBean {
 
 		@EveryFiveSeconds
-		public void checkForUpdates() {
+		void checkForUpdates() {
 		}
 	}
 
@@ -1098,7 +957,7 @@ public void checkForUpdates() {
 	static class ComposedAnnotationFixedRateTestBean {
 
 		@WaitASec(fixedRate = 5000)
-		public void checkForUpdates() {
+		void checkForUpdates() {
 		}
 	}
 
@@ -1106,7 +965,7 @@ public void checkForUpdates() {
 	static class MetaAnnotationCronTestBean {
 
 		@Hourly
-		public void generateReport() {
+		void generateReport() {
 		}
 	}
 
@@ -1114,23 +973,37 @@ public void generateReport() {
 	static class PropertyPlaceholderWithCronTestBean {
 
 		@Scheduled(cron = "${schedules.businessHours}")
-		public void x() {
+		void x() {
 		}
 	}
 
 
-	static class PropertyPlaceholderWithFixedDelayTestBean {
+	static class PropertyPlaceholderWithFixedDelay {
 
 		@Scheduled(fixedDelayString = "${fixedDelay}", initialDelayString = "${initialDelay}")
-		public void fixedDelay() {
+		void fixedDelay() {
 		}
 	}
 
+	static class PropertyPlaceholderWithFixedDelayInSeconds {
+
+		@Scheduled(fixedDelayString = "${fixedDelay}", initialDelayString = "${initialDelay}", timeUnit = TimeUnit.SECONDS)
+		void fixedDelay() {
+		}
+	}
 
-	static class PropertyPlaceholderWithFixedRateTestBean {
+
+	static class PropertyPlaceholderWithFixedRate {
 
 		@Scheduled(fixedRateString = "${fixedRate}", initialDelayString = "${initialDelay}")
-		public void fixedRate() {
+		void fixedRate() {
+		}
+	}
+
+	static class PropertyPlaceholderWithFixedRateInSeconds {
+
+		@Scheduled(fixedRateString = "${fixedRate}", initialDelayString = "${initialDelay}", timeUnit = TimeUnit.SECONDS)
+		void fixedRate() {
 		}
 	}
 
@@ -1138,7 +1011,7 @@ public void fixedRate() {
 	static class ExpressionWithCronTestBean {
 
 		@Scheduled(cron = "#{schedules.businessHours}")
-		public void x() {
+		void x() {
 		}
 	}
 
@@ -1153,7 +1026,24 @@ public void x() {
 	static class PropertyPlaceholderMetaAnnotationTestBean {
 
 		@BusinessHours
-		public void y() {
+		void y() {
+		}
+	}
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@ConvertWith(NameToClass.Converter.class)
+	private @interface NameToClass {
+		class Converter implements ArgumentConverter {
+			@Override
+			public Class<?> convert(Object beanClassName, ParameterContext context) throws ArgumentConversionException {
+				try {
+					String name = getClass().getEnclosingClass().getEnclosingClass().getName() + "$" + beanClassName;
+					return getClass().getClassLoader().loadClass(name);
+				}
+				catch (Exception ex) {
+					throw new ArgumentConversionException("Failed to convert class name to Class", ex);
+				}
+			}
 		}
 	}
 
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index 15e49e487d23..dae0ac82ac01 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -4923,37 +4923,54 @@ switching to `aspectj` mode in combination with compile-time or load-time weavin
 ==== The `@Scheduled` annotation
 
 You can add the `@Scheduled` annotation to a method, along with trigger metadata. For
-example, the following method is invoked every five seconds with a fixed delay,
-meaning that the period is measured from the completion time of each preceding
-invocation:
+example, the following method is invoked every five seconds (5000 milliseconds) with a
+fixed delay, meaning that the period is measured from the completion time of each
+preceding invocation.
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(fixedDelay=5000)
+	@Scheduled(fixedDelay = 5000)
 	public void doSomething() {
 		// something that should run periodically
 	}
 ----
 
-If you need a fixed-rate execution, you can change the property name specified within
-the annotation. The following method is invoked every five seconds (measured between the
-successive start times of each invocation):
+[NOTE]
+====
+By default, milliseconds will be used as the time unit for fixed delay, fixed rate, and
+initial delay values. If you would like to use a different time unit such as seconds or
+minutes, you can configure this via the `timeUnit` attribute in `@Scheduled`.
+
+For example, the previous example can also be written as follows.
+
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+	@Scheduled(fixedDelay = 5, timeUnit = TimeUnit.SECONDS)
+	public void doSomething() {
+		// something that should run periodically
+	}
+----
+====
+
+If you need a fixed-rate execution, you can use the `fixedRate` attribute within the
+annotation. The following method is invoked every five seconds (measured between the
+successive start times of each invocation).
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(fixedRate=5000)
+	@Scheduled(fixedRate = 5, timeUnit = TimeUnit.SECONDS)
 	public void doSomething() {
 		// something that should run periodically
 	}
 ----
 
 For fixed-delay and fixed-rate tasks, you can specify an initial delay by indicating the
-number of milliseconds to wait before the first execution of the method, as the following
-`fixedRate` example shows:
+amount of time to wait before the first execution of the method, as the following
+`fixedRate` example shows.
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Scheduled(initialDelay=1000, fixedRate=5000)
+	@Scheduled(initialDelay = 1000, fixedRate = 5000)
 	public void doSomething() {
 		// something that should run periodically
 	}
@@ -4975,7 +4992,7 @@ The following example runs only on weekdays:
 TIP: You can also use the `zone` attribute to specify the time zone in which the cron
 expression is resolved.
 
-Notice that the methods to be scheduled must have void returns and must not expect any
+Notice that the methods to be scheduled must have void returns and must not accept any
 arguments. If the method needs to interact with other objects from the application
 context, those would typically have been provided through dependency injection.
 

From 9a7fb7022dd5b7d2d8d5514ab2fb827b3e32854a Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 26 Aug 2021 13:43:48 +0200
Subject: [PATCH 064/140] Fix typo in @Scheduled

See gh-27309
---
 .../org/springframework/scheduling/annotation/Scheduled.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index ce55aeb82cbd..468906a61445 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -166,7 +166,7 @@
 	 * The {@link TimeUnit} to use for {@link #fixedDelay}, {@link #fixedDelayString},
 	 * {@link #fixedRate}, {@link #fixedRateString}, {@link #initialDelay}, and
 	 * {@link #initialDelayString}.
-	 * <p>Defaults to {@link TimeUnit#MICROSECONDS}.
+	 * <p>Defaults to {@link TimeUnit#MILLISECONDS}.
 	 * <p>This attribute is ignored for {@linkplain #cron() cron expressions}
 	 * and for {@link java.time.Duration} values supplied via {@link #fixedDelayString},
 	 * {@link #fixedRateString}, or {@link #initialDelayString}.

From c27ec00ae94bb3a2555c7762264ff009fa57ee0c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Thu, 26 Aug 2021 14:09:23 +0200
Subject: [PATCH 065/140] Polish scheduling Javadoc

---
 .../annotation/EnableScheduling.java          | 30 ++++++++-----------
 .../scheduling/annotation/Scheduled.java      |  2 +-
 .../ScheduledAnnotationBeanPostProcessor.java | 15 ++++++----
 .../annotation/SchedulingConfigurer.java      | 18 +++++------
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
index d94b5f5e9c79..e35b0a799291 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 /**
  * Enables Spring's scheduled task execution capability, similar to
  * functionality found in Spring's {@code <task:*>} XML namespace. To be used
- * on @{@link Configuration} classes as follows:
+ * on {@link Configuration @Configuration} classes as follows:
  *
  * <pre class="code">
  * &#064;Configuration
@@ -41,8 +41,8 @@
  *     // various &#064;Bean definitions
  * }</pre>
  *
- * This enables detection of @{@link Scheduled} annotations on any Spring-managed
- * bean in the container. For example, given a class {@code MyTask}
+ * <p>This enables detection of {@link Scheduled @Scheduled} annotations on any
+ * Spring-managed bean in the container. For example, given a class {@code MyTask}:
  *
  * <pre class="code">
  * package com.myco.tasks;
@@ -55,7 +55,7 @@
  *     }
  * }</pre>
  *
- * the following configuration would ensure that {@code MyTask.work()} is called
+ * <p>the following configuration would ensure that {@code MyTask.work()} is called
  * once every 1000 ms:
  *
  * <pre class="code">
@@ -69,7 +69,7 @@
  *     }
  * }</pre>
  *
- * Alternatively, if {@code MyTask} were annotated with {@code @Component}, the
+ * <p>Alternatively, if {@code MyTask} were annotated with {@code @Component}, the
  * following configuration would ensure that its {@code @Scheduled} method is
  * invoked at the desired interval:
  *
@@ -80,7 +80,7 @@
  * public class AppConfig {
  * }</pre>
  *
- * Methods annotated with {@code @Scheduled} may even be declared directly within
+ * <p>Methods annotated with {@code @Scheduled} may even be declared directly within
  * {@code @Configuration} classes:
  *
  * <pre class="code">
@@ -94,7 +94,7 @@
  *     }
  * }</pre>
  *
- * <p>By default, will be searching for an associated scheduler definition: either
+ * <p>By default, Spring will search for an associated scheduler definition: either
  * a unique {@link org.springframework.scheduling.TaskScheduler} bean in the context,
  * or a {@code TaskScheduler} bean named "taskScheduler" otherwise; the same lookup
  * will also be performed for a {@link java.util.concurrent.ScheduledExecutorService}
@@ -141,11 +141,7 @@
  *     public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
  *         taskRegistrar.setScheduler(taskScheduler());
  *         taskRegistrar.addTriggerTask(
- *             new Runnable() {
- *                 public void run() {
- *                     myTask().work();
- *                 }
- *             },
+ *             () -&gt; myTask().work(),
  *             new CustomTrigger()
  *         );
  *     }
@@ -165,7 +161,7 @@
  * configuration:
  *
  * <pre class="code">
- * &lt;beans>
+ * &lt;beans&gt;
  *
  *     &lt;task:annotation-driven scheduler="taskScheduler"/&gt;
  *
@@ -180,13 +176,13 @@
  * &lt;/beans&gt;
  * </pre>
  *
- * The examples are equivalent save that in XML a <em>fixed-rate</em> period is used
+ * <p>The examples are equivalent save that in XML a <em>fixed-rate</em> period is used
  * instead of a custom <em>{@code Trigger}</em> implementation; this is because the
  * {@code task:} namespace {@code scheduled} cannot easily expose such support. This is
  * but one demonstration how the code-based approach allows for maximum configurability
- * through direct access to actual componentry.<p>
+ * through direct access to actual componentry.
  *
- * <b>Note: {@code @EnableScheduling} applies to its local application context only,
+ * <p><b>Note: {@code @EnableScheduling} applies to its local application context only,
  * allowing for selective scheduling of beans at different levels.</b> Please redeclare
  * {@code @EnableScheduling} in each individual context, e.g. the common root web
  * application context and any separate {@code DispatcherServlet} application contexts,
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
index 468906a61445..f3aa81296a23 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
@@ -38,7 +38,7 @@
  * <p>Processing of {@code @Scheduled} annotations is performed by
  * registering a {@link ScheduledAnnotationBeanPostProcessor}. This can be
  * done manually or, more conveniently, through the {@code <task:annotation-driven/>}
- * element or @{@link EnableScheduling} annotation.
+ * XML element or {@link EnableScheduling @EnableScheduling} annotation.
  *
  * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
  * <em>composed annotations</em> with attribute overrides.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
index 5e47ccda548f..f0aae203468a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -78,9 +78,10 @@
 import org.springframework.util.StringValueResolver;
 
 /**
- * Bean post-processor that registers methods annotated with @{@link Scheduled}
- * to be invoked by a {@link org.springframework.scheduling.TaskScheduler} according
- * to the "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
+ * Bean post-processor that registers methods annotated with
+ * {@link Scheduled @Scheduled} to be invoked by a
+ * {@link org.springframework.scheduling.TaskScheduler} according to the
+ * "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
  *
  * <p>This post-processor is automatically registered by Spring's
  * {@code <task:annotation-driven>} XML element, and also by the
@@ -88,8 +89,9 @@
  *
  * <p>Autodetects any {@link SchedulingConfigurer} instances in the container,
  * allowing for customization of the scheduler to be used or for fine-grained
- * control over task registration (e.g. registration of {@link Trigger} tasks.
- * See the @{@link EnableScheduling} javadocs for complete usage details.
+ * control over task registration (e.g. registration of {@link Trigger} tasks).
+ * See the {@link EnableScheduling @EnableScheduling} javadocs for complete usage
+ * details.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -153,7 +155,8 @@ public ScheduledAnnotationBeanPostProcessor() {
 	/**
 	 * Create a {@code ScheduledAnnotationBeanPostProcessor} delegating to the
 	 * specified {@link ScheduledTaskRegistrar}.
-	 * @param registrar the ScheduledTaskRegistrar to register @Scheduled tasks on
+	 * @param registrar the ScheduledTaskRegistrar to register {@code @Scheduled}
+	 * tasks on
 	 * @since 5.1
 	 */
 	public ScheduledAnnotationBeanPostProcessor(ScheduledTaskRegistrar registrar) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
index 05283e3fd503..26f0076077f7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 
 /**
- * Optional interface to be implemented by @{@link
- * org.springframework.context.annotation.Configuration Configuration} classes annotated
- * with @{@link EnableScheduling}. Typically used for setting a specific
+ * Optional interface to be implemented by {@link
+ * org.springframework.context.annotation.Configuration @Configuration} classes annotated
+ * with {@link EnableScheduling @EnableScheduling}. Typically used for setting a specific
  * {@link org.springframework.scheduling.TaskScheduler TaskScheduler} bean to be used when
  * executing scheduled tasks or for registering scheduled tasks in a <em>programmatic</em>
- * fashion as opposed to the <em>declarative</em> approach of using the @{@link Scheduled}
- * annotation. For example, this may be necessary when implementing {@link
- * org.springframework.scheduling.Trigger Trigger}-based tasks, which are not supported by
- * the {@code @Scheduled} annotation.
+ * fashion as opposed to the <em>declarative</em> approach of using the
+ * {@link Scheduled @Scheduled} annotation. For example, this may be necessary
+ * when implementing {@link org.springframework.scheduling.Trigger Trigger}-based
+ * tasks, which are not supported by the {@code @Scheduled} annotation.
  *
- * <p>See @{@link EnableScheduling} for detailed usage examples.
+ * <p>See {@link EnableScheduling @EnableScheduling} for detailed usage examples.
  *
  * @author Chris Beams
  * @since 3.1

From b120e0b8f4e48b44ffba59b0002d6d04883dc4a4 Mon Sep 17 00:00:00 2001
From: Steve Wei <wzj3335@gmail.com>
Date: Mon, 30 Aug 2021 23:47:31 +0900
Subject: [PATCH 066/140] Fix Kotlin example for filtering handler functions

Closes gh-#27337
---
 src/docs/asciidoc/web/webmvc-functional.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docs/asciidoc/web/webmvc-functional.adoc b/src/docs/asciidoc/web/webmvc-functional.adoc
index 368654f02c8d..1dd3779e1ed4 100644
--- a/src/docs/asciidoc/web/webmvc-functional.adoc
+++ b/src/docs/asciidoc/web/webmvc-functional.adoc
@@ -799,10 +799,10 @@ For instance, consider the following example:
 				ServerRequest.from(it)
 						.header("X-RequestHeader", "Value").build()
 			}
-			POST("/person", handler::createPerson)
-			after { _, response -> // <2>
-				logResponse(response)
-			}
+		}
+		POST("/person", handler::createPerson)
+		after { _, response -> // <2>
+			logResponse(response)
 		}
 	}
 ----

From debf61b948fd44a8757c4a8c286202ca3b6762b5 Mon Sep 17 00:00:00 2001
From: Philippe Marschall <philippe.marschall@gmail.com>
Date: Mon, 30 Aug 2021 16:51:59 +0200
Subject: [PATCH 067/140] Remove unused private loggers

Closes gh-27336
---
 .../aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java | 5 -----
 .../expression/ApplicationContextExpressionTests.java       | 6 ------
 .../support/TransactionSynchronizationManager.java          | 5 -----
 .../http/converter/json/Jackson2ObjectMapperBuilder.java    | 4 ----
 4 files changed, 20 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 0b6d3394ffba..0ea96012223e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -20,8 +20,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -40,7 +38,6 @@
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -66,8 +63,6 @@
  */
 public class AspectJAutoProxyCreatorTests {
 
-	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
-
 
 	@Test
 	public void testAspectsAreApplied() {
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index e3c9921a504c..c2dfc35dce8d 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -28,8 +28,6 @@
 import java.util.Optional;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.ObjectFactory;
@@ -40,7 +38,6 @@
 import org.springframework.beans.factory.config.Scope;
 import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -64,9 +61,6 @@
  */
 class ApplicationContextExpressionTests {
 
-	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
-
-
 	@Test
 	@SuppressWarnings("deprecation")
 	void genericApplicationContext() throws Exception {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
index 3b6e1558acfc..55b3b8c788c6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java
@@ -24,9 +24,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.core.OrderComparator;
 import org.springframework.lang.Nullable;
@@ -76,8 +73,6 @@
  */
 public abstract class TransactionSynchronizationManager {
 
-	private static final Log logger = LogFactory.getLog(TransactionSynchronizationManager.class);
-
 	private static final ThreadLocal<Map<Object, Object>> resources =
 			new NamedThreadLocal<>("Transactional resources");
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
index 0157d4efb61d..415113ff0596 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -55,13 +55,11 @@
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.logging.Log;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.KotlinDetector;
-import org.springframework.http.HttpLogging;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -105,8 +103,6 @@
  */
 public class Jackson2ObjectMapperBuilder {
 
-	private final Log logger = HttpLogging.forLogName(getClass());
-
 	private final Map<Class<?>, Class<?>> mixIns = new LinkedHashMap<>();
 
 	private final Map<Class<?>, JsonSerializer<?>> serializers = new LinkedHashMap<>();

From ae56f2ac09248c3d97288acb044ff30c5ea16897 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 30 Aug 2021 16:54:16 +0200
Subject: [PATCH 068/140] Polish contribution

See gh-27336
---
 .../aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java    | 3 +--
 .../context/expression/ApplicationContextExpressionTests.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 0ea96012223e..279e600ec9e8 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@
  */
 public class AspectJAutoProxyCreatorTests {
 
-
 	@Test
 	public void testAspectsAreApplied() {
 		ClassPathXmlApplicationContext bf = newContext("aspects.xml");
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index c2dfc35dce8d..657597bc23f9 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 8d3e8ca3a2d534f6ee872bb6a65a89c44e987cf6 Mon Sep 17 00:00:00 2001
From: Daniel Knittl-Frank <knittl89+git@googlemail.com>
Date: Wed, 23 Dec 2020 21:53:08 +0100
Subject: [PATCH 069/140] Optimize allocation in StringUtils#cleanPath

This commit applies several optimizations to StringUtils#cleanPath and
related methods:

* pre-size pathElements deque in StringUtils#cleanPath with
  pathElements.length elements, since this this is the maximum size and
  the most likely case.
* optimize StringUtils#collectionToDelimitedString to calculate the size
  of the resulting String and avoid array auto-resizing in the
  StringBuilder.
* If the path did not contain any components that required cleaning,
  return the (normalized) path as-is. No need to concatenate the prefix
  and the trailing path.

See gh-26316
---
 .../org/springframework/util/StringUtils.java | 44 +++++++++++++++++--
 .../util/StringUtilsTests.java                |  2 +
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index edbbaea91d45..e320e9bd4c5a 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -667,7 +667,9 @@ public static String cleanPath(String path) {
 		if (!hasLength(path)) {
 			return path;
 		}
-		String pathToUse = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
+
+		String normalizedPath = replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
+		String pathToUse = normalizedPath;
 
 		// Shortcut if there is no work to do
 		if (pathToUse.indexOf('.') == -1) {
@@ -695,7 +697,8 @@ public static String cleanPath(String path) {
 		}
 
 		String[] pathArray = delimitedListToStringArray(pathToUse, FOLDER_SEPARATOR);
-		Deque<String> pathElements = new ArrayDeque<>();
+		// we never require more elements than pathArray and in the common case the same number
+		Deque<String> pathElements = new ArrayDeque<>(pathArray.length);
 		int tops = 0;
 
 		for (int i = pathArray.length - 1; i >= 0; i--) {
@@ -721,7 +724,7 @@ else if (TOP_PATH.equals(element)) {
 
 		// All path elements stayed the same - shortcut
 		if (pathArray.length == pathElements.size()) {
-			return prefix + pathToUse;
+			return normalizedPath;
 		}
 		// Remaining top paths need to be retained.
 		for (int i = 0; i < tops; i++) {
@@ -732,7 +735,40 @@ else if (TOP_PATH.equals(element)) {
 			pathElements.addFirst(CURRENT_PATH);
 		}
 
-		return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
+		final String joined = joinStrings(pathElements, FOLDER_SEPARATOR);
+		// avoid string concatenation with empty prefix
+		return prefix.isEmpty() ? joined : prefix + joined;
+	}
+
+	/**
+	 * Convert a {@link Collection Collection&lt;String&gt;} to a delimited {@code String} (e.g. CSV).
+	 * <p>This is an optimized variant of {@link #collectionToDelimitedString(Collection, String)}, which does not
+	 * require dynamic resizing of the StringBuilder's backing array.
+	 * @param coll the {@code Collection Collection&lt;String&gt;} to convert (potentially {@code null} or empty)
+	 * @param delim the delimiter to use (typically a ",")
+	 * @return the delimited {@code String}
+	 */
+	private static String joinStrings(@Nullable Collection<String> coll, String delim) {
+
+		if (CollectionUtils.isEmpty(coll)) {
+			return "";
+		}
+
+		// precompute total length of resulting string
+		int totalLength = (coll.size() - 1) * delim.length();
+		for (String str : coll) {
+			totalLength += str.length();
+		}
+
+		StringBuilder sb = new StringBuilder(totalLength);
+		Iterator<?> it = coll.iterator();
+		while (it.hasNext()) {
+			sb.append(it.next());
+			if (it.hasNext()) {
+				sb.append(delim);
+			}
+		}
+		return sb.toString();
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
index 9d81c82d5f1c..2aae6260dd0e 100644
--- a/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
@@ -402,6 +402,8 @@ void cleanPath() {
 		assertThat(StringUtils.cleanPath("file:.././")).isEqualTo("file:../");
 		assertThat(StringUtils.cleanPath("file:/mypath/spring.factories")).isEqualTo("file:/mypath/spring.factories");
 		assertThat(StringUtils.cleanPath("file:///c:/some/../path/the%20file.txt")).isEqualTo("file:///c:/path/the%20file.txt");
+		assertThat(StringUtils.cleanPath("jar:file:///c:\\some\\..\\path\\.\\the%20file.txt")).isEqualTo("jar:file:///c:/path/the%20file.txt");
+		assertThat(StringUtils.cleanPath("jar:file:///c:/some/../path/./the%20file.txt")).isEqualTo("jar:file:///c:/path/the%20file.txt");
 	}
 
 	@Test

From cc026fcb8ae51172f3d063e7ed07a32927e23d8e Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 30 Aug 2021 17:58:12 +0200
Subject: [PATCH 070/140] Polish "Optimize allocation in StringUtils#cleanPath"

This commit also introduces JMH benchmarks related to the code
optimizations.

Closes gh-2631
---
 .../util/StringUtilsBenchmark.java            | 116 ++++++++++++++++++
 .../org/springframework/util/StringUtils.java |  40 ++----
 2 files changed, 123 insertions(+), 33 deletions(-)
 create mode 100644 spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java

diff --git a/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java
new file mode 100644
index 000000000000..1fc7753b2218
--- /dev/null
+++ b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.infra.Blackhole;
+
+/**
+ * Benchmarks for {@link StringUtils}.
+ *
+ * @author Brian Clozel
+ */
+@BenchmarkMode(Mode.Throughput)
+public class StringUtilsBenchmark {
+
+	@Benchmark
+	public void collectionToDelimitedString(DelimitedStringState state, Blackhole bh) {
+		bh.consume(StringUtils.collectionToCommaDelimitedString(state.elements));
+	}
+
+	@State(Scope.Benchmark)
+	public static class DelimitedStringState {
+
+		@Param("10")
+		int elementMinSize;
+
+		@Param("20")
+		int elementMaxSize;
+
+		@Param("10")
+		int elementCount;
+
+		Collection<String> elements;
+
+		@Setup(Level.Iteration)
+		public void setup() {
+			Random random = new Random();
+			this.elements = new ArrayList<>(this.elementCount);
+			int bound = this.elementMaxSize - this.elementMinSize;
+			for (int i = 0; i < this.elementCount; i++) {
+				this.elements.add(String.format("%0" + (random.nextInt(bound) + this.elementMinSize) + "d", 1));
+			}
+		}
+	}
+
+	@Benchmark
+	public void cleanPath(CleanPathState state, Blackhole bh) {
+		for (String path : state.paths) {
+			bh.consume(StringUtils.cleanPath(path));
+		}
+	}
+
+	@State(Scope.Benchmark)
+	public static class CleanPathState {
+
+		private static final List<String> SEGMENTS = Arrays.asList("some", "path", ".", "..", "springspring");
+
+		@Param("10")
+		int segmentCount;
+
+		@Param("20")
+		int pathsCount;
+
+		Collection<String> paths;
+
+		@Setup(Level.Iteration)
+		public void setup() {
+			this.paths = new ArrayList<>(this.pathsCount);
+			Random random = new Random();
+			for (int i = 0; i < this.pathsCount; i++) {
+				this.paths.add(createSamplePath(random));
+			}
+		}
+
+		private String createSamplePath(Random random) {
+			String separator = random.nextBoolean() ? "/" : "\\";
+			StringBuilder sb = new StringBuilder();
+			sb.append("jar:file:///c:");
+			for (int i = 0; i < this.segmentCount; i++) {
+				sb.append(separator);
+				sb.append(SEGMENTS.get(random.nextInt(SEGMENTS.size())));
+			}
+			sb.append(separator);
+			sb.append("the%20file.txt");
+			return sb.toString();
+		}
+
+	}
+}
diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java
index e320e9bd4c5a..80a996d481fb 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -735,42 +735,11 @@ else if (TOP_PATH.equals(element)) {
 			pathElements.addFirst(CURRENT_PATH);
 		}
 
-		final String joined = joinStrings(pathElements, FOLDER_SEPARATOR);
+		final String joined = collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
 		// avoid string concatenation with empty prefix
 		return prefix.isEmpty() ? joined : prefix + joined;
 	}
 
-	/**
-	 * Convert a {@link Collection Collection&lt;String&gt;} to a delimited {@code String} (e.g. CSV).
-	 * <p>This is an optimized variant of {@link #collectionToDelimitedString(Collection, String)}, which does not
-	 * require dynamic resizing of the StringBuilder's backing array.
-	 * @param coll the {@code Collection Collection&lt;String&gt;} to convert (potentially {@code null} or empty)
-	 * @param delim the delimiter to use (typically a ",")
-	 * @return the delimited {@code String}
-	 */
-	private static String joinStrings(@Nullable Collection<String> coll, String delim) {
-
-		if (CollectionUtils.isEmpty(coll)) {
-			return "";
-		}
-
-		// precompute total length of resulting string
-		int totalLength = (coll.size() - 1) * delim.length();
-		for (String str : coll) {
-			totalLength += str.length();
-		}
-
-		StringBuilder sb = new StringBuilder(totalLength);
-		Iterator<?> it = coll.iterator();
-		while (it.hasNext()) {
-			sb.append(it.next());
-			if (it.hasNext()) {
-				sb.append(delim);
-			}
-		}
-		return sb.toString();
-	}
-
 	/**
 	 * Compare two paths after normalization of them.
 	 * @param path1 first path for comparison
@@ -1330,7 +1299,12 @@ public static String collectionToDelimitedString(
 			return "";
 		}
 
-		StringBuilder sb = new StringBuilder();
+		int totalLength = coll.size() * (prefix.length() + suffix.length()) + (coll.size() - 1) * delim.length();
+		for (Object element : coll) {
+			totalLength += element.toString().length();
+		}
+
+		StringBuilder sb = new StringBuilder(totalLength);
 		Iterator<?> it = coll.iterator();
 		while (it.hasNext()) {
 			sb.append(prefix).append(it.next()).append(suffix);

From e5a5f8b20b00a896bb1edad5fbc13f982cd0e6ca Mon Sep 17 00:00:00 2001
From: Georgi Ushev <ushev.georgi@gmail.com>
Date: Tue, 31 Aug 2021 10:37:29 +0300
Subject: [PATCH 071/140] Remove unnecessary brace in websocket documenation

Closes gh-#27339
---
 src/docs/asciidoc/web/websocket.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 272e4669cc07..080a75e0ab3f 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1177,7 +1177,7 @@ We can trace the flow through a simple example. Consider the following example,
 	@Controller
 	public class GreetingController {
 
-		@MessageMapping("/greeting") {
+		@MessageMapping("/greeting")
 		public String handle(String greeting) {
 			return "[" + getTimestamp() + ": " + greeting;
 		}

From 871e378ed054d95f19bcb75fa0f01e202e83f367 Mon Sep 17 00:00:00 2001
From: Inmord <53592130+Inmord@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:40:28 +0800
Subject: [PATCH 072/140] Polish AbstractAspectJAdvisorFactory

Closes gh-27340
---
 .../aspectj/annotation/AbstractAspectJAdvisorFactory.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index e76156bf8265..78573e429d9a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -103,10 +103,11 @@ private boolean compiledByAjc(Class<?> clazz) {
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
-		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
-				!Modifier.isAbstract(aspectClass.getSuperclass().getModifiers())) {
+		Class<?> superclass = aspectClass.getSuperclass();
+		if (superclass.getAnnotation(Aspect.class) != null &&
+				!Modifier.isAbstract(superclass.getModifiers())) {
 			throw new AopConfigException("[" + aspectClass.getName() + "] cannot extend concrete aspect [" +
-					aspectClass.getSuperclass().getName() + "]");
+					superclass.getName() + "]");
 		}
 
 		AjType<?> ajType = AjTypeSystem.getAjType(aspectClass);

From 88af24c1cb5cb0325c2322e0efdc109e4eceb487 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 31 Aug 2021 09:46:10 +0200
Subject: [PATCH 073/140] Update copyright date

---
 .../aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 78573e429d9a..58f3c23b459f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 310bdbb1b204bcb1e4b241d73b81df9bc153e9ac Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Wed, 1 Sep 2021 10:34:16 +0200
Subject: [PATCH 074/140] Fix error in ApplicationEvents example

---
 src/docs/asciidoc/testing.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index bc3af10d0891..64f07918d46e 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -2613,7 +2613,7 @@ published while invoking a method in a Spring-managed component:
 			// Invoke method in OrderService that publishes an event
 			orderService.submitOrder(new Order(/* ... */));
 			// Verify that an OrderSubmitted event was published
-			int numEvents = events.stream(OrderSubmitted.class).count(); // <3>
+			long numEvents = events.stream(OrderSubmitted.class).count(); // <3>
 			assertThat(numEvents).isEqualTo(1);
 		}
 	}

From 164dcef6ae3ca05e03c828cbdc0bfd97b8043bd0 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:19:57 +0200
Subject: [PATCH 075/140] Tracking ASM master

See gh-27069
---
 .../springframework/asm/AnnotationVisitor.java    | 12 ++++++------
 .../java/org/springframework/asm/ByteVector.java  |  3 +++
 .../org/springframework/asm/ClassVisitor.java     | 13 ++++++-------
 .../org/springframework/asm/FieldVisitor.java     | 15 ++++++---------
 .../org/springframework/asm/MethodVisitor.java    | 12 ++++++------
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java b/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
index 51357068800b..c3c236aefabb 100644
--- a/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/AnnotationVisitor.java
@@ -38,8 +38,8 @@
 public abstract class AnnotationVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -52,8 +52,8 @@ public abstract class AnnotationVisitor {
   /**
    * Constructs a new {@link AnnotationVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public AnnotationVisitor(final int api) {
     this(api, null);
@@ -62,8 +62,8 @@ public AnnotationVisitor(final int api) {
   /**
    * Constructs a new {@link AnnotationVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param annotationVisitor the annotation visitor to which this visitor must delegate method
    *     calls. May be {@literal null}.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/ByteVector.java b/spring-core/src/main/java/org/springframework/asm/ByteVector.java
index 3789eec3fd6d..6187c1e22c7d 100644
--- a/spring-core/src/main/java/org/springframework/asm/ByteVector.java
+++ b/spring-core/src/main/java/org/springframework/asm/ByteVector.java
@@ -352,6 +352,9 @@ public ByteVector putByteArray(
    * @param size number of additional bytes that this byte vector should be able to receive.
    */
   private void enlarge(final int size) {
+    if (length > data.length) {
+      throw new AssertionError("Internal error");
+    }
     int doubleCapacity = 2 * data.length;
     int minimalCapacity = length + size;
     byte[] newData = new byte[doubleCapacity > minimalCapacity ? doubleCapacity : minimalCapacity];
diff --git a/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java b/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
index b49c3eebce5e..05b448321afc 100644
--- a/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/ClassVisitor.java
@@ -40,8 +40,8 @@
 public abstract class ClassVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -51,8 +51,8 @@ public abstract class ClassVisitor {
   /**
    * Constructs a new {@link ClassVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public ClassVisitor(final int api) {
     this(api, null);
@@ -61,9 +61,8 @@ public ClassVisitor(final int api) {
   /**
    * Constructs a new {@link ClassVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param classVisitor the class visitor to which this visitor must delegate method calls. May be
    *     null.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java b/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
index 841b4a3cb78f..727417045faa 100644
--- a/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/FieldVisitor.java
@@ -37,9 +37,8 @@
 public abstract class FieldVisitor {
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   * Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -49,9 +48,8 @@ public abstract class FieldVisitor {
   /**
    * Constructs a new {@link FieldVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7}, {@link
-   *     Opcodes#ASM8} or {@link Opcodes#ASM9}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public FieldVisitor(final int api) {
     this(api, null);
@@ -60,9 +58,8 @@ public FieldVisitor(final int api) {
   /**
    * Constructs a new {@link FieldVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6}, {@link Opcodes#ASM7} or {@link
-   *     Opcodes#ASM8}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param fieldVisitor the field visitor to which this visitor must delegate method calls. May be
    *     null.
    */
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
index ff5ce1056d27..15ca4a5e4eb3 100644
--- a/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
+++ b/spring-core/src/main/java/org/springframework/asm/MethodVisitor.java
@@ -51,8 +51,8 @@ public abstract class MethodVisitor {
   private static final String REQUIRES_ASM5 = "This feature requires ASM5";
 
   /**
-   * The ASM API version implemented by this visitor. The value of this field must be one of {@link
-   * Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * The ASM API version implemented by this visitor. The value of this field must be one of the
+   * {@code ASM}<i>x</i> values in {@link Opcodes}.
    */
   protected final int api;
 
@@ -64,8 +64,8 @@ public abstract class MethodVisitor {
   /**
    * Constructs a new {@link MethodVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    */
   public MethodVisitor(final int api) {
     this(api, null);
@@ -74,8 +74,8 @@ public MethodVisitor(final int api) {
   /**
    * Constructs a new {@link MethodVisitor}.
    *
-   * @param api the ASM API version implemented by this visitor. Must be one of {@link
-   *     Opcodes#ASM4}, {@link Opcodes#ASM5}, {@link Opcodes#ASM6} or {@link Opcodes#ASM7}.
+   * @param api the ASM API version implemented by this visitor. Must be one of the {@code
+   *     ASM}<i>x</i> values in {@link Opcodes}.
    * @param methodVisitor the method visitor to which this visitor must delegate method calls. May
    *     be null.
    */

From 837301fdb3a92b1e40535a404dbdbf57b01c3816 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:20:52 +0200
Subject: [PATCH 076/140] Convenient configuration of type permissions for
 XStream 1.4.18

Closes gh-27343
---
 .../oxm/xstream/XStreamMarshaller.java        | 33 ++++++++++++++++---
 .../oxm/xstream/XStreamMarshallerTests.java   | 12 ++++---
 .../oxm/xstream/XStreamUnmarshallerTests.java | 28 ++++++++++------
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
index a992ab814188..ccb10d27c172 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,6 +63,8 @@
 import com.thoughtworks.xstream.mapper.CannotResolveClassException;
 import com.thoughtworks.xstream.mapper.Mapper;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
+import com.thoughtworks.xstream.security.ForbiddenClassException;
+import com.thoughtworks.xstream.security.TypePermission;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -106,7 +108,7 @@
  * Therefore, it has limited namespace support. As such, it is rather unsuitable for
  * usage within Web Services.
  *
- * <p>This marshaller requires XStream 1.4.5 or higher, as of Spring 4.3.
+ * <p>This marshaller requires XStream 1.4.7 or higher, as of Spring 5.2.17.
  * Note that {@link XStream} construction has been reworked in 4.0, with the
  * stream driver and the class loader getting passed into XStream itself now.
  *
@@ -146,6 +148,9 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo
 	@Nullable
 	private ConverterMatcher[] converters;
 
+	@Nullable
+	private TypePermission[] typePermissions;
+
 	@Nullable
 	private MarshallingStrategy marshallingStrategy;
 
@@ -268,6 +273,20 @@ public void setConverters(ConverterMatcher... converters) {
 		this.converters = converters;
 	}
 
+	/**
+	 * Set XStream type permissions such as
+	 * {@link com.thoughtworks.xstream.security.AnyTypePermission},
+	 * {@link com.thoughtworks.xstream.security.ExplicitTypePermission} etc,
+	 * as an alternative to overriding the {@link #customizeXStream} method.
+	 * <p>Note: As of XStream 1.4.18, the default type permissions are
+	 * restricted to well-known core JDK types. For any custom types,
+	 * explicit type permissions need to be registered.
+	 * @since 5.2.17
+	 */
+	public void setTypePermissions(TypePermission... typePermissions) {
+		this.typePermissions = typePermissions;
+	}
+
 	/**
 	 * Set a custom XStream {@link MarshallingStrategy} to use.
 	 * @since 4.0
@@ -407,7 +426,7 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 
 	@Override
 	public void afterPropertiesSet() {
-		// no-op due to use of SingletonSupplier for the XStream field.
+		// no-op due to use of SingletonSupplier for the XStream field
 	}
 
 	/**
@@ -479,6 +498,12 @@ else if (this.converters[i] instanceof SingleValueConverter) {
 			}
 		}
 
+		if (this.typePermissions != null) {
+			for (TypePermission permission : this.typePermissions) {
+				xstream.addPermission(permission);
+			}
+		}
+
 		if (this.marshallingStrategy != null) {
 			xstream.setMarshallingStrategy(this.marshallingStrategy);
 		}
@@ -844,7 +869,7 @@ private Object doUnmarshal(HierarchicalStreamReader streamReader, @Nullable Data
 	 */
 	protected XmlMappingException convertXStreamException(Exception ex, boolean marshalling) {
 		if (ex instanceof StreamException || ex instanceof CannotResolveClassException ||
-				ex instanceof ConversionException) {
+				ex instanceof ForbiddenClassException || ex instanceof ConversionException) {
 			if (marshalling) {
 				return new MarshallingFailureException("XStream marshalling exception",  ex);
 			}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index 5f05936d751a..304d3fcc771b 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JsonWriter;
+import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
@@ -67,18 +68,21 @@
 /**
  * @author Arjen Poutsma
  * @author Sam Brannen
+ * @author Juergen Hoeller
  */
 class XStreamMarshallerTests {
 
 	private static final String EXPECTED_STRING = "<flight><flightNumber>42</flightNumber></flight>";
 
-	private final XStreamMarshaller marshaller = new XStreamMarshaller();
-
 	private final Flight flight = new Flight();
 
+	private XStreamMarshaller marshaller;
+
 
 	@BeforeEach
 	void createMarshaller() {
+		marshaller = new XStreamMarshaller();
+		marshaller.setTypePermissions(AnyTypePermission.ANY);
 		marshaller.setAliases(Collections.singletonMap("flight", Flight.class.getName()));
 		flight.setFlightNumber(42L);
 	}
@@ -143,7 +147,7 @@ void marshalStreamResultOutputStream() throws Exception {
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		StreamResult result = new StreamResult(os);
 		marshaller.marshal(flight, result);
-		String s = new String(os.toByteArray(), "UTF-8");
+		String s = os.toString("UTF-8");
 		assertThat(XmlContent.of(s)).isSimilarTo(EXPECTED_STRING);
 	}
 
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
index 1c864545aa68..7c87eda2253b 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +30,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
+import com.thoughtworks.xstream.security.AnyTypePermission;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
@@ -40,6 +42,7 @@
 
 /**
  * @author Arjen Poutsma
+ * @author Juergen Hoeller
  */
 public class XStreamUnmarshallerTests {
 
@@ -47,21 +50,16 @@ public class XStreamUnmarshallerTests {
 
 	private XStreamMarshaller unmarshaller;
 
+
 	@BeforeEach
-	public void createUnmarshaller() throws Exception {
+	public void createUnmarshaller() {
 		unmarshaller = new XStreamMarshaller();
+		unmarshaller.setTypePermissions(AnyTypePermission.ANY);
 		Map<String, Class<?>> aliases = new HashMap<>();
 		aliases.put("flight", Flight.class);
 		unmarshaller.setAliases(aliases);
 	}
 
-	private void testFlight(Object o) {
-		boolean condition = o instanceof Flight;
-		assertThat(condition).as("Unmarshalled object is not Flights").isTrue();
-		Flight flight = (Flight) o;
-		assertThat(flight).as("Flight is null").isNotNull();
-		assertThat(flight.getFlightNumber()).as("Number is invalid").isEqualTo(42L);
-	}
 
 	@Test
 	public void unmarshalDomSource() throws Exception {
@@ -83,7 +81,7 @@ public void unmarshalStaxSourceXmlStreamReader() throws Exception {
 
 	@Test
 	public void unmarshalStreamSourceInputStream() throws Exception {
-		StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes("UTF-8")));
+		StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes(StandardCharsets.UTF_8)));
 		Object flights = unmarshaller.unmarshal(source);
 		testFlight(flights);
 	}
@@ -94,5 +92,15 @@ public void unmarshalStreamSourceReader() throws Exception {
 		Object flights = unmarshaller.unmarshal(source);
 		testFlight(flights);
 	}
+
+
+	private void testFlight(Object o) {
+		boolean condition = o instanceof Flight;
+		assertThat(condition).as("Unmarshalled object is not Flights").isTrue();
+		Flight flight = (Flight) o;
+		assertThat(flight).as("Flight is null").isNotNull();
+		assertThat(flight.getFlightNumber()).as("Number is invalid").isEqualTo(42L);
+	}
+
 }
 

From b6c2c11805993a7d0b6e2520ee205fbb54ad215f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:21:27 +0200
Subject: [PATCH 077/140] Polishing

---
 .../beans/factory/config/ConstructorArgumentValues.java     | 6 ++++--
 .../org/springframework/web/servlet/FrameworkServlet.java   | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
index 4fbfb435875d..c4d779e697b8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -351,7 +351,9 @@ public ValueHolder getArgumentValue(int index, Class<?> requiredType, String req
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	@Nullable
-	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType, @Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType,
+			@Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = getIndexedArgumentValue(index, requiredType, requiredName);
 		if (valueHolder == null) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 6d3e8d3d2b45..40e1d1030e91 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -1085,7 +1085,7 @@ private void logResult(HttpServletRequest request, HttpServletResponse response,
 		}
 
 		DispatcherType dispatchType = request.getDispatcherType();
-		boolean initialDispatch = DispatcherType.REQUEST == dispatchType;
+		boolean initialDispatch = (dispatchType == DispatcherType.REQUEST);
 
 		if (failureCause != null) {
 			if (!initialDispatch) {
@@ -1109,7 +1109,7 @@ else if (logger.isTraceEnabled()) {
 		}
 
 		int status = response.getStatus();
-		String headers = ""; // nothing below trace
+		String headers = "";  // nothing below trace
 
 		if (logger.isTraceEnabled()) {
 			Collection<String> names = response.getHeaderNames();

From 2f60392fe347066b6bacab00b4ff0437a00203b4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:22:37 +0200
Subject: [PATCH 078/140] Upgrade to Netty 4.1.67, RxJava 3.1.1, Gson 2.8.8,
 XStream 1.4.18

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f41d37257b9..69b6cf85bb30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
-			mavenBom "io.netty:netty-bom:4.1.66.Final"
+			mavenBom "io.netty:netty-bom:4.1.67.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -67,7 +67,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.0"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
@@ -75,10 +75,10 @@ configure(allprojects) { project ->
 			dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.7"
+			dependency "com.google.code.gson:gson:2.8.8"
 			dependency "com.google.protobuf:protobuf-java-util:3.17.3"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.17") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}

From b2eaa7c1c3025dddd197df62a46d80ee2a84b8dd Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 2 Sep 2021 22:59:33 +0200
Subject: [PATCH 079/140] Polishing

---
 .../beans/BeanWrapperAutoGrowingTests.java    |  2 +-
 .../beans/BeanWrapperGenericsTests.java       | 52 ++++++++-----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
index 2dddf884e319..78524e632b0c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
@@ -38,7 +38,7 @@ public class BeanWrapperAutoGrowingTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	public void setup() {
 		wrapper.setAutoGrowNestedPaths(true);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index f5fef0b04a84..760e98cf9351 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.beans;
 
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -85,7 +84,7 @@ void testGenericSetWithConversionFailure() {
 	}
 
 	@Test
-	void testGenericList() throws MalformedURLException {
+	void testGenericList() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		List<String> input = new ArrayList<>();
@@ -97,7 +96,7 @@ void testGenericList() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListElement() throws MalformedURLException {
+	void testGenericListElement() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setResourceList(new ArrayList<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -162,10 +161,8 @@ void testGenericMapWithCollectionValue() {
 		value2.add(Boolean.TRUE);
 		input.put("2", value2);
 		bw.setPropertyValue("collectionMap", input);
-		boolean condition1 = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition1).isTrue();
-		boolean condition = gb.getCollectionMap().get(2) instanceof ArrayList;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
+		assertThat(gb.getCollectionMap().get(2) instanceof ArrayList).isTrue();
 	}
 
 	@Test
@@ -177,8 +174,7 @@ void testGenericMapElementWithCollectionValue() {
 		HashSet<Integer> value1 = new HashSet<>();
 		value1.add(1);
 		bw.setPropertyValue("collectionMap[1]", value1);
-		boolean condition = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
 	}
 
 	@Test
@@ -194,7 +190,7 @@ void testGenericMapFromProperties() {
 	}
 
 	@Test
-	void testGenericListOfLists() throws MalformedURLException {
+	void testGenericListOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -206,7 +202,7 @@ void testGenericListOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -218,7 +214,7 @@ void testGenericListOfListsWithElementConversion() throws MalformedURLException
 	}
 
 	@Test
-	void testGenericListOfArrays() throws MalformedURLException {
+	void testGenericListOfArrays() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -230,7 +226,7 @@ void testGenericListOfArrays() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
+	void testGenericListOfArraysWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -243,7 +239,7 @@ void testGenericListOfArraysWithElementConversion() throws MalformedURLException
 	}
 
 	@Test
-	void testGenericListOfMaps() throws MalformedURLException {
+	void testGenericListOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
@@ -267,7 +263,7 @@ void testGenericListOfMapsWithElementConversion() {
 	}
 
 	@Test
-	void testGenericMapOfMaps() throws MalformedURLException {
+	void testGenericMapOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
@@ -279,7 +275,7 @@ void testGenericMapOfMaps() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfMapsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
@@ -291,7 +287,7 @@ void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfLists() throws MalformedURLException {
+	void testGenericMapOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -303,7 +299,7 @@ void testGenericMapOfLists() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -315,7 +311,7 @@ void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfInteger() {
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "100");
 
@@ -324,12 +320,11 @@ void testGenericTypeNestingMapOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfInteger", map);
 
 		Object obj = gb.getMapOfInteger().get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfInteger() {
 		Map<String, List<String>> map = new HashMap<>();
 		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", list);
@@ -339,13 +334,12 @@ void testGenericTypeNestingMapOfListOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 
 	@Test
-	void testGenericTypeNestingListOfMapOfInteger() throws Exception {
+	void testGenericTypeNestingListOfMapOfInteger() {
 		List<Map<String, String>> list = new ArrayList<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "5");
@@ -356,13 +350,12 @@ void testGenericTypeNestingListOfMapOfInteger() throws Exception {
 		bw.setPropertyValue("listOfMapOfInteger", list);
 
 		Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(5);
 	}
 
 	@Test
-	void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfListOfInteger() {
 		Map<String, List<List<String>>> map = new HashMap<>();
 		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", Collections.singletonList(list));
@@ -372,8 +365,7 @@ void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
 		bw.setPropertyValue("mapOfListOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 

From 434cbab6a7147ebb7f51078cb14422fe26f1798a Mon Sep 17 00:00:00 2001
From: Leeseojune <sung07288346@gmail.com>
Date: Fri, 3 Sep 2021 17:50:50 +0900
Subject: [PATCH 080/140] Update copyright date in tests in spring-test

Closes gh-27354
---
 .../org/springframework/test/web/servlet/StubMvcResult.java     | 2 +-
 .../test/web/servlet/htmlunit/DelegatingWebConnectionTests.java | 2 +-
 .../test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java  | 2 +-
 .../test/web/servlet/result/HeaderResultMatchersTests.java      | 2 +-
 .../test/web/servlet/samples/context/PersonController.java      | 2 +-
 .../test/web/servlet/samples/context/PersonDao.java             | 2 +-
 .../resulthandlers/PrintingResultHandlerSmokeTests.java         | 2 +-
 .../standalone/resultmatchers/FlashAttributeAssertionTests.java | 2 +-
 .../samples/standalone/resultmatchers/ModelAssertionTests.java  | 2 +-
 .../resultmatchers/RequestAttributeAssertionTests.java          | 2 +-
 .../resultmatchers/SessionAttributeAssertionTests.java          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
index 12bde4ea41aa..f5c3bba6d6a7 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
index 1a093caf907f..05506cfbe3b2 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
index ba7e3cda66c9..457e8fc4750d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/UrlRegexRequestMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
index 19d79f1f4c75..496e9e7834b8 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/HeaderResultMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
index 31781062ba63..0ef78f3a6d4f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
index 4001526e94c7..e06c983d720d 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/PersonDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
index 7d23bebc0b56..1600c095263a 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerSmokeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index a6a5b7fc086b..0ffc879e9029 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
index 11473a31ab1f..a22b760bc82f 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ModelAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
index 7f98ce330070..c28a9190c67b 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
index d60a4c1428b8..9479894033a4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From bec0bb0c53a4e2a3cee0c03b3bd274953c93e7ae Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 2 Sep 2021 20:12:41 +0100
Subject: [PATCH 081/140] Revert "Add doOnDiscard hook for streaming mode"

This reverts commit 77a562dfee04cfb4a76a84257cf33fd73ab6b696.

As per findings under
https://github.com/reactor/reactor-netty/issues/1746 it looks this
wasn't the issue and isn't required.
---
 .../http/codec/EncoderHttpMessageWriter.java         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
index cf1d14644673..3fe192077388 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java
@@ -141,18 +141,16 @@ public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType eleme
 		}
 
 		if (isStreamingMediaType(contentType)) {
-			return message
-					.writeAndFlushWith(body.map(buffer -> {
-						Hints.touchDataBuffer(buffer, hints, logger);
-						return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
-					}))
-					.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+			return message.writeAndFlushWith(body.map(buffer -> {
+				Hints.touchDataBuffer(buffer, hints, logger);
+				return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+			}));
 		}
 
 		if (logger.isDebugEnabled()) {
 			body = body.doOnNext(buffer -> Hints.touchDataBuffer(buffer, hints, logger));
 		}
-		return message.writeWith(body).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
+		return message.writeWith(body);
 	}
 
 	@Nullable

From b2a17a8d86a50dc8844edfa9b9c1dd3fc7519132 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 3 Sep 2021 18:44:42 +0200
Subject: [PATCH 082/140] Fix typo

---
 .../build/optional/OptionalDependenciesPlugin.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index 55537c2d8259..93ae77995d10 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 /**
  * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
  * {@code optional} configuration. The {@code optional} configuration is part of the
- * project's compile and runtime classpath's but does not affect the classpath of
+ * project's compile and runtime classpaths but does not affect the classpath of
  * dependent projects.
  *
  * @author Andy Wilkinson

From 9cf8cca96d9c8280eac87595a7933aa338ec5599 Mon Sep 17 00:00:00 2001
From: Manish <manish.in.java@GMAIL.COM>
Date: Sun, 5 Sep 2021 15:44:44 +0530
Subject: [PATCH 083/140] Minor language corrections.

---
 src/docs/asciidoc/integration.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index dae0ac82ac01..aa17752e28e5 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -7,8 +7,8 @@
 :tabsize: 4
 :docinfo1:
 
-This part of the reference documentation covers the Spring Framework's integration with
-a number technologies.
+This part of the reference documentation covers Spring Framework's integration with
+a number of technologies.
 
 
 [[rest-client-access]]
@@ -63,7 +63,7 @@ overloaded methods:
 
 | `patchForObject`
 | Updates a resource by using PATCH and returns the representation from the response.
-Note that the JDK `HttpURLConnection` does not support the `PATCH`, but Apache
+Note that the JDK `HttpURLConnection` does not support `PATCH`, but Apache
 HttpComponents and others do.
 
 | `delete`

From 5ea7592d7014c19140a867c9b57e8026653a80d3 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 6 Sep 2021 13:56:27 +0100
Subject: [PATCH 084/140] Polishing in ExchangeResult

---
 .../test/web/reactive/server/ExchangeResult.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
index 2359b1384738..27c93773bfa2 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
@@ -56,7 +56,7 @@
  */
 public class ExchangeResult {
 
-	private static Log logger = LogFactory.getLog(ExchangeResult.class);
+	private static final Log logger = LogFactory.getLog(ExchangeResult.class);
 
 	private static final List<MediaType> PRINTABLE_MEDIA_TYPES = Arrays.asList(
 			MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
@@ -77,7 +77,7 @@ public class ExchangeResult {
 	private final String uriTemplate;
 
 	@Nullable
-	final Object mockServerResult;
+	private final Object mockServerResult;
 
 
 	/**
@@ -218,9 +218,9 @@ public Object getMockServerResult() {
 	}
 
 	/**
-	 * Execute the given Runnable, catch any {@link AssertionError}, decorate
-	 * with {@code AssertionError} containing diagnostic information about the
-	 * request and response, and then re-throw.
+	 * Execute the given Runnable, catch any {@link AssertionError}, log details
+	 * about the request and response at ERROR level under the class log
+	 * category, and after that re-throw the error.
 	 */
 	public void assertWithDiagnostics(Runnable assertion) {
 		try {

From 1b3fd9edfffd78a90da820d04455acbdbc3d4661 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 6 Sep 2021 13:53:30 +0100
Subject: [PATCH 085/140] Ensure one time logging for request details

Closes gh-26969
---
 .../web/reactive/server/ExchangeResult.java   |  7 ++++++-
 .../server/samples/SoftAssertionTests.java    | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
index 27c93773bfa2..e44c3b9f06c8 100644
--- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
+++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/ExchangeResult.java
@@ -79,6 +79,9 @@ public class ExchangeResult {
 	@Nullable
 	private final Object mockServerResult;
 
+	/** Ensure single logging, e.g. for expectAll. */
+	private boolean diagnosticsLogged;
+
 
 	/**
 	 * Create an instance with an HTTP request and response along with promises
@@ -121,6 +124,7 @@ public class ExchangeResult {
 		this.timeout = other.timeout;
 		this.uriTemplate = other.uriTemplate;
 		this.mockServerResult = other.mockServerResult;
+		this.diagnosticsLogged = other.diagnosticsLogged;
 	}
 
 
@@ -227,7 +231,8 @@ public void assertWithDiagnostics(Runnable assertion) {
 			assertion.run();
 		}
 		catch (AssertionError ex) {
-			if (logger.isErrorEnabled()) {
+			if (!this.diagnosticsLogged && logger.isErrorEnabled()) {
+				this.diagnosticsLogged = true;
 				logger.error("Request details for assertion failure:\n" + this);
 			}
 			throw ex;
diff --git a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
index a4d4bb8c72fe..db7b242fffd9 100644
--- a/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/SoftAssertionTests.java
@@ -46,15 +46,19 @@ void expectAll() {
 	}
 
 	@Test
-	void expectAllWithMultipleFailures() throws Exception {
-		assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
-			this.webTestClient.get().uri("/test").exchange()
-				.expectAll(
-					responseSpec -> responseSpec.expectStatus().isBadRequest(),
-					responseSpec -> responseSpec.expectStatus().isOk(),
-					responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+	void expectAllWithMultipleFailures() {
+		assertThatExceptionOfType(AssertionError.class)
+				.isThrownBy(() ->
+						this.webTestClient.get().uri("/test").exchange()
+								.expectAll(
+										responseSpec -> responseSpec.expectStatus().isBadRequest(),
+										responseSpec -> responseSpec.expectStatus().isOk(),
+										responseSpec -> responseSpec.expectBody(String.class).isEqualTo("bogus")
+								)
 				)
-		).withMessage("Multiple Exceptions (2):\nStatus expected:<400 BAD_REQUEST> but was:<200 OK>\nResponse body expected:<bogus> but was:<hello>");
+				.withMessage("Multiple Exceptions (2):\n" +
+						"Status expected:<400 BAD_REQUEST> but was:<200 OK>\n" +
+						"Response body expected:<bogus> but was:<hello>");
 	}
 
 

From 87d3d1bbd1e5620fb8c2583c487507bab9614fb2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:52:23 +0200
Subject: [PATCH 086/140] Throw UnsupportedOperationException in
 defaultResponseCharacterEncoding()

This commit updates the defaultResponseCharacterEncoding() `default`
method in ConfigurableMockMvcBuilder so that it throws an
UnsupportedOperationException instead of silently ignoring the user's
request to set the default response character encoding.

Note, however, that AbstractMockMvcBuilder already overrides the
default method with a concrete implementation which is used by default
in MockMvc.

See gh-27230
---
 .../web/servlet/setup/ConfigurableMockMvcBuilder.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index 43ef6ca9547e..145dccc8a3aa 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -86,14 +86,14 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 
 	/**
 	 * Define the default character encoding to be applied to every response.
-	 * <p>The default implementation of this method ignores the supplied value.
-	 * Concrete implementations are therefore encouraged to override this method.
+	 * <p>The default implementation of this method throws an
+	 * {@link UnsupportedOperationException}. Concrete implementations are therefore
+	 * encouraged to override this method.
 	 * @param defaultResponseCharacterEncoding the default response character encoding
 	 * @since 5.3.10
 	 */
-	@SuppressWarnings("unchecked")
 	default <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
-		return (T) this;
+		throw new UnsupportedOperationException();
 	}
 
 	/**

From d1a00b43019843c59a24b89ff97ed43d00768cf9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:58:32 +0200
Subject: [PATCH 087/140] Polishing

See gh-27230
---
 .../test/web/servlet/setup/ConfigurableMockMvcBuilder.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
index 145dccc8a3aa..45b9f05d04a4 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/ConfigurableMockMvcBuilder.java
@@ -93,7 +93,7 @@ public interface ConfigurableMockMvcBuilder<B extends ConfigurableMockMvcBuilder
 	 * @since 5.3.10
 	 */
 	default <T extends B> T defaultResponseCharacterEncoding(Charset defaultResponseCharacterEncoding) {
-		throw new UnsupportedOperationException();
+		throw new UnsupportedOperationException("defaultResponseCharacterEncoding is not supported by this MockMvcBuilder");
 	}
 
 	/**

From 532b4b636d6b347df18f897aaa769aa734477f8b Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 6 Sep 2021 18:13:41 +0200
Subject: [PATCH 088/140] Update CI pipeline with JDK16

This commit replaces the JDK15 build with a JDK16 variant.
This also updates the CI image with a new OS version and updated
JDK versions.
---
 ci/images/ci-image/Dockerfile |  4 ++--
 ci/images/get-jdk-url.sh      |  8 ++++----
 ci/images/setup.sh            |  2 +-
 ci/pipeline.yml               | 18 +++++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 1ce41f37a932..df1be9f33457 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210119
+FROM ubuntu:focal-20210827
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -6,6 +6,6 @@ RUN ./setup.sh java8
 
 ENV JAVA_HOME /opt/openjdk/java8
 ENV JDK11 /opt/openjdk/java11
-ENV JDK15 /opt/openjdk/java15
+ENV JDK16 /opt/openjdk/java16
 
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index f4f3ab84cf40..e170d55171c3 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,13 +3,13 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
 	;;
-  java15)
-		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
+  java16)
+		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
   ;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index b226ab7de75c..ff18f849f40c 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java15
+for jdk in java8 java11 java16
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index eb752fe705cc..f919a1b681fc 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -45,7 +45,7 @@ resource_types:
   type: registry-image
   source:
     repository: springio/artifactory-resource
-    tag: 0.0.13
+    tag: 0.0.17
 - name: github-status-resource
   type: registry-image
   source:
@@ -119,14 +119,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk15-build
+- name: repo-status-jdk16-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk15-build
+    context: jdk16-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -244,7 +244,7 @@ jobs:
           <<: *slack-fail-params
   - put: repo-status-jdk11-build
     params: { state: "success", commit: "git-repo" }
-- name: jdk15-build
+- name: jdk16-build
   serial: true
   public: true
   plan:
@@ -252,7 +252,7 @@ jobs:
     - get: git-repo
     - get: every-morning
       trigger: true
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "pending", commit: "git-repo" }
     - do:
       - task: check-project
@@ -265,12 +265,12 @@ jobs:
           <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk15-build
+          - put: repo-status-jdk16-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk15-build
+    - put: repo-status-jdk16-build
       params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
   serial: true
@@ -292,7 +292,7 @@ jobs:
         privileged: true
         timeout: ((task-timeout))
         params:
-          <<: *build-project-task-params
+          BRANCH: ((branch))
       on_success:
         put: git-pull-request
         params:
@@ -453,7 +453,7 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk15-build"]
+  jobs: ["build", "jdk11-build", "jdk16-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

From 0ec4be37d591bcc8a3f5ae10ac3daa905599bb84 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 6 Sep 2021 16:21:24 +0100
Subject: [PATCH 089/140] Configure optional configuration to consume its
 dependencies' API

Previously, the optional configuration had no usage attribute. This
resulted in it using the default, JAVA_RUNTIME, which caused it to
only consume the runtime produced by its dependencies and not the
API. Given that the optional configuration is added to the compile
classpath, this was incorrect.

This commit updates the optional configuration to be configured to
consume the Java API of its dependencies. The configuration has
also been marked as not being for consumption. This prevents other
projects attempting to consume the optional variant of a project
that has the optional dependencies plugin applied and further
aligns it with Gradle's built-in configurations of a similar nature.

See gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index 93ae77995d10..f4a51cb0e8b8 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -19,6 +19,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -43,6 +44,10 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
+		optional.attributes((attributes) -> attributes.attribute(Usage.USAGE_ATTRIBUTE,
+				project.getObjects().named(Usage.class, Usage.JAVA_API)));
+		optional.setCanBeConsumed(false);
+		optional.setCanBeResolved(true);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
 			SourceSetContainer sourceSets = project.getConvention()
 					.getPlugin(JavaPluginConvention.class).getSourceSets();

From d23afea168b8360d08bf296ac2189239ab9db7fc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 6 Sep 2021 17:19:29 +0100
Subject: [PATCH 090/140] Extend optional rather than adding it to existing
 classpath

This allows the attributes configured on compileClasspath and
runtimeClasspath to independently influence the variant selection when
resolving the optional configuration, allowing it to contribute compile
dependencies (JAVA_API) to the former and runtime dependencies
(JAVA_RUNTIME) to the latter.

Fixes gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index f4a51cb0e8b8..ec4f8b4b1939 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -44,18 +44,14 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
-		optional.attributes((attributes) -> attributes.attribute(Usage.USAGE_ATTRIBUTE,
-				project.getObjects().named(Usage.class, Usage.JAVA_API)));
 		optional.setCanBeConsumed(false);
-		optional.setCanBeResolved(true);
+		optional.setCanBeResolved(false);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			SourceSetContainer sourceSets = project.getConvention()
-					.getPlugin(JavaPluginConvention.class).getSourceSets();
+			SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
+					.getSourceSets();
 			sourceSets.all((sourceSet) -> {
-				sourceSet.setCompileClasspath(
-						sourceSet.getCompileClasspath().plus(optional));
-				sourceSet.setRuntimeClasspath(
-						sourceSet.getRuntimeClasspath().plus(optional));
+				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
+				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
 			});
 		});
 		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {

From 77a6dce1b58bbd11ec4c7c110c08cb20af38d8d8 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 6 Sep 2021 19:15:00 +0200
Subject: [PATCH 091/140] Review Servlet API version in Spring OXM tests

This commit ensures that Servlet 4.0+ is used in the Spring OXM test
suite, as Servlet 4 specific APIs are used in the tests.

This problem was uncovered while fixing gh-27365
---
 spring-orm/spring-orm.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 8a8ad57ac4c3..285e044a14b4 100644
--- a/spring-orm/spring-orm.gradle
+++ b/spring-orm/spring-orm.gradle
@@ -10,7 +10,7 @@ dependencies {
 	optional(project(":spring-web"))
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
 	optional("org.hibernate:hibernate-core")
-	optional("javax.servlet:javax.servlet-api:3.1.0")
+	optional("javax.servlet:javax.servlet-api")
 	testCompile(testFixtures(project(":spring-beans")))
 	testCompile(testFixtures(project(":spring-context")))
 	testCompile(testFixtures(project(":spring-core")))

From e7b499f7b6d0020e0c8ac38bd9e267f1e7f2506c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 10:45:44 +0200
Subject: [PATCH 092/140] Upgrade to JMH 1.32 and avoid accidental dependency
 on jopt-simple 4.6

JMH is now implicitly configured to use jopt-simple 5.0.4 instead of 4.6.

This problem was uncovered while fixing gh-27365
---
 gradle/spring-module.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
index e0faef367adb..4b2b23d60ade 100644
--- a/gradle/spring-module.gradle
+++ b/gradle/spring-module.gradle
@@ -8,9 +8,9 @@ apply plugin: 'me.champeau.jmh'
 apply from: "$rootDir/gradle/publications.gradle"
 
 dependencies {
-	jmh 'org.openjdk.jmh:jmh-core:1.28'
-	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.28'
-	jmh 'net.sf.jopt-simple:jopt-simple:4.6'
+	jmh 'org.openjdk.jmh:jmh-core:1.32'
+	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.32'
+	jmh 'net.sf.jopt-simple:jopt-simple'
 }
 
 jmh {

From d7ea4d230f3e00b54e12c823d710b2f3c8422524 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 10:49:48 +0200
Subject: [PATCH 093/140] Remove Eclipse-specific code from
 OptionalDependenciesPlugin

To support the recent changes to our `optional` dependencies plugin,
this commit removes the Eclipse-specific code which no longer appears
to be necessary.

Closes gh-27365
---
 .../build/optional/OptionalDependenciesPlugin.java          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
index ec4f8b4b1939..a7e7101daee7 100644
--- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
@@ -54,12 +54,6 @@ public void apply(Project project) {
 				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
 			});
 		});
-		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
-			project.getExtensions().getByType(EclipseModel.class)
-					.classpath((classpath) -> {
-						classpath.getPlusConfigurations().add(optional);
-					});
-		});
 	}
 
 }
\ No newline at end of file

From 19283c92459aef68cdfe738fd8bdf17b49597058 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 11:32:28 +0200
Subject: [PATCH 094/140] Avoid accidental dependency on older version of Byte
 Buddy

This commit allows Mockito-based tests in spring-test to work again
in Eclipse IDE.

This problem was uncovered while fixing gh-27365
---
 spring-test/spring-test.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 1223fdff57a9..e27977c1af02 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -30,8 +30,12 @@ dependencies {
 	optional("org.hamcrest:hamcrest")
 	optional("org.apache.taglibs:taglibs-standard-jstlel")
 	optional("net.sourceforge.htmlunit:htmlunit")
-	optional("org.seleniumhq.selenium:htmlunit-driver")
-	optional("org.seleniumhq.selenium:selenium-java")
+	optional("org.seleniumhq.selenium:htmlunit-driver") {
+		exclude group: "net.bytebuddy", module: "byte-buddy"
+	}
+	optional("org.seleniumhq.selenium:selenium-java") {
+		exclude group: "net.bytebuddy", module: "byte-buddy"
+	}
 	optional("org.xmlunit:xmlunit-matchers")
 	optional("org.skyscreamer:jsonassert")
 	optional("com.jayway.jsonpath:json-path")

From 417bce8be5e32ae43c2e3b25de1e24cd03c71e93 Mon Sep 17 00:00:00 2001
From: Yin-Jui <ckjimmy634@gmail.com>
Date: Thu, 27 May 2021 01:38:49 -0700
Subject: [PATCH 095/140] Add tests for MessageBodyClientHttpResponseWrapper

Closes gh-26984
---
 ...ageBodyClientHttpResponseWrapperTests.java | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java

diff --git a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
new file mode 100644
index 000000000000..2c116ac5a917
--- /dev/null
+++ b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.web.client;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Unit tests for {MessageBodyClientHttpResponseWrapper}.
+ *
+ * @author Yin-Jui Liao
+ */
+class MessageBodyClientHttpResponseWrapperTests {
+
+	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+
+	@Test
+	void testMessageBodyNotExist() throws IOException {
+		given(response.getBody()).willReturn(null);
+		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+		assertThat(responseWrapper.hasEmptyMessageBody()).isTrue();
+	}
+
+	@Test
+	void testMessageBodyExist() throws IOException {
+		String body = "Accepted request";
+		InputStream stream = new ByteArrayInputStream(body.getBytes());
+		given(response.getBody()).willReturn(stream);
+		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+		assertThat(responseWrapper.hasEmptyMessageBody()).isFalse();
+	}
+}

From d8191b48088b0ac2843b64beac861ddfcb99d9dd Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 7 Sep 2021 14:23:58 +0200
Subject: [PATCH 096/140] Polish contribution

See gh-26984
---
 .../MessageBodyClientHttpResponseWrapper.java |  4 +--
 ...ageBodyClientHttpResponseWrapperTests.java | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
index 85e1c8f1b7e8..6565adc45f93 100644
--- a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse {
 	private PushbackInputStream pushbackInputStream;
 
 
-	public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) throws IOException {
+	public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) {
 		this.response = response;
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
index 2c116ac5a917..19568910672d 100644
--- a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java
@@ -13,43 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.client;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
 import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
+
 import org.springframework.http.client.ClientHttpResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
- * Unit tests for {MessageBodyClientHttpResponseWrapper}.
+ * Unit tests for {@link MessageBodyClientHttpResponseWrapper}.
  *
+ * @since 5.3.10
  * @author Yin-Jui Liao
  */
 class MessageBodyClientHttpResponseWrapperTests {
 
 	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
 
+	private final MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
+
+
 	@Test
-	void testMessageBodyNotExist() throws IOException {
+	void messageBodyDoesNotExist() throws Exception {
 		given(response.getBody()).willReturn(null);
-		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
 		assertThat(responseWrapper.hasEmptyMessageBody()).isTrue();
 	}
 
 	@Test
-	void testMessageBodyExist() throws IOException {
-		String body = "Accepted request";
-		InputStream stream = new ByteArrayInputStream(body.getBytes());
+	void messageBodyExists() throws Exception {
+		InputStream stream = new ByteArrayInputStream("content".getBytes());
 		given(response.getBody()).willReturn(stream);
-		MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response);
 		assertThat(responseWrapper.hasEmptyMessageBody()).isFalse();
 	}
+
 }

From 3f66ef7aeebdcc9f599487357294143099242abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Tue, 7 Sep 2021 15:08:15 +0200
Subject: [PATCH 097/140] Compile with parameter names

Compiled code should contain parameter names to avoid the need
for class resources to be included in native image builds.

Closes gh-27369
---
 .../build/compile/CompilerConventionsPlugin.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
index 5284df28f124..f2424c549e50 100644
--- a/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java
@@ -32,6 +32,7 @@
  *
  * @author Brian Clozel
  * @author Sam Brannen
+ * @author Sebastien Deleuze
  */
 public class CompilerConventionsPlugin implements Plugin<Project> {
 
@@ -43,7 +44,8 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		List<String> commonCompilerArgs = Arrays.asList(
 				"-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
 				"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
-				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options"
+				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
+				"-parameters"
 		);
 		COMPILER_ARGS = new ArrayList<>();
 		COMPILER_ARGS.addAll(commonCompilerArgs);
@@ -54,7 +56,7 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		TEST_COMPILER_ARGS = new ArrayList<>();
 		TEST_COMPILER_ARGS.addAll(commonCompilerArgs);
 		TEST_COMPILER_ARGS.addAll(Arrays.asList("-Xlint:-varargs", "-Xlint:-fallthrough", "-Xlint:-rawtypes",
-				"-Xlint:-deprecation", "-Xlint:-unchecked", "-parameters"));
+				"-Xlint:-deprecation", "-Xlint:-unchecked"));
 	}
 
 	@Override

From a3655c48581dd3977de02f13dd3a7ecc3dcde6c2 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 7 Sep 2021 16:33:31 +0100
Subject: [PATCH 098/140] Add tip related to user destinations in STOMP

See gh-26986
---
 src/docs/asciidoc/web/websocket.adoc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 080a75e0ab3f..07751ff57317 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1818,12 +1818,16 @@ its own implementation of `WebSocketMessageBrokerConfigurer` that is marked with
 An application can send messages that target a specific user, and Spring's STOMP support
 recognizes destinations prefixed with `/user/` for this purpose.
 For example, a client might subscribe to the `/user/queue/position-updates` destination.
-This destination is handled by the `UserDestinationMessageHandler` and
-transformed into a destination unique to the user session
-(such as `/queue/position-updates-user123`). This provides the convenience of subscribing
-to a generically named destination while, at the same time, ensuring no collisions
-with other users who subscribe to the same destination so that each user can receive
-unique stock position updates.
+`UserDestinationMessageHandler` handles this destination and transforms it into a
+destination unique to the user session (such as `/queue/position-updates-user123`).
+This provides the convenience of subscribing to a generically named destination while,
+at the same time, ensuring no collisions with other users who subscribe to the same
+destination so that each user can receive unique stock position updates.
+
+TIP: When working with user destinations, it is important to configure broker and
+application destination prefixes as shown in <<websocket-stomp-enable>>, or otherwise the
+broker would handle "/user" prefixed messages that should only be handled by
+`UserDestinationMessageHandler`.
 
 On the sending side, messages can be sent to a destination such as
 pass:q[`/user/{username}/queue/position-updates`], which in turn is translated

From 55b3e064e93c376b9c60ec9458b56b0b20f6f184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Wed, 8 Sep 2021 09:32:25 +0200
Subject: [PATCH 099/140] Upgrade to Kotlin 1.5.30

Also upgrades related libraries:
- Coroutines upgraded to 1.5.2
- Serialization upgraded to 1.2.2

Closes gh-27371
---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 69b6cf85bb30..2236e11b462e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.5.21' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '0.10.1' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.1.0'
 	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
@@ -10,7 +10,7 @@ plugins {
 	id "com.github.ben-manes.versions" version '0.28.0'
 	id "com.github.johnrengelman.shadow" version "6.1.0" apply false
 	id "me.champeau.jmh" version "0.6.4" apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.21" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
 
@@ -33,9 +33,9 @@ configure(allprojects) { project ->
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.21"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.1"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.1"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.7.2"
 		}
 		dependencies {

From 8f33450df20352ad6eabe632c082d9b02cb46c9a Mon Sep 17 00:00:00 2001
From: Grant Fleming <grantgfleming@googlemail.com>
Date: Thu, 9 Sep 2021 12:26:44 +0100
Subject: [PATCH 100/140] Fix typo in core-beans.adoc

Closes gh-27377
---
 src/docs/asciidoc/core/core-beans.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 487ef6f4a1ea..2a8c526d2617 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -11188,7 +11188,7 @@ The following table lists features provided by the `BeanFactory` and
 | No
 | Yes
 
-| Convenient `MessageSource` access (for internalization)
+| Convenient `MessageSource` access (for internationalization)
 | No
 | Yes
 

From 1dc128361f87b3708f796ec0b4b3565ca28f8ba6 Mon Sep 17 00:00:00 2001
From: hantsy <hantsy@gmail.com>
Date: Sat, 28 Aug 2021 11:20:12 +0800
Subject: [PATCH 101/140] Add SmallRye Mutiny adapters

Closes gh-26222
---
 build.gradle                                  |  1 +
 spring-core/spring-core.gradle                |  1 +
 .../core/ReactiveAdapterRegistry.java         | 27 +++++++++++
 .../core/ReactiveAdapterRegistryTests.java    | 48 +++++++++++++++++++
 4 files changed, 77 insertions(+)

diff --git a/build.gradle b/build.gradle
index 2236e11b462e..b7a5d0330faa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,6 +68,7 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
+			dependency "io.smallrye.reactive:mutiny:1.0.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index a4166705d32d..822b6ed58acd 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -49,6 +49,7 @@ dependencies {
 	optional("io.reactivex:rxjava-reactive-streams")
 	optional("io.reactivex.rxjava2:rxjava")
 	optional("io.reactivex.rxjava3:rxjava")
+	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("com.google.code.findbugs:jsr305")
diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index a5a8b9295092..4cbb90c0c606 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -24,6 +24,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.CompletableDeferredKt;
 import kotlinx.coroutines.Deferred;
 import org.reactivestreams.Publisher;
@@ -72,6 +74,8 @@ public class ReactiveAdapterRegistry {
 
 	private static final boolean kotlinCoroutinesPresent;
 
+	private static final boolean mutinyPresent;
+
 	static {
 		ClassLoader classLoader = ReactiveAdapterRegistry.class.getClassLoader();
 		reactorPresent = ClassUtils.isPresent("reactor.core.publisher.Flux", classLoader);
@@ -81,6 +85,7 @@ public class ReactiveAdapterRegistry {
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
 		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
+		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Uni", classLoader);
 	}
 
 	private final List<ReactiveAdapter> adapters = new ArrayList<>();
@@ -121,6 +126,11 @@ public ReactiveAdapterRegistry() {
 		if (reactorPresent && kotlinCoroutinesPresent) {
 			new CoroutinesRegistrar().registerAdapters(this);
 		}
+
+		// SmallRye Mutiny
+		if (mutinyPresent) {
+			new MutinyRegistrar().registerAdapters(this);
+		}
 	}
 
 
@@ -417,6 +427,23 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
+	private static class MutinyRegistrar {
+
+		void registerAdapters(ReactiveAdapterRegistry registry) {
+			registry.registerReactiveType(
+					ReactiveTypeDescriptor.singleOptionalValue(Uni.class, ()-> Uni.createFrom().nothing()),
+					uni ->((Uni<?>)uni).convert().toPublisher(),
+					publisher ->  Uni.createFrom().publisher(publisher)
+			);
+
+			registry.registerReactiveType(
+					ReactiveTypeDescriptor.multiValue(Multi.class, ()-> Multi.createFrom().empty()),
+					multi -> (Multi<?>) multi,
+					publisher-> Multi.createFrom().publisher(publisher)
+			);
+		}
+	}
+
 
 	/**
 	 * {@code BlockHoundIntegration} for spring-core classes.
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 4dc08a704f29..535891e6ff3e 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import io.smallrye.mutiny.Multi;
+import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.Deferred;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -357,6 +359,52 @@ void deferred() {
 		}
 	}
 
+	// SmallRye Mutiny
+	@Nested
+	class Mutiny {
+
+		@Test
+		void defaultAdapterRegistrations() {
+			assertThat(getAdapter(io.smallrye.mutiny.Uni.class)).isNotNull();
+			assertThat(getAdapter(io.smallrye.mutiny.Multi.class)).isNotNull();
+		}
+
+		@Test
+		void toUni() {
+			Publisher<Integer> source = Mono.just(1);
+			Object target = getAdapter(Uni.class).fromPublisher(source);
+			assertThat(target).isInstanceOf(Uni.class);
+			assertThat(((Uni<Integer>) target).await().atMost(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+		}
+
+		@Test
+		void fromUni() {
+			Uni<Integer> source = Uni.createFrom().item(1);
+			Object target = getAdapter(Uni.class).toPublisher(source);
+			assertThat(target).isInstanceOf(Mono.class);
+			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+		}
+
+		@Test
+		void toMulti() {
+			List<Integer> sequence = Arrays.asList(1, 2, 3);
+			Publisher<Integer> source = Flux.fromIterable(sequence);
+			Object target = getAdapter(Multi.class).fromPublisher(source);
+			assertThat(target).isInstanceOf(Multi.class);
+			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(Duration.ofMillis(1000))).isEqualTo(sequence);
+		}
+
+		@Test
+		void fromMulti() {
+			List<Integer> sequence = Arrays.asList(1, 2, 3);
+			Multi<Integer> source = Multi.createFrom().iterable(sequence);
+			Object target = getAdapter(Multi.class).toPublisher(source);
+			assertThat(target).isInstanceOf(Flux.class);
+			assertThat(((Flux<Integer>) target).blockLast(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(3));
+		}
+
+	}
+
 	private ReactiveAdapter getAdapter(Class<?> reactiveType) {
 		ReactiveAdapter adapter = this.registry.getAdapter(reactiveType);
 		assertThat(adapter).isNotNull();

From 41ab2687338c6419cb0f04c1bf79a9c52157a861 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Wed, 8 Sep 2021 16:59:28 +0100
Subject: [PATCH 102/140] Polishing contribution

See gh-27331
---
 .../core/ReactiveAdapterRegistry.java         | 21 +++++-----
 .../core/ReactiveAdapterRegistryTests.java    | 40 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
index 4cbb90c0c606..cfeaffcaf734 100644
--- a/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
@@ -24,8 +24,6 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
-import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.Uni;
 import kotlinx.coroutines.CompletableDeferredKt;
 import kotlinx.coroutines.Deferred;
 import org.reactivestreams.Publisher;
@@ -85,7 +83,7 @@ public class ReactiveAdapterRegistry {
 		rxjava3Present = ClassUtils.isPresent("io.reactivex.rxjava3.core.Flowable", classLoader);
 		flowPublisherPresent = ClassUtils.isPresent("java.util.concurrent.Flow.Publisher", classLoader);
 		kotlinCoroutinesPresent = ClassUtils.isPresent("kotlinx.coroutines.reactor.MonoKt", classLoader);
-		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Uni", classLoader);
+		mutinyPresent = ClassUtils.isPresent("io.smallrye.mutiny.Multi", classLoader);
 	}
 
 	private final List<ReactiveAdapter> adapters = new ArrayList<>();
@@ -427,19 +425,24 @@ void registerAdapters(ReactiveAdapterRegistry registry) {
 		}
 	}
 
+
 	private static class MutinyRegistrar {
 
 		void registerAdapters(ReactiveAdapterRegistry registry) {
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.singleOptionalValue(Uni.class, ()-> Uni.createFrom().nothing()),
-					uni ->((Uni<?>)uni).convert().toPublisher(),
-					publisher ->  Uni.createFrom().publisher(publisher)
+					ReactiveTypeDescriptor.singleOptionalValue(
+							io.smallrye.mutiny.Uni.class,
+							() -> io.smallrye.mutiny.Uni.createFrom().nothing()),
+					uni -> ((io.smallrye.mutiny.Uni<?>) uni).convert().toPublisher(),
+					publisher -> io.smallrye.mutiny.Uni.createFrom().publisher(publisher)
 			);
 
 			registry.registerReactiveType(
-					ReactiveTypeDescriptor.multiValue(Multi.class, ()-> Multi.createFrom().empty()),
-					multi -> (Multi<?>) multi,
-					publisher-> Multi.createFrom().publisher(publisher)
+					ReactiveTypeDescriptor.multiValue(
+							io.smallrye.mutiny.Multi.class,
+							() -> io.smallrye.mutiny.Multi.createFrom().empty()),
+					multi -> (io.smallrye.mutiny.Multi<?>) multi,
+					publisher -> io.smallrye.mutiny.Multi.createFrom().publisher(publisher)
 			);
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
index 535891e6ff3e..579e1a463afc 100644
--- a/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ReactiveAdapterRegistryTests.java
@@ -40,6 +40,9 @@
 @SuppressWarnings("unchecked")
 class ReactiveAdapterRegistryTests {
 
+	private static final Duration ONE_SECOND = Duration.ofSeconds(1);
+
+
 	private final ReactiveAdapterRegistry registry = ReactiveAdapterRegistry.getSharedInstance();
 
 
@@ -85,7 +88,7 @@ void toFlux() {
 			Publisher<Integer> source = io.reactivex.rxjava3.core.Flowable.fromIterable(sequence);
 			Object target = getAdapter(Flux.class).fromPublisher(source);
 			assertThat(target instanceof Flux).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -93,7 +96,7 @@ void toMono() {
 			Publisher<Integer> source = io.reactivex.rxjava3.core.Flowable.fromArray(1, 2, 3);
 			Object target = getAdapter(Mono.class).fromPublisher(source);
 			assertThat(target instanceof Mono).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -110,7 +113,7 @@ void fromCompletableFuture() {
 			future.complete(1);
 			Object target = getAdapter(CompletableFuture.class).toPublisher(future);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 	}
 
@@ -155,7 +158,7 @@ void fromObservable() {
 			Object source = rx.Observable.from(sequence);
 			Object target = getAdapter(rx.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -163,7 +166,7 @@ void fromSingle() {
 			Object source = rx.Single.just(1);
 			Object target = getAdapter(rx.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -171,7 +174,7 @@ void fromCompletable() {
 			Object source = rx.Completable.complete();
 			Object target = getAdapter(rx.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -229,7 +232,7 @@ void fromFlowable() {
 			Object source = io.reactivex.Flowable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.Flowable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -238,7 +241,7 @@ void fromObservable() {
 			Object source = io.reactivex.Observable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -246,7 +249,7 @@ void fromSingle() {
 			Object source = io.reactivex.Single.just(1);
 			Object target = getAdapter(io.reactivex.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -254,7 +257,7 @@ void fromCompletable() {
 			Object source = io.reactivex.Completable.complete();
 			Object target = getAdapter(io.reactivex.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -312,7 +315,7 @@ void fromFlowable() {
 			Object source = io.reactivex.rxjava3.core.Flowable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Flowable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -321,7 +324,7 @@ void fromObservable() {
 			Object source = io.reactivex.rxjava3.core.Observable.fromIterable(sequence);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Observable.class).toPublisher(source);
 			assertThat(target instanceof Flux).as("Expected Flux Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Flux<Integer>) target).collectList().block(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Flux<Integer>) target).collectList().block(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -329,7 +332,7 @@ void fromSingle() {
 			Object source = io.reactivex.rxjava3.core.Single.just(1);
 			Object target = getAdapter(io.reactivex.rxjava3.core.Single.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -337,7 +340,7 @@ void fromCompletable() {
 			Object source = io.reactivex.rxjava3.core.Completable.complete();
 			Object target = getAdapter(io.reactivex.rxjava3.core.Completable.class).toPublisher(source);
 			assertThat(target instanceof Mono).as("Expected Mono Publisher: " + target.getClass().getName()).isTrue();
-			((Mono<Void>) target).block(Duration.ofMillis(1000));
+			((Mono<Void>) target).block(ONE_SECOND);
 		}
 	}
 
@@ -359,7 +362,6 @@ void deferred() {
 		}
 	}
 
-	// SmallRye Mutiny
 	@Nested
 	class Mutiny {
 
@@ -374,7 +376,7 @@ void toUni() {
 			Publisher<Integer> source = Mono.just(1);
 			Object target = getAdapter(Uni.class).fromPublisher(source);
 			assertThat(target).isInstanceOf(Uni.class);
-			assertThat(((Uni<Integer>) target).await().atMost(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Uni<Integer>) target).await().atMost(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -382,7 +384,7 @@ void fromUni() {
 			Uni<Integer> source = Uni.createFrom().item(1);
 			Object target = getAdapter(Uni.class).toPublisher(source);
 			assertThat(target).isInstanceOf(Mono.class);
-			assertThat(((Mono<Integer>) target).block(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(1));
+			assertThat(((Mono<Integer>) target).block(ONE_SECOND)).isEqualTo(Integer.valueOf(1));
 		}
 
 		@Test
@@ -391,7 +393,7 @@ void toMulti() {
 			Publisher<Integer> source = Flux.fromIterable(sequence);
 			Object target = getAdapter(Multi.class).fromPublisher(source);
 			assertThat(target).isInstanceOf(Multi.class);
-			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(Duration.ofMillis(1000))).isEqualTo(sequence);
+			assertThat(((Multi<Integer>) target).collect().asList().await().atMost(ONE_SECOND)).isEqualTo(sequence);
 		}
 
 		@Test
@@ -400,7 +402,7 @@ void fromMulti() {
 			Multi<Integer> source = Multi.createFrom().iterable(sequence);
 			Object target = getAdapter(Multi.class).toPublisher(source);
 			assertThat(target).isInstanceOf(Flux.class);
-			assertThat(((Flux<Integer>) target).blockLast(Duration.ofMillis(1000))).isEqualTo(Integer.valueOf(3));
+			assertThat(((Flux<Integer>) target).blockLast(ONE_SECOND)).isEqualTo(Integer.valueOf(3));
 		}
 
 	}

From b6037d0d07efee37ddc7200f80f31b862cbed04c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Thu, 9 Sep 2021 15:37:58 +0100
Subject: [PATCH 103/140] Correctly format class name in default package

Closes gh-27247
---
 .../invocation/AbstractMethodMessageHandler.java     | 12 ++++++++----
 .../reactive/AbstractMethodMessageHandler.java       | 12 ++++++++----
 .../result/method/AbstractHandlerMethodMapping.java  | 10 +++++++---
 .../handler/AbstractHandlerMethodMapping.java        | 10 +++++++---
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
index fc50155039c4..f160d506eed7 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
@@ -319,9 +320,12 @@ protected final void detectHandlerMethods(final Object handler) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
index 1d85930585cb..a240f4d8efa0 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.RouteMatcher;
+import org.springframework.util.StringUtils;
 
 /**
  * Abstract base class for reactive HandlerMethod-based message handling.
@@ -341,9 +342,12 @@ protected final void detectHandlerMethods(Object handler) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
index 93ff062651e1..c2e01aaeff70 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
@@ -42,6 +42,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.reactive.CorsUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -222,9 +223,12 @@ else if (mappingsLogger.isDebugEnabled()) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
index 367ca74997da..46f1707d1cfb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java
@@ -44,6 +44,7 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -301,9 +302,12 @@ else if (mappingsLogger.isDebugEnabled()) {
 	}
 
 	private String formatMappings(Class<?> userType, Map<Method, T> methods) {
-		String formattedType = Arrays.stream(ClassUtils.getPackageName(userType).split("\\."))
-				.map(p -> p.substring(0, 1))
-				.collect(Collectors.joining(".", "", "." + userType.getSimpleName()));
+		String packageName = ClassUtils.getPackageName(userType);
+		String formattedType = (StringUtils.hasText(packageName) ?
+				Arrays.stream(packageName.split("\\."))
+						.map(packageSegment -> packageSegment.substring(0, 1))
+						.collect(Collectors.joining(".", "", "." + userType.getSimpleName())) :
+				userType.getSimpleName());
 		Function<Method, String> methodFormatter = method -> Arrays.stream(method.getParameterTypes())
 				.map(Class::getSimpleName)
 				.collect(Collectors.joining(",", "(", ")"));

From 63ffa710d6d9b8f5b6e615b7c7c92ff62f6c421a Mon Sep 17 00:00:00 2001
From: Ruslan Stelmachenko <xak2000@gmail.com>
Date: Thu, 9 Sep 2021 01:43:20 +0300
Subject: [PATCH 104/140] Include all bytes of body in
 UnknownContentTypeException

HttpMessageConverterExtractor uses MessageBodyClientHttpResponseWrapper
which may read the first byte of the response stream to check if there
is content. After that it is necessary to use the wrapper to get the
full body.

This commit ensures that when UnknownContentTypeException is raised
it gets the body through the wrapper, or otherwise the first byte is
missed if the InputStream is not markable.

Closes gh-27374
---
 .../client/HttpMessageConverterExtractor.java |  4 ++--
 .../HttpMessageConverterExtractorTests.java   | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index 771a444bd731..dc515cc91d6a 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -122,8 +122,8 @@ public T extractData(ClientHttpResponse response) throws IOException {
 		}
 
 		throw new UnknownContentTypeException(this.responseType, contentType,
-				response.getRawStatusCode(), response.getStatusText(), response.getHeaders(),
-				getResponseBody(response));
+				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(), responseWrapper.getHeaders(),
+				getResponseBody(responseWrapper));
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index 2374a0d95487..de86b8671de0 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -38,6 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -194,4 +195,23 @@ public void converterThrowsHttpMessageNotReadableException() throws IOException
 			.withCauseInstanceOf(HttpMessageNotReadableException.class);
 	}
 
+	@Test
+	public void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
+		responseHeaders.setContentType(contentType);
+		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
+		given(response.getHeaders()).willReturn(responseHeaders);
+		given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes())  {
+			@Override
+			public boolean markSupported() {
+				return false;
+			}
+		});
+		given(converter.canRead(String.class, contentType)).willReturn(false);
+
+		UnknownContentTypeException unknownContentTypeException =
+				catchThrowableOfType(() -> extractor.extractData(response), UnknownContentTypeException.class);
+		assertThat(unknownContentTypeException).isNotNull();
+		assertThat(unknownContentTypeException.getResponseBodyAsString()).isEqualTo("Foobar");
+	}
+
 }

From c23f0cd070aa2e5429fadf4a41e670533c4016c8 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Fri, 10 Sep 2021 11:22:01 +0100
Subject: [PATCH 105/140] Polishing contribution

See gh-27374
---
 .../web/client/HttpMessageConverterExtractor.java      |  4 ++--
 .../web/client/HttpMessageConverterExtractorTests.java | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index dc515cc91d6a..45cc426a0679 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -122,8 +122,8 @@ public T extractData(ClientHttpResponse response) throws IOException {
 		}
 
 		throw new UnknownContentTypeException(this.responseType, contentType,
-				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(), responseWrapper.getHeaders(),
-				getResponseBody(responseWrapper));
+				responseWrapper.getRawStatusCode(), responseWrapper.getStatusText(),
+				responseWrapper.getHeaders(), getResponseBody(responseWrapper));
 	}
 
 	/**
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index de86b8671de0..bb4acdf5e061 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -208,10 +208,10 @@ public boolean markSupported() {
 		});
 		given(converter.canRead(String.class, contentType)).willReturn(false);
 
-		UnknownContentTypeException unknownContentTypeException =
-				catchThrowableOfType(() -> extractor.extractData(response), UnknownContentTypeException.class);
-		assertThat(unknownContentTypeException).isNotNull();
-		assertThat(unknownContentTypeException.getResponseBodyAsString()).isEqualTo("Foobar");
+		UnknownContentTypeException exception = catchThrowableOfType(
+				() -> extractor.extractData(response), UnknownContentTypeException.class);
+		assertThat(exception).isNotNull();
+		assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar");
 	}
 
 }

From c3e424c29a5c72c3e9d69e9722f91d52f4a0c6fe Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 10 Sep 2021 16:01:23 +0200
Subject: [PATCH 106/140] Polishing

---
 .../HttpMessageConverterExtractorTests.java   | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index bb4acdf5e061..e9d6bd1da382 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -38,7 +38,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.catchThrowableOfType;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -51,7 +50,7 @@
  * @author Brian Clozel
  * @author Sam Brannen
  */
-public class HttpMessageConverterExtractorTests {
+class HttpMessageConverterExtractorTests {
 
 	@SuppressWarnings("unchecked")
 	private final HttpMessageConverter<String> converter = mock(HttpMessageConverter.class);
@@ -62,7 +61,7 @@ public class HttpMessageConverterExtractorTests {
 
 
 	@Test
-	public void constructorPreconditions() {
+	void constructorPreconditions() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new HttpMessageConverterExtractor<>(String.class, (List<HttpMessageConverter<?>>) null))
 				.withMessage("'messageConverters' must not be empty");
@@ -72,7 +71,7 @@ public void constructorPreconditions() {
 	}
 
 	@Test
-	public void noContent() throws IOException {
+	void noContent() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.NO_CONTENT.value());
 
 		Object result = extractor.extractData(response);
@@ -80,7 +79,7 @@ public void noContent() throws IOException {
 	}
 
 	@Test
-	public void notModified() throws IOException {
+	void notModified() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.NOT_MODIFIED.value());
 
 		Object result = extractor.extractData(response);
@@ -88,7 +87,7 @@ public void notModified() throws IOException {
 	}
 
 	@Test
-	public void informational() throws IOException {
+	void informational() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.CONTINUE.value());
 
 		Object result = extractor.extractData(response);
@@ -96,7 +95,7 @@ public void informational() throws IOException {
 	}
 
 	@Test
-	public void zeroContentLength() throws IOException {
+	void zeroContentLength() throws IOException {
 		responseHeaders.setContentLength(0);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -106,7 +105,7 @@ public void zeroContentLength() throws IOException {
 	}
 
 	@Test
-	public void emptyMessageBody() throws IOException {
+	void emptyMessageBody() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
 		given(response.getBody()).willReturn(new ByteArrayInputStream("".getBytes()));
@@ -116,7 +115,7 @@ public void emptyMessageBody() throws IOException {
 	}
 
 	@Test // gh-22265
-	public void nullMessageBody() throws IOException {
+	void nullMessageBody() throws IOException {
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
 		given(response.getBody()).willReturn(null);
@@ -126,7 +125,7 @@ public void nullMessageBody() throws IOException {
 	}
 
 	@Test
-	public void normal() throws IOException {
+	void normal() throws IOException {
 		responseHeaders.setContentType(contentType);
 		String expected = "Foo";
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
@@ -140,7 +139,7 @@ public void normal() throws IOException {
 	}
 
 	@Test
-	public void cannotRead() throws IOException {
+	void cannotRead() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -151,7 +150,7 @@ public void cannotRead() throws IOException {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void generics() throws IOException {
+	void generics() throws IOException {
 		responseHeaders.setContentType(contentType);
 		String expected = "Foo";
 		ParameterizedTypeReference<List<String>> reference = new ParameterizedTypeReference<List<String>>() {};
@@ -171,7 +170,7 @@ public void generics() throws IOException {
 	}
 
 	@Test  // SPR-13592
-	public void converterThrowsIOException() throws IOException {
+	void converterThrowsIOException() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -184,7 +183,7 @@ public void converterThrowsIOException() throws IOException {
 	}
 
 	@Test  // SPR-13592
-	public void converterThrowsHttpMessageNotReadableException() throws IOException {
+	void converterThrowsHttpMessageNotReadableException() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -196,7 +195,7 @@ public void converterThrowsHttpMessageNotReadableException() throws IOException
 	}
 
 	@Test
-	public void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
+	void unknownContentTypeExceptionContainsCorrectResponseBody() throws IOException {
 		responseHeaders.setContentType(contentType);
 		given(response.getRawStatusCode()).willReturn(HttpStatus.OK.value());
 		given(response.getHeaders()).willReturn(responseHeaders);
@@ -208,10 +207,8 @@ public boolean markSupported() {
 		});
 		given(converter.canRead(String.class, contentType)).willReturn(false);
 
-		UnknownContentTypeException exception = catchThrowableOfType(
-				() -> extractor.extractData(response), UnknownContentTypeException.class);
-		assertThat(exception).isNotNull();
-		assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar");
+		assertThatExceptionOfType(UnknownContentTypeException.class).isThrownBy(() -> extractor.extractData(response))
+			.satisfies(exception -> assertThat(exception.getResponseBodyAsString()).isEqualTo("Foobar"));
 	}
 
 }

From bb45a7ae5ea45670884434ba15924d3490527e8a Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sat, 11 Sep 2021 00:00:57 +0200
Subject: [PATCH 107/140] Fix bug fix icon in changelog configuration

Closes gh-27384
---
 ci/config/changelog-generator.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
index 248e58db739e..a029e25582e4 100644
--- a/ci/config/changelog-generator.yml
+++ b/ci/config/changelog-generator.yml
@@ -4,7 +4,7 @@ changelog:
     - title: ":star: New Features"
       labels:
         - "type: enhancement"
-    - title: ":beetle: Bug Fixes"
+    - title: ":lady_beetle: Bug Fixes"
       labels:
         - "type: bug"
         - "type: regression"

From 78dd219787c7087a4804c5b3a815ee1c614324a5 Mon Sep 17 00:00:00 2001
From: Radek Crlik <radekcrlik@gmail.com>
Date: Sat, 11 Sep 2021 17:42:51 +0200
Subject: [PATCH 108/140] Fix misplaced comma in AOP doc

See gh-27387
---
 src/docs/asciidoc/core/core-aop.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index d4e4a9a6e7ce..a6412096e492 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -2830,7 +2830,7 @@ The corresponding Spring configuration is as follows:
 	</bean>
 ----
 
-Notice that, for the time, being we assume that all business services are idempotent. If
+Notice that, for the time being, we assume that all business services are idempotent. If
 this is not the case, we can refine the aspect so that it retries only genuinely
 idempotent operations, by introducing an `Idempotent` annotation and using the annotation
 to annotate the implementation of service operations, as the following example shows:

From cecc0849a8c9a912004a843561a8458e7925ce3c Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Fri, 21 May 2021 21:16:30 +0200
Subject: [PATCH 109/140] Upgrade to Gradle 7.2

This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.

See gh-26870
---
 build.gradle                                  |  38 +--
 gradle/docs.gradle                            |  79 +++---
 gradle/spring-module.gradle                   |   4 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       | 257 +++++++++++-------
 integration-tests/integration-tests.gradle    |  40 +--
 spring-aop/spring-aop.gradle                  |   9 +-
 spring-aspects/spring-aspects.gradle          |  16 +-
 spring-beans/spring-beans.gradle              |   6 +-
 .../spring-context-indexer.gradle             |  10 +-
 .../spring-context-support.gradle             |  30 +-
 spring-context/spring-context.gradle          |  38 +--
 .../kotlin-coroutines.gradle                  |  10 +-
 spring-core/spring-core.gradle                |  32 +--
 spring-expression/spring-expression.gradle    |   8 +-
 spring-jdbc/spring-jdbc.gradle                |  10 +-
 spring-jms/spring-jms.gradle                  |  14 +-
 spring-messaging/spring-messaging.gradle      |  46 ++--
 spring-orm/spring-orm.gradle                  |  22 +-
 spring-oxm/spring-oxm.gradle                  |  22 +-
 spring-r2dbc/spring-r2dbc.gradle              |  24 +-
 spring-test/spring-test.gradle                |  64 ++---
 spring-tx/spring-tx.gradle                    |  18 +-
 spring-web/spring-web.gradle                  |  52 ++--
 spring-webflux/spring-webflux.gradle          |  66 ++---
 spring-webmvc/spring-webmvc.gradle            |  72 ++---
 spring-websocket/spring-websocket.gradle      |  16 +-
 28 files changed, 521 insertions(+), 484 deletions(-)

diff --git a/build.gradle b/build.gradle
index b7a5d0330faa..059b5fec1d3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
-	id 'org.jetbrains.dokka' version '0.10.1' apply false
+	id 'org.jetbrains.dokka' version '1.5.0' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.1.0'
 	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
-	id 'de.undercouch.download' version '4.1.1'
-	id "io.freefair.aspectj" version '5.1.1' apply false
-	id "com.github.ben-manes.versions" version '0.28.0'
-	id "com.github.johnrengelman.shadow" version "6.1.0" apply false
-	id "me.champeau.jmh" version "0.6.4" apply false
+	id 'de.undercouch.download' version '4.1.2'
+	id "io.freefair.aspectj" version '6.1.0' apply false
+	id "com.github.ben-manes.versions" version '0.39.0'
+	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
+	id "me.champeau.jmh" version "0.6.6" apply false
 	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
@@ -342,18 +342,18 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	dependencies {
-		testCompile("org.junit.jupiter:junit-jupiter-api")
-		testCompile("org.junit.jupiter:junit-jupiter-params")
-		testCompile("org.mockito:mockito-core")
-		testCompile("org.mockito:mockito-junit-jupiter")
-		testCompile("io.mockk:mockk")
-		testCompile("org.assertj:assertj-core")
+		testImplementation("org.junit.jupiter:junit-jupiter-api")
+		testImplementation("org.junit.jupiter:junit-jupiter-params")
+		testImplementation("org.mockito:mockito-core")
+		testImplementation("org.mockito:mockito-junit-jupiter")
+		testImplementation("io.mockk:mockk")
+		testImplementation("org.assertj:assertj-core")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntime("org.junit.platform:junit-platform-launcher")
-		testRuntime("org.junit.jupiter:junit-jupiter-engine")
-		testRuntime("org.apache.logging.log4j:log4j-core")
-		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl")
-		testRuntime("org.apache.logging.log4j:log4j-jul")
+		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
@@ -364,7 +364,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javase/8/docs/api/",
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
-			"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
 			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 4b6e139b6513..3d1ee01934b8 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -61,58 +61,41 @@ task api(type: Javadoc) {
 /**
  * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
  */
-dokka {
-	dependsOn {
-		tasks.getByName("api")
-	}
-
-	doFirst {
-		configuration {
-			classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
-			classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
-
-			moduleProjects.findAll {
-				it.pluginManager.hasPlugin("kotlin")
-			}.each { project ->
-				def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
-				kotlinDirs -= project.sourceSets.main.java.srcDirs
-				kotlinDirs.each { dir ->
-					if (dir.exists()) {
-						sourceRoot {
-							path = dir.path
-						}
-					}
+/*
+moduleProjects.each { module ->
+	dokkaHtmlPartial {
+		dokkaSourceSets {
+			configureEach {
+				externalDocumentationLink {
+					url.set(URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/"))
+					packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
+				}
+				externalDocumentationLink {
+					url.set(URL("https://projectreactor.io/docs/core/release/api/"))
+				}
+				externalDocumentationLink {
+					url.set(URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
+				}
+				/*
+			This link causes errors, removing to fix the build.
+			externalDocumentationLink {
+				url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
+			}
+			//
+				externalDocumentationLink {
+					url.set(URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/"))
 				}
 			}
 		}
 	}
-
-	outputFormat = "html"
-	outputDirectory = "$buildDir/docs/kdoc"
-
-	configuration {
-		moduleName = "spring-framework"
-
-		externalDocumentationLink {
-			url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
-			packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
-		}
-		externalDocumentationLink {
-			url = new URL("https://projectreactor.io/docs/core/release/api/")
-		}
-		externalDocumentationLink {
-			url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
-		}
-/*
-		This link causes errors, removing to fix the build.
-		externalDocumentationLink {
-			url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
-		}
+}
 */
-		externalDocumentationLink {
-			url = new URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/")
-		}
+tasks.dokkaHtmlMultiModule.configure {
+	dependsOn {
+		tasks.getByName("api")
 	}
+	moduleName.set("spring-framework")
+	outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 }
 
 task downloadResources(type: Download) {
@@ -193,7 +176,7 @@ asciidoctorPdf {
 /**
  * Zip all docs (API and reference) into a single archive
  */
-task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
+task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
 			"for deployment at https://docs.spring.io/spring-framework/docs."
@@ -212,7 +195,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokka) {
+	from (dokkaHtmlMultiModule) {
 		into "kdoc-api"
 	}
 }
diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
index 4b2b23d60ade..7628127cb5d4 100644
--- a/gradle/spring-module.gradle
+++ b/gradle/spring-module.gradle
@@ -17,6 +17,10 @@ jmh {
 	duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
+tasks.findByName("processJmhResources").configure {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 jmhJar {
 	// Uncomment the following for Shadow's Transformer support.
 	// mergeServiceFiles()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4
zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$
zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF
z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$
z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx>
zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC
zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj
zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt}
zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM|
z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo
z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH
zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs
zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI
z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v
zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ
zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp
zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG
zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS
z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc#
zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{
zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH
zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+
zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+
zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T
zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX}
zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J
z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs
zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<-
zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur-
zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P
z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@
z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R
zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(?
zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK
z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED
ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4
z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz
zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K
zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC
zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$
zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-(
z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G
zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q#
z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F
zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I
zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af
z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u
z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL}
zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q
zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y
zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$
z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD`
zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q
zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU
z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy
z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2
z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9
z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4})
zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g
zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS
zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_!
zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf*
zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB
zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4
zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj
zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~
zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk
znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{
zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML
z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md
zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q}
zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2
zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~
zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA
z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t|
zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l
z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at
z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq
z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P
zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ
z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R
zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs
zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l
zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3
zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F#
zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf
zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP
z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX
zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ
z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ
zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&&
zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9
zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3%
z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1
zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l
zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m
z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3
z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN
zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_
zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*<
zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B
z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o
zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl
z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U
z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5
zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv
zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq
zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ
z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5
zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~!
zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8
z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ
zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs
zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R
z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT
z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU
zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH
zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6
zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r
zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA
zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk
zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3
zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ
zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58
zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O
zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA
zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT
zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b
z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E
zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+
zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC&
z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn
zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH
zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC
zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{
z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f
z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL>
z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld
zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl
zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3
z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG>
z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B
zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a
z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)&
z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b
z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g(
zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}`
zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb
z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2
zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@
z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p
zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g
zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2`
z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh-
ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5`
zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#>
z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp
zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW
z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f}
zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i
z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P
zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H
zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ
z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7(
zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h
z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg%
zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv
zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h
zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c
zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy
z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t
z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb;
zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p
z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw
z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ
zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7
z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8
zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7
z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG
z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L
zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o
zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;<
z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{
z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX
zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p
z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8%
z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@
z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4
zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH
z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE
z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O%
zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy
zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z
z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF
zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597
zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ<
zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8
zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo
zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@
zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi
zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi
zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN;
z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp
zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(*
zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3
zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K
zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d
zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2
z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS
z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V}
za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)&
zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q
z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf
zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q
z{V^AU0u#?=E3&#0wH*19Mnn~;N$z?E8?Rl9>MVHiPl_U&KlqBT)$ic+M0uUQWK|N1
zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR
zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8
zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt
zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2<I`;}n^@4MI6vCedZ=C;ol}^bQ*dx&&8nb-&
z3)#xA-8T2gcffMYzDDo_+}wz+P8h>B6<gZ&R)|4Ts?jXVZVoqNhN_k%xHg&3BJR#@
zW~R&|0R@=eu%3D?zM3tcN^a`0bU8Qi)Uc&dq-Yp9jKcw-U#_Ld-XE55mxGO64=eaR
z!|?ouRtds{6xA*X*ir?L8T2|6t2X}m%@CA-7hu;HIu^0Tlxp+QjjALKeWuRI>~+i5
zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA
zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^
zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup
zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^
z;gtx`I+=gKOl;h=#f<B(e8}^YI_Y_F$m<_@mU7iP@qM+(yD7oUVh}K##GPwk9D0yd
zeHhMzVMULpykwfv+lU+)mgprk!<ah^1r7%w_Qqy@;J2ghF_eBcu1B=+{UtO=Ex9lZ
zTr$(@oW060(mHv6jhqAHt9(%I%Q?HEL?>zSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H
zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt
zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E
zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS
zA<uWB>4YfO;_9dQSyEYpkWnsk0IY}Nr2m(q<?iJ&^0JJY*WJVZ3B6DY<FXJr8Go@r
z6CZy0n;pNAl$k|qKz7;}tzyFUzN($R$VjbqGJYnWSFqb~_EE~`kN>l@KuQjLgY-@g
z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j
z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG
z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4<LzOM5%&sPL0AD{=s;s
z$R415QgAo#{smDow(OHv45*wK-Zi*?A$()F*V<y2E!TYT<^hcHA7K5-ZMT_!rB5`;
z|9vWN^0~I6awJfJRvcCAeNZ=j7mVNot7n9dih18do*-eAieGXMiY-4y>hki^jU@8A
zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X
z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHT<vv%?Nh+;B}
zmyBo-Ds%q}cQg+!oZgz$`xg$^mZZUJf3!&})t~fQTjTmEq}n-f2FtW>J6~@d=mc7i
z+##ya1p+ZHEL<ks3xMG;xOBNv36AC^Vp3h8`CZjBX4sayH7_@oJq-ndaT`jqB@IRP
zv!WtzH@kF&Wb?7eR`V`9dzcL0t|&Wer_hFfyyTy^`=Yg*D>mi%3C>g5V#yZt*jMv(
zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45
zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P
zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc
zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9
zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9h<byy@5cbGEZK3=io
zT2V8>Dv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC
zy(`*|&gm#mLeoRU8IU?Ujsv=;a<uB2wOxxbt+x_CGPXzy#@rDRkgcBVuX$j~bAGRw
zPYots=o?hh?dXy^E>b*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3
zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv
zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7
z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S
z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG(
zKvcN{k@pXkxyB~9<aVnCIiZ=*k!Q8~L1tKaxVd|op5jWsB}Nz|CZHq!epa%JQd;)N
z4E$LOX+w8o^~cMe4a_enR1CKHIa{i@H>ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4
zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk`
zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx
zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif
z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv
zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^
z*TFONZUS2f3<j5d>3w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*`
z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som
zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X<G=8N1HS1Fvj49Y
zr{!e0ILA0423drY%0DfXJI9?mv)P9Sb^{}Ddi1|;33N^#;xwZ1s;uEy?|&@^T31A4
z1v}0pzH#c>#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}>
z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O<Utuc)<>^@c6~LXg2AE
zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U
zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_
zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I
zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-<GG^
zCw~Hee9AnIJK5!W2KGioRF>8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^
zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2
z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTV<IRWfJ?LxQ}Cs$wH=@pn;(E!pGh(4PT
zCSf?oD0HK(b<eq@2#T{&XH0pqKhi2e@F&60q&GZT0!VOz3O!(?fv9x_9?Jl!@ic&&
zvAovwm9zWE2KtEoa+tIGL>KshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z
zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S<C&>2>`Y9Cj*@Op4plTc!jDhu51nSGI
z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@
z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA
zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC
zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH<b>#Y|#f_*d1H!o(
z!E<ZksS#Iaz>XNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx
z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3%
zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM
zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB
z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t
zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08Wvreh<CAf?TJ>nHhh%tgpp&8db4*FLN
zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S
zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A<zR<6(@2+L7
z@1$o_@SdQ`j0ne14Py8~N$N(bF^OEP4yf&4{)E?@3uqgKCl~oc9JGOl%*Hj(+(E%G
z61_ReO+5gw$@3rF7*zTt16$e`KZAyGV)!rJwJ!yKjS4(jVys!9BpagJUf1M>9?V-G
zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}<bv)Vrqcf?ms>{x5fmd!
zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4<kzFZZ+q2=
zSI@wc!e-hJ!WKWxZcvCb6r;@e6kZ)gU~$!}pY}zm1`BBiO&Cp>iiRq<&wit93n!&p
zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp
zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz
z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj<a{IGbs&Xr_Lnl~=L#C-3f_=262-*SN
zks}N?-dkm-=nWk~RaP*30U<!1%uw|>*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig<
zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV
zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fY<EaoNR>vzmEczs(rcujrfCN=^!iWQ6$EM
zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h<YjQ73BXl
zpM^mR_u6^E|NA0I`x69&;(xqnK0Q2uo^<*EVpO`Z33U{viEa`@8YY#iRIEJ;osRdP
zL>|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94<kOj@Q1fJNzg4
zo+oqf&lQ9L@Vi_Bum@NgI>?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254
zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh(
z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6
zwH`aY=<IrWwJm6AY&rFqmNW+-KZ@4)eR-L6R~2;>))lpWG?{fda=-auXYp1WIPu&3
zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo`
zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<;
zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE
zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{
zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E
zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&(
zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$
zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ
zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T
zi_nfmyQY$v<uZ;l&g@c%q;+Vgch$G^zJI*;eLwf}d#~$x|9P(K{XKVada<9+sIfYB
zKAm@-U=yZ;64wg$H}Z;yL)GoR=u$~I;@cnfU5TMi>Qh%ildbR7T;7TKPxS<Ob4E3(
znTaa+H!rSqa0vbx%SAld=m88TC+A_c(usssUb>s#vhKR|u<i0Ko**prU~S9yhY2+1
zPX%J@>up`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT
z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^<lLk;-tgW3Xq;u|w+kECe)CSK
zcriMg^rmc3Yr@_+rl3D>qH$#DVciGXslUwTd$gt{7)<evvuvMrg(Ti)md>&#a`&Lp
ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L
zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P%
zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK
zmh1zS@z{^|UL}v**LNYY!?1<k__7o+p+4(1NBmVoECA0-KiaC}AV_?C+7J`NK6$84
zBBqrmc2Of6i%(I;M!$`SXjC=j*Jb1-z1V$vmVAv$?q7A-UNUbIjPc&$&dCZYdrovY
zYk!tOxHv@D?D9y!F}6RcP($xyne%TppYSv>qIRPTvr!gNXzE{%=-`oKclPrfMKwn`
zUwPeIvLcxkIV>(SZ<gIk>-SeBo-yw~{p!<&_}eELG?wxp<p7ueiB^ha`u<BZpHY)>
zee-V59%@<kWnQ!o$=ScYaN1eg<h0xJ+n{>BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT>
zY+l?+6(L-=<Qwd6r+5D1gjtj||7^9yk+4?S=Ggr8A1DHM$HUa2z2LxvD6=8#&qY;Z
zt8)xOz>P%m4ScfAYR8;f<Dr$LNuTmbgXDXglYV1=E&7Wn5{y|K*%IZ{6JLH|Dmg(}
znR2;>9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<<EACIT8XT
z1qBbB|I*^xWzq`9+Gz$W)b?o0;B_{07?)m#_X&4NiqZ!@dMI95k-D2y@#kI!654RD
zYjUTZNp<Jd!Zn^%3j)3$jIWM4-Qun*WT<1+ge_~RzCUVOk8MJ|QtuNIQhY1uMB$;h
zMYbE)LIT&;DS?{%MXv&WEx~h?bBn#UB?S0m9+k!hKZsX-kfe7B^B<*@su?}#wF4VB
z?;H|rx{AeM@(Z*>$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4
zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM<dsE
z+)HCvvfx}7?%s(mGoXS5m%y~{D7-?vfIM*E-Br$2)`nbbeI(JuN@9us|G8x)CDV5<
z`Lmq6gxN5v!A!|MaD3-`+9x>({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg<e&Ks@rVk
zCTmzRh=zK-IH2i_l=1F$2220Iw|x(Vy@q&&jtGSk7d?<UZ;dm(=6HqQ(+WnK_lD6C
z*aagnyAQvy-@DtV52PW8=n|p@r}`}M3VRKOLe0lFjJnWp7!6O#BVRO5AyO^F7?H{&
z(VFk3lyh;>$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo
zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!q<HF%wJbappLVVp)97sNgNZK+YXiAqubI6nt
zz^x1f3S?e@nzaE{ASzP}l7_5+M-C#bWf{R<85&j(;XpwyA}tJ2fp5MXx<Tp~8p2^5
zVDpg?+d?DwY}g9Kl_K<Dg(`F?Hb7jFBRG&${$9Q_LIUX(@2T%~4C1mM#ex5Qw;}5w
z-+yc6zt@a=dt*=&%0@|mbr+$oV`R`;g+R{T?MS63V>qy0Etkxo#`r!!{|(NyT0;5=
z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh
B8dv}T

delta 17845
zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l
zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9
zXZjcT^`bL6qvL}g<Hw9Mj^|#&N2h?(F`1lu_ndpq?{_}-=D|N7-vjUr-ZBx#3-xHh
z2`L7p$e1Kf*5QAYiPLzo0STOunzJU(VW<Ja7%`AF@RErrUXGlZf%=%pVN{Cq2F46r
zFfh&#alCR__zWF+&o8ITJ})^Uz2x(S1>vXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV
z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY
zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*!
z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc
zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq
zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV%
z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB`
z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX
zQg*0)$G3%Es<rMi9IFkILZk8W3*zmnaEl_-v&C>$otA@<d5B&i@NKtDgSW_?su;gQ
zolk$}wmPmIAgB0t!H8pWXh)p3t<)yxd~Zn^WNM9@hA}ROLYwE;<qYL=a)z{do7&c~
zOU=+lw_zN_7aE%7#L)HEEQf~HkenM@!(`u&10)a9(=6#VTH~n|uvG6dLaDxGXen(O
z;XBH!lVmG&lAn|B7pTXVXv9~9^flpue#(Cz-8iJK+qlAIYA2CHw5Qpu;k}OteSyKQ
z`kU`!PwGQxpTSIZwT4%qle~EgQBsDQBOk$-mgY|plS?ld@1iaO$x2hK4#FV$4PEx%
z64rN=-S>p_1N!hIPT(iSE=8OPZG+t)o<dTw8$=ITLu%Kn&h^n=hZc{ukec4F8s&cn
zHOkqTnd<CbL4C}0<_7eHehWv4SvaA;hXayxLSKbRv}1?wq9KIoR6?gJ-bT}){t2Qp
z?fMED@841214PiOrSSynNd8Pk{e>FyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5
zbn<D{nCwP+S(Ox1JDHTGlB$C?aL!zS)j)aC4N=Q$g0hm{@mNXgzR`KZi=*k<JFD2U
zislbCS|3r-{@$V0$7^VDJg3k?#9Vqlk0;eXFI_&!Q-<chP)h>@3IG5I2mk;8K>*RZ
zPV6iL006)S001<T5fUDgJPsUxQxZ`W|6N2E*F}j?Q}ZJ=15{A^(lk>s%0eYj)9hu1
z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror=
z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz
z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL
zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF
z<z)BC1fvX1DaDLZ_@-`uBujj%t}%3ZeUVr4TREsHX7F?nWpHMA-Xk|J!iq`DS}GVf
z4OL4K$Uz`ePv~ieY74)ZRfxYcZpw+*vvS6&Rlqbur}xYv21j`ZZCe8j?dJd)#JHX_
z5=vO*eRLkV0-T?O1~f`|h(`h*OPIkE2~QCbFe_mW^9+sURZQi7)O1oYBt-FyQU{7<
zNQhxxKwQEC78z;-Weov$5b5@FdMV(!gk`L7YA+<TqeH+dL*W0uDMLf?oH9r2nf+pL
z(JaK2H#sFs@P+LRZ(7;jTRIZQ(sv(2QuDhnf@7$R#^#q-7<w+6w}d5qmBm<uOr@;I
zLMW+p&rrk1yf}h?o+JG6A+6#q(ddiydr!JgMid5uPq(QbnutmXYCCHx8^yD!+vYaa
zd7<2tbodnD1w&osHX>o_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp
z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo
zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O%
zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj
z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq
ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@
z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2
z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1<oe`Z&D<40Ft
zBcd&T{H%vo)9-oc7=5c8y|+a3`=a>+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe
z(qDM!FX_7;`U3rxX#QHT{f%h;)<e7LdkX!XLVxd}I{F6>Eursw=*#qvV)~y%^Uo^%
zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg
zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~`
zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh
z@_Lmwc<AfAQRRAtHwjXM%8e>FDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q
z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3
z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S
z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU
zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD<x?C$Ix95~e-?CJ`JIx({^gvA?wYnXif
zoqP8cWngm0%+XP?j}={}HQF+2>5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV*
ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv}
zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX
zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI
z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6
zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H
zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd
z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB
zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va
z%z<AsBy*Nm$qcPRtn58~4;F#DO3=3TTAjKTiwdqKd0hD(l8ifl@)+GRtI%1Rw?ZO(
zmz+Szx|nJK58+fyw~fJ^C)O5^R^hg#=i(9@)dYl2m=<>9Ef6QmfoXAlQ3)PF8#3Y%
zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnX<x$C{{p37Ks8vjz*8r1<^dA(Ff^4
zjUJ+uMh{bpsciv&6kGQ$XCNeUw?-eL^BR4Oo<Ib~Y&#K12;>r*SGY&xUb>2678A+Y
z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5|
zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl
zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{?
z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4
z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz
z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0
zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq
zaHT($Qy2=MMuj@lir(iyxI1HnMlaJ<jX%sE(fCn*3?3Gn4nSlq&@KU5<Hz}<NX%K-
zMTN~lIE^px$DD-EU%M{1qACNs17;@Nj-Gt*Rrm>wpX86je}e=2n|Esb6hB?SmtDH3
z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ
z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT
z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jS<ljwsU5!7<p8}i}
zL7L#c+-+~wLLj;s_n}*|CFnpNPNHIW9&Eq(bs-;&;(6@(b=_4E{(&*eoXA{DmlQp8
znGXNI-Kxc9CO;b|K^L%!!T>Lp+LQ7uU(iib%IyB<ywG`)hV2}Kh*;jWpny-xs1#~{
zbqmCdt821{{_GXnJ$@z<wUY88e+*@1o6>(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E
z$Sk-hd$Fs2<K7hR`?HSPSmeG}{4J#x%N=>nL4w<PeNfsVCF_wKy$W6_$epEmZYjK4
zi+d!*BDQw+O#prhLbfH}8_MdBw~JwaO+mWJsY>9p@O*Y$c;U)W#d~)&8Js;i^Dp^*
z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8
zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q<u__?-*+Lj0<oJ4_lDPNp1xOi0I-
zBk-Z{m?6MYLI0qcv@^Xv0JziBMLwwL9Z4DDm=IOI-_l3N<qbRWo|1PyCHQ|^CaiX&
zfb>{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3
zeBPRTDf3?3mfdI$&WOg(nr9Gyzg<O~aeU!4%Dw6dhqX`I;`>`&u^o!f2rKJ57D_>p
z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS
z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3<qeI0+|)cpd`XIV
zR5F&JZ6TFzp~ui`$S~65^ilbpw_GY>*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C
zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3
zB<F0}kh5un+-`~NJtS>^5<Ov^3sk&XI@aAOttDFN^<1Hf*Qvs*;dz~^rm1q6r>N=*
zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{
zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U
zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0
z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v
zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2
z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A=
zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX
zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I
zd<toLH_|bTXh!IH%zTALX`0694LSoG67(Iqm%d9DeGe<Xj|6_3#_1i3!<q!IqkDN1
zSsWmnw@`|Ix6=gg0)mMAc@}xHg?^SkjWr6i-%rocXOLkD==cd>MmhAJrO%@0f%YW!
z^gLByE<rzqUM2SO4f<*N8D!WybTfSpk`$3u*?dIL$w%}u`B=g`>GSk+R0<o|SzE^2
z=mq+Dc&Un;=ojc0k)5JQzDX4`P*$nXYK3+y^aX`~zNpZP3VlhTFDrCXSj;X!&J5Kr
z$i<TD=DHaeuN372_|0IC1(W1Vu|iuT3SFE5w$v13aQ=V=%?vhqBOQ6wsEW@=4#3<G
zKMNRYo~GTy4QblLXl}>v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s-
z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5
zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C
zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv
z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T<RSTf!OM5X3QT;)A80apUYQ<$z#K%jo!P`
zbOH>=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO
zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g
zXJ`-N?D-n~5_<grn_osx<j94buP;cy;tm9e`4#$A*eE>QNF_5+Un<iW1@v`M1E*$?
zJ+2%H1WCn`>-4&l$<JXVg1Oln#u3?n?Tw)AX}V5pfSfCwe8Ks)vj$jeG-vYVBC>1b
zVlHFq<avD&0lWm;Uqa1&1#o#eFH<(>tluoN85b^C{A==lp#hS9J(npJ#6P4aY41r)
zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE
zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu
zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8
z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9
zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f
z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oG<nU}c+^yg_Dk>zo
z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9
z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AW<LxTK
zc!!F2;$8CV-Ew%39Nz24ML#a7sKoo^{QW9EfDfw3U|7Wn9#VhtFh&)8NWo<l>v2WJ
zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d
zud3LNuL;cR*xS+;X+N^Br+x2{&hDM<N4j_Sc6IL(2t-ckr}d_|o*ZcEv8`BgV1vNa
zRx_Eh^`yODkEeePfl$fzw)WnZu1I@Z4yP{5vS(jcdvA_9uYg*zsbXU+8M8MFl!Y7i
z3;0^ieoCu}#FECYbmEv{_3FpshE&pw>hb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L
z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD
zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y
zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At
z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0
zZV<RBTo{nTnT)OKN^+H6P{iI)9M0OTLisYLg-h7{ab~5|Ete5V!*1HQw~K3na^@Eh
zd(I_o{cO%2@`UmdZI{^^*HfuB<M=i+o$PP7EXRNTsXewHJ-JgKa&lh5Hw0FNCyr`~
zs#_+t=|&+`d(5;IHQe-`S#rKsNP$cP4~RDNOfqij{TlY7N5d15)?g#0;V9_W&_t&~
z!#D9Q`oH*4GKVH}@EHoSPIK9orwO=xkXfMN+xU)x?`rrSzE7T00_CUDF~b&E{eK)g
z4L^Ut4>kM<KUVM)4Ugid%%br_)TyTi8AJ^~!_O7`Lc=fdD-AI`MZ*wIX*hwWD)_aA
z-{7|bb3DxIlI1ua=izo2&QRr*(xJaA^xzo(ZrvViNu`Vgv&NEqzn8-w1nNDQx3X5H
zY)+)Vm~gH^f5e{zwER4xN$$=S<K<4m{#k#)Uo`v`f79@H8Qg#1nudSk8q33-%nNIg
zKvlt(f8pP9-(w2?qv3J<SD_#w#1uu8X~HMU6;YuHMfjOdH#kA`)Ob$pO(*SG!pJQW
zUsP&Bm0I|YQ+Z8P2~A*gtDa1ncBtQ=kqL${6qV<0i2e#4H?2_CCn47P&~eL5gra|J
zNyqe*5vpIDs$Wr%huz0c7*SgjQ$@8DSEGn&ny3{4Mbv3xI?}8(H$LE+n1O4Gn5l_b
zVm32U1Qjty6LTeTp3DzI1h0E2rOf#(iQ_WzT%+YXPS(wM+&r@{c{0hv*ge)C7KIxo
z)08UAEa*DV)_DVn?p&#xh=(aMsHcBgtbugGNZJ#rmcy0(@_1|@Z813)m(;jYV`MKV
zcRKQ9t?_J`dE1=gz(PG>*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG
ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?|
zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B
z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JC<e{LvdZ+7pxTd*M}z+T`$b~$!(=qYR0Kf
zt#wVO(KgF8>qVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p
zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc
zJx&MB$me(a*@lLLWZ=<H=nUNL9^OCXvBxWNGd%W6P27%^Wai1n>>PhKs!}#!ICa0!
zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK
z++G*8j)K=$#57N)hj_gSA8go<n<4*~1n?n<2zEkX7iUvY#d&w$T;qIq-n@qMJ$dtK
z@bjBDb&kEHH1SvPx4eIG7*j4eEc-ZCIK&Y4bJSc09KaL!TZuj#Bo{Y}d#F?uX;(*3
z7Fjw1-%bwYyGBvbHw>lO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q
zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f<dm#Y4(2y{mVx%S5D?NS1udD
z{AM+%HjZLJU$Al%f@9#OKxh~@k78k8&_9e@hOuZAiwU$OgZgo^w<Ex@o?Z^q&<0dv
zDQ00A=3_b5U<Ep{lHR<Pj#$m-%~}|^4QH_)PeU{A#zvfHj4ogcuAtR%-H_`Z9KxMW
z>_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG
zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh
z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9
z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI
z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h
zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb
z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y
zfvOC)-HYjN<T>fcpi`<nf-dRCvb<3DQ>=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O*
zitR+Np{QZ(D2~p_Jh<vCoM0+TuBZPGvkW<o2?W>-k|dL!LPmexLM?tEqI^qRDq9Mg
z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB%
zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D
zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M}
z!e`jbUR3AG4X<hiCae!0Z#IQzg_MO}8r9LZ8v9gatnAdq>vnBVcyIZht6Vi~?pC<x
z$UMBL*Un7qe%rPwVc5u??{Jvv@h48*X+33_?}H3zszQHeTZax+9HxTd_!Z$f2aech
zh-P!|7*abeZXa*+X4sU$RVNFp#Ueu?du6y}MLrh0fRY4k3<2mr8fTz23ECVQbp8Y-
z&)QObbuwkr*lDyqTgbBA1GXX|CT`-EiBViLVIpP1K+?n%?&?@)Sh}Jk6BD>C!$XF2
z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq
zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP
zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F
zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC%
zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G
z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^
zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5<Y<
znaL!12>AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm
z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn
zgLD^{X<Qzp>0A+{ySY+&7Rp<dye-mragf3s3i1+O8l*a2CZEftSs~5J@pO#O4)7|C
zt7Uj~klxE{r1P8rua)PyL4F6<1h{`zM(RZRbwXGlq#|A);Pd3ULF0xXt>ldwpC6=E
zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA
ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#Q<WBCACK9Bb(sOZ;c5{Cyz<cBw
zm1bp-V;m1~BFNo*$vCz+DJt0kPRa995vWJw-XL{}RlB%vJiX3)rFpN$?+a3lo1}Ta
z5Pm@8%QU_`NS4rE!XK0g9};Ch9HckI4PDZ_!B=Sf5sj~8(i`GQ+lWT%y3Dpc>N9Ry
zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU<?oOa+Y>8<!eYQ6t`2)ofdl
zc;{-S33UnK7q@p9(UckBeN6snqO;Sqm}WF4tj?-V%V>|9RXvu`-ECS`jcO1x1MP{P
zcr;<OGtG7*Y*?2bmsPqAyQ>Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM?
zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2
z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK
ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5-
zE1FX=ru?X=zAk4_<Ezl!IJ%o@*-5QDZ_F&LtjWsjB34$YVV!lg_^wE|e8ZN&iP<gF
zk{VwPw_va>6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd<mrDhd(j_(Z#&e2c`*dZ
zEQdkTY)e@YyRT{!&<SX+i*%Yv8@xOn0)xWrstxh(l#P{4BPP+-+6V6&w!t(G>>UZ1
zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+(
z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d?
zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg
zyUjM+Y*!<JsDnwU8g|E1uIfHP3rHvJ9!aXvBUq$4(iwj@?39JY7oCLH7;6A1Nz<<H
z1@>$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq<vwyg-f
zQ6xX`>25_L&oSl}D<NsQHWi6FoUn<~8Dj}##2gV0o3l~7I_rNmqaltZtyDLRo=Y;p
z0a9He7Bhe1h(8@f2`e3S8ea>OMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m
zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R
zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1
zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt
z(kzx{$*>g5L<;u}HzS4XD%m<I!)UoMT66l0a_guJuN5cfb<%8;;k8nDRh|y7UBi>l
zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN
zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n
z{3+hA^QZYnjXxtF2XwxPZ`S#<d^2juw?KdUVqx|<op0e=p+c^Pi1+3VHI*oQbiR#0
zkD$*T%?V;~fUbNye?jLj@|Se}GGC|jLH-JIk9!%S@mF>J8h>5qLwtwM-{5abbEnRS
z`9_`Zq8FJiI#0<P&Mg(f3yPBq!tDt&8IC9HFe+Bth{VH2yboj+w%3HDvxVXM^j?1(
zwiDqFWb&}ti)}gD7hasD>syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv
zw<m$lNBLfj@6&mZzs0oi<Qj|X3`>}1bq~AD0_Xerm`<Ok+jV|`AJqBVFe!KKkg_Mz
zrgD2Y(cv~V++o1E?Q@Fb#qkz^+m(MNX7q)-j7!aMt7*o=wh`-=A|TuovAY%)$JOb;
ziiPbi!$xC<7r55`3&P!20u$}NF!bn?wH%06rXjj8Jr0A0r2+~^l2F?c>%ryiG9_$S
z5G|btfiAUNdV09SO2l9v+e#(H6HYO<P!tR27Pw*5XVu~2WN|!`P{UGP%8-B4o%Ll~
zx=yTCUICkMjVkuW4CwqFz7h4!Fut~?;&vovX6q0Mx`$8|3}@dO%QE^T1?&7>dQs=^
z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>r<C#s-EpgVIa@U?Zt5-52*E0-_V`G<%#aCubc
z#~9)JgaCf3du7KIa@o9{F`a*Z#7_#Nr=<Du2&J->pUzK<MZ989iL#$$$VOIhI{#G2
zX1{e2r}58peujUp^RtpWi^k@dv<b@U5~*mriX4==h`~&q8}1%1bi*A9t2!+C=NB43
zr}OjT7%h=p7)QmY@e4Y?$S-O9vd*vYt2+OZe}&;5r#{sA*Zdouf6ITrLrLmd5$W`2
z{=LqB5J&!z|CF)tn6gdh*Ch4*S=>Bxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe
z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC
z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs
ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z
zvzEdIc2|HA2RFN_4#EkzMqKnb<pLBO4+WJ5@iu6<*yZ}5^dx`RJ6@oyUGTNLwp4D6
zQr+!_EwvXq9LV|FqKPDW{O#$8@RpRybyEJwEUB(P$J>bw!?!?%B@M0^^5Z<!X?H1X
z%bH?4ISS7xsT)h5y*R2kv373c0XvbALyIKqW8F4Rt^N+RBdC+p7-qZ2TG&<mY|Xw{
zYW8zn#X9x#oi~3O*$eA>;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8
z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p
z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF
ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E
z&1oTd%!Qbw$W58s!<?E8yP8T26Viz&^F4A~aC%qEomHk#Qm5Ec3e?P1Tj+$>6ms>F
z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH<SuY~bM{B5oPpIUn>8kSkk$>!f0;FM
zX<XOP5P@dz=8h9!x<TDSCLIj9Udx3_a=kV3LTpl(k=&H9%=)MqgIf>_<Kt$po&Fr{
zpKJorU@qqh(I4C6Tylqoku~P>t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax
z9(|As<jw)_1#$tQo>$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z
zKSC4A%8!s%R&j*<WtB&0;$gMI$I(tFKiavN8Kx<87G#)5v#A(w^XXcQlsP=<6ZA<U
z^(KEZv3e7!^3<Ei<w5UtbUk`RnxhmX4bQdZ{WNJ4n#oON_s~SV<X3w`-hL{m_Q~Un
zYCrlXg#3dvrKK$75BVy}D+j2spQb)YMR$&pvlKd(fpZ09t)v;W5Rxxaa&B-|%gVWy
zZlF&=A|I`y{q$*Y3DPpU5%%?9ZW(=sZiatmGoa^Z>2si(OEc*fy!q)?%=TjDZJ2}O
zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VT<m;!IE4+o?TZaBx
z5%PHoq2#QCL%*u*r`ZQdulCDJ$p1h^Kb=|a9i(u}0L`iPc~<xf{UPtM+i6ig4TXQa
zh5n@<I7)M?wUE|NXL)a<@gd*jMg25yXUHdA#XGO?^TDAfWV!iwLdZ#UHk}Ir&!rmm
z^eD6KphC1AP^%LZ5kTi+xOfkpNl{urF&HwAc^0jqBxYGukLLzTQ4{shPU@vr>Z5J|
zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho
z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr
z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z
zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr
z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$
zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~<TRX$8LWfcRo
zq}p34A-eP?S`4%<+gY$&Qwo+hw|LR9qPfLa+1vuuio(^tL0Z`o@(s}04;;?o&(V25
zmb;P0Bj~2U&>^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ<s0WLmfS&Qlz{|
zxaO(1@2apqtdc1I3k-8L{2o1=b$p(R;f;f|3Q<=rX=(KVT7$=$CTP91Qk;2gg%ga0
zzT0Vz1mY4W2+uh{dPPXPm)7Qy6MQdLjCStV!T%5peg_o&22BHi7X!kpAX+WnHvohg
z=Pssv6$Tn8m(lm>5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b
zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX
z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K
z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH
z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL
z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu
zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X}
zP!<CZsjx;t3k>~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7&
zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)(
zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{<jL<V=~a)y5R&g!ma8yZh)3rp&)QiP
z*be8EDL{W#%vu6O4v<&2)|<%ZIdp{wA@~wVmko<FSH<^Bu>8wd_!Y#~tMJ7yk!F8|
zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB
zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8C<A|XF(+o?2dGGttB{Wb)a$2igu>H<
zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u
z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+<Uj
z5G8+DxD62w6ZAeLoXgllSFo4%;dw2d*Rf9-dn@cRkKP5-{}C3u0K3(n=rwqJGHQ%J
zV=YO1*Jq7=J^eMk(_If41oYS8%b^P*ApZ`jyvh{@Y5%6l8oiD<J5E&^#fFepwH%zw
z2)Z?TgHS9Sd6UNF4Z-WaEQtzH85)A;e4~G6Vu{Q?vK?al1150x5!q@5uEqJ-asy4}
zsOV<4tnl7U6DulJz1Mee=rsUyHnLOC@Ls4&SPqb%$5TG*G?OQxTA57qI6r64FV0$`
z81}wHS)v$K&TDGVcWNvTAX`NLr|Pc5D#r4TOKo(|aVq3tp(h96t>bB->oH3#t(AY3
zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa
zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD
zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV
zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+
zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$
zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpW<KRGsVy9Os
zNyU)fm61&L7?yMWP5o&7oWUu^HNh}amXSDW-&BNuI^&g)GJZL(^6;E1sc|pqBv-P<
zFlK5cTBl^Coya(1@D8I$sA9-lEkP~Y<yh5&y5hA^1b2!zn?eOAJh|GZ`V9?JYd?n2
z4SroDUsL9s(cJp?TeH+hub>fu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{
z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~
zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I
z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h
z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil
z(nOv_nlZB^c4<p#(?a)_u4(B)SGtQ9q!hQL%eVebEx+D7GnQ;27x<v}?t8lL+;f+A
z=l%QbH{Swq3jdODKh`@i3QfXQT$4yD@lfVL7h&-B1}~lwVM>s&&O3h=OLiCz&(|f0
zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov
zVi;eNa1>t-<14KERUW>^KwoF+8zNo`<C`pgD~xZ4@f``@#rK%RtuVeH#t-=LEfFsZ
zI51=6l~P)>Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT
zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml&
zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51
zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX<GHIG*=s;|*X|~o=RPDX-Sc|p7dfc1I
z+bdepF%{N5JNm9xkG~_}9JBmx6ag(^S{f7(&MB5Ut8gI01%ma&PSY^R4bxkR{0FUk
z>5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l`
zW^bjkyZ<KrU~bFi>TJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+<GMP%
zX{);BhCQIW(Gn;+LWW}KSArMA5#JMCwNuLrnSDaQ;az_=OZB4O(I)T>DgzNe6d)1q
zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8
ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b
z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS
z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#|
z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%T<QrU8a
zoQYBuMl~zy=+|`P2J!7}I5U^Ks^;xITZ?|FpLmb=m=4EAn+x?|Qv;lIYp*ZXvf!JQ
z*?%I>rgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5G<LECu4)?S?zq`}l-6Be9igL+N
zh`N7hDOc2GQxkBc_04ZYOy0dF-2c<LysnaQzmR#Nd~*K)?c4go+&{eT7l@5={|h-A
z1;r+~VC?cFyA~?=)<Ut2x6>cXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY
zzr%8JJ5BdcEYsR9e<J*1QJ-;?lGTLgRri0{(Mx*^e9N-cvKPd8)1ZvmTl)}Mp*PMb
zJ>GzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe<H<wNM(*(dvGh1)78L8idze)sN69(F_bD
zfFpRAB-vBKc}&vG08>7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~--
z`<QQ&C6VTv@kABvH3YKpWDUXD_*kNb(3!wC#8v()Ttmk;q}3WaX(d<D73rp7AV5PE
zJvH>63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X
zdYtQ?-K5xDAdfomEd6(yP<r4XU0e%L6Gs?6mZyM_@USHu0!gS4d3Fj?NQ4o2RTLE!
zsZeABR7EXMsfc7!I><w4;nzxeSu{*)rP3*7pbb=qhn4}Y2n9kR0m4&2#L{A=NS7O+
zq<gb--~a#L?(KhfJM+)&{^xa2;9hFiS^M-I@96A#^P5^~n|$x<`ddB`%@&&L<Q!2c
z3T)0gzIbLnIPU9=rs~b%+*kaqOYa3~2NrY$**DZ_28oj!E0}c#hEXZW5#1F%_rp2Y
z@7+$!3(WI<_EWCV)`TqCTTmmZb^3u}aj?mmoaBAb!n-={l6S|)$2$1IvpT^qzBZEw
z8e=}4<>tZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W&
zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT(
zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(>
z(=5Bg?EWq-ldEywgzXW9<IVcZw0PFB^dyb+qfMQWtjsj)vresv4TXCoZ567G0y;gP
z?>65%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oT<WD#3|w3t>iMzzlx8KnHqUi
z<C-MSdTAJmKaI>8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8
z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?`
zW(>$oktzY@GO{|Ln~Bt^A4)(%?<rC#>l-&(D<Yw`9>m!iL#$K_xOyhwAf=K2<+Bom
z<r)*8MZ!$_D%ll%W4Ye$$4y&cK*~WyOiCrNvVfg^98_+DMF;q@k4CQVgxx|A9Hkzk
zY%$3c2K(I6As4DS?_GUJlhQ!Vji$Rs6$y9lpo|T>w7|hl6E5}B$d%n0sfZv<a3(um
z6<;qRVVB1$nE}(k(@3SY^L5&aKgBpn4?AzyzXPQPQ}9ARNm5~`3PH@`&Rv!G*6&j!
z{V*$-!6Q(LiIj*sp{qn3B5ACQ7T%2B=uQTovb#r{!Sw+S`r-sQoh4y>fQRy9Fyz2~
z83#=#LaHnf1th^k*<o}w3D|OX)SLtn@-US^I4);^RK5=p7oq$X3H5?EAaoFSl}3p%
z6LeUX>p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{
zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL
z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN
zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea32..ffed3a254e91 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c811f..1b6c787337ff 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle
index 71e23b906049..f7408e5c6ec4 100644
--- a/integration-tests/integration-tests.gradle
+++ b/integration-tests/integration-tests.gradle
@@ -1,26 +1,26 @@
 description = "Spring Integration Tests"
 
 dependencies {
-	testCompile(project(":spring-aop"))
-	testCompile(project(":spring-beans"))
-	testCompile(project(":spring-context"))
-	testCompile(project(":spring-core"))
-	testCompile(testFixtures(project(":spring-aop")))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile(project(":spring-expression"))
-	testCompile(project(":spring-jdbc"))
-	testCompile(project(":spring-orm"))
-	testCompile(project(":spring-test"))
-	testCompile(project(":spring-tx"))
-	testCompile(project(":spring-web"))
-	testCompile("javax.inject:javax.inject")
-	testCompile("javax.resource:javax.resource-api")
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.hibernate:hibernate-core")
+	testImplementation(project(":spring-aop"))
+	testImplementation(project(":spring-beans"))
+	testImplementation(project(":spring-context"))
+	testImplementation(project(":spring-core"))
+	testImplementation(testFixtures(project(":spring-aop")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation(project(":spring-expression"))
+	testImplementation(project(":spring-jdbc"))
+	testImplementation(project(":spring-orm"))
+	testImplementation(project(":spring-test"))
+	testImplementation(project(":spring-tx"))
+	testImplementation(project(":spring-web"))
+	testImplementation("javax.inject:javax.inject")
+	testImplementation("javax.resource:javax.resource-api")
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.hibernate:hibernate-core")
 }
 
 normalization {
diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle
index 73bb378f39a7..67bf95e8dd6c 100644
--- a/spring-aop/spring-aop.gradle
+++ b/spring-aop/spring-aop.gradle
@@ -1,12 +1,13 @@
 description = "Spring AOP"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
 	optional("com.jamonapi:jamon")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 12adbfb7e5f4..4ee0ef3fda68 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -11,7 +11,7 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
 dependencies {
-	compile("org.aspectj:aspectjweaver")
+	api("org.aspectj:aspectjweaver")
 	compileOnly("org.aspectj:aspectjrt")
 	optional(project(":spring-aop"))  // for @Async support
 	optional(project(":spring-beans"))  // for @Configurable support
@@ -21,13 +21,13 @@ dependencies {
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
 	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
-	testCompile(project(":spring-core"))  // for CodeStyleAspect
-	testCompile(project(":spring-test"))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-context-support")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("javax.mail:javax.mail-api")
+	testImplementation(project(":spring-core"))  // for CodeStyleAspect
+	testImplementation(project(":spring-test"))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-context-support")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("javax.mail:javax.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }
 
diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle
index db894e8b83bc..e3f6f73b763b 100644
--- a/spring-beans/spring-beans.gradle
+++ b/spring-beans/spring-beans.gradle
@@ -4,14 +4,14 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
+	api(project(":spring-core"))
 	optional("javax.inject:javax.inject")
 	optional("org.yaml:snakeyaml")
 	optional("org.codehaus.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("javax.annotation:javax.annotation-api")
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("javax.annotation:javax.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 }
diff --git a/spring-context-indexer/spring-context-indexer.gradle b/spring-context-indexer/spring-context-indexer.gradle
index a9769ada026a..2c1df2e91dc3 100644
--- a/spring-context-indexer/spring-context-indexer.gradle
+++ b/spring-context-indexer/spring-context-indexer.gradle
@@ -1,9 +1,9 @@
 description = "Spring Context Indexer"
 
 dependencies {
-	testCompile(project(":spring-context"))
-	testCompile("javax.inject:javax.inject")
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.transaction:javax.transaction-api")
-	testCompile("org.eclipse.persistence:javax.persistence")
+	testImplementation(project(":spring-context"))
+	testImplementation("javax.inject:javax.inject")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.transaction:javax.transaction-api")
+	testImplementation("org.eclipse.persistence:javax.persistence")
 }
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
index f8a8631293ad..843d1920ebe4 100644
--- a/spring-context-support/spring-context-support.gradle
+++ b/spring-context-support/spring-context-support.gradle
@@ -1,9 +1,9 @@
 description = "Spring Context Support"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
 	optional("javax.activation:javax.activation-api")
@@ -14,18 +14,18 @@ dependencies {
 	optional("org.quartz-scheduler:quartz")
 	optional("org.codehaus.fabric3.api:commonj")
 	optional("org.freemarker:freemarker")
-	testCompile(project(":spring-context"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.annotation:javax.annotation-api")
-	testRuntime("org.ehcache:jcache")
-	testRuntime("org.ehcache:ehcache")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.mail:javax.mail")
+	testImplementation(project(":spring-context"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testRuntimeOnly("org.ehcache:jcache")
+	testRuntimeOnly("org.ehcache:ehcache")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.mail:javax.mail")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.mockito:mockito-core")
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
index 0b06a7c56f0f..221e0f12fe1a 100644
--- a/spring-context/spring-context.gradle
+++ b/spring-context/spring-context.gradle
@@ -4,10 +4,10 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-aop"))
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-expression"))
+	api(project(":spring-aop"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-expression"))
 	optional(project(":spring-instrument"))
 	optional("javax.annotation:javax.annotation-api")
 	optional("javax.ejb:javax.ejb-api")
@@ -26,22 +26,22 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
-	testCompile(testFixtures(project(":spring-aop")))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("io.projectreactor:reactor-core")
-	testCompile("org.codehaus.groovy:groovy-jsr223")
-	testCompile("org.codehaus.groovy:groovy-test")
-	testCompile("org.codehaus.groovy:groovy-xml")
-	testCompile("org.apache.commons:commons-pool2")
-	testCompile("javax.inject:javax.inject-tck")
-	testCompile("org.awaitility:awaitility")
-	testRuntime("javax.xml.bind:jaxb-api")
-	testRuntime("org.glassfish:javax.el")
+	testImplementation(testFixtures(project(":spring-aop")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("io.projectreactor:reactor-core")
+	testImplementation("org.codehaus.groovy:groovy-jsr223")
+	testImplementation("org.codehaus.groovy:groovy-test")
+	testImplementation("org.codehaus.groovy:groovy-xml")
+	testImplementation("org.apache.commons:commons-pool2")
+	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("org.awaitility:awaitility")
+	testRuntimeOnly("javax.xml.bind:jaxb-api")
+	testRuntimeOnly("org.glassfish:javax.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
-	testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar")
-	testRuntime("org.javamoney:moneta")
-	testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
+	testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
+	testRuntimeOnly("org.javamoney:moneta")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
diff --git a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
index 24efbb4fea70..94d7f1531456 100644
--- a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
+++ b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
@@ -14,11 +14,11 @@ artifacts {
 }
 
 dependencies {
-	compile("org.jetbrains.kotlin:kotlin-reflect")
-	compile("org.jetbrains.kotlin:kotlin-stdlib")
-	compile("io.projectreactor:reactor-core")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+	api("org.jetbrains.kotlin:kotlin-reflect")
+	api("org.jetbrains.kotlin:kotlin-stdlib")
+	api("io.projectreactor:reactor-core")
+	api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 }
 
 eclipse {
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 822b6ed58acd..d0b294876ef3 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -17,16 +17,16 @@ configurations {
 }
 
 task cglibRepackJar(type: ShadowJar) {
-	archiveBaseName = 'spring-cglib-repack'
-	archiveVersion = cglibVersion
+	archiveBaseName.set('spring-cglib-repack')
+	archiveVersion.set(cglibVersion)
 	configurations = [project.configurations.cglib]
 	relocate 'net.sf.cglib', 'org.springframework.cglib'
 	relocate 'org.objectweb.asm', 'org.springframework.asm'
 }
 
 task objenesisRepackJar(type: ShadowJar) {
-	archiveBaseName = 'spring-objenesis-repack'
-	archiveVersion = objenesisVersion
+	archiveBaseName.set('spring-objenesis-repack')
+	archiveVersion.set(objenesisVersion)
 	configurations = [project.configurations.objenesis]
 	relocate 'org.objenesis', 'org.springframework.objenesis'
 }
@@ -35,9 +35,9 @@ dependencies {
 	cglib("cglib:cglib:${cglibVersion}@jar")
 	objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
 	coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements'))
-	compile(files(cglibRepackJar))
-	compile(files(objenesisRepackJar))
-	compile(project(":spring-jcl"))
+	api(files(cglibRepackJar))
+	api(files(objenesisRepackJar))
+	api(project(":spring-jcl"))
 	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional("net.sf.jopt-simple:jopt-simple")
@@ -51,15 +51,15 @@ dependencies {
 	optional("io.reactivex.rxjava3:rxjava")
 	optional("io.smallrye.reactive:mutiny")
 	optional("io.netty:netty-buffer")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("com.google.code.findbugs:jsr305")
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.xml.bind:jaxb-api")
-	testCompile("com.fasterxml.woodstox:woodstox-core")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile("io.projectreactor.tools:blockhound")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("com.google.code.findbugs:jsr305")
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("com.fasterxml.woodstox:woodstox-core")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation("io.projectreactor.tools:blockhound")
 	testFixturesImplementation("io.projectreactor:reactor-test")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
 	testFixturesImplementation("org.junit.platform:junit-platform-launcher")
diff --git a/spring-expression/spring-expression.gradle b/spring-expression/spring-expression.gradle
index 9f8299d4db90..920f7c7bc07f 100644
--- a/spring-expression/spring-expression.gradle
+++ b/spring-expression/spring-expression.gradle
@@ -3,8 +3,8 @@ description = "Spring Expression Language (SpEL)"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.jetbrains.kotlin:kotlin-stdlib")
+	api(project(":spring-core"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 }
diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle
index e0737be91f53..41aa3f198720 100644
--- a/spring-jdbc/spring-jdbc.gradle
+++ b/spring-jdbc/spring-jdbc.gradle
@@ -3,9 +3,9 @@ description = "Spring JDBC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-tx"))
 	optional(project(":spring-context"))  // for JndiDataSourceLookup
 	optional("javax.transaction:javax.transaction-api")
 	optional("org.hsqldb:hsqldb")
@@ -14,6 +14,6 @@ dependencies {
 	optional("org.apache.derby:derbyclient")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
 }
diff --git a/spring-jms/spring-jms.gradle b/spring-jms/spring-jms.gradle
index a447c97a8084..32485dff84ba 100644
--- a/spring-jms/spring-jms.gradle
+++ b/spring-jms/spring-jms.gradle
@@ -1,10 +1,10 @@
 description = "Spring JMS"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-messaging"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-messaging"))
+	api(project(":spring-tx"))
 	compileOnly("javax.jms:javax.jms-api")
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
@@ -12,8 +12,8 @@ dependencies {
 	optional("javax.resource:javax.resource-api")
 	optional("javax.transaction:javax.transaction-api")
 	optional("com.fasterxml.jackson.core:jackson-databind")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("org.apache.activemq:activemq-broker")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("org.apache.activemq:activemq-broker")
 	testImplementation("javax.jms:javax.jms-api")
 }
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index 2973da314984..eed544b526b3 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -4,8 +4,8 @@ apply plugin: "kotlin"
 apply plugin: "kotlinx-serialization"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
@@ -19,25 +19,25 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("javax.inject:javax.inject-tck")
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("javax.validation:validation-api")
-	testCompile("com.thoughtworks.xstream:xstream")
-	testCompile("org.apache.activemq:activemq-broker")
-	testCompile("org.apache.activemq:activemq-kahadb-store")
-	testCompile("org.apache.activemq:activemq-stomp")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile "io.reactivex.rxjava3:rxjava"
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testRuntime("com.sun.activation:javax.activation")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("javax.json:javax.json-api")
-	testRuntime("org.apache.johnzon:johnzon-jsonb")
-	testRuntime(project(":spring-context"))
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("com.thoughtworks.xstream:xstream")
+	testImplementation("org.apache.activemq:activemq-broker")
+	testImplementation("org.apache.activemq:activemq-kahadb-store")
+	testImplementation("org.apache.activemq:activemq-stomp")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testRuntimeOnly("com.sun.activation:javax.activation")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("javax.json:javax.json-api")
+	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
+	testRuntimeOnly(project(":spring-context"))
 }
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 285e044a14b4..7870f5d77d72 100644
--- a/spring-orm/spring-orm.gradle
+++ b/spring-orm/spring-orm.gradle
@@ -1,21 +1,21 @@
 description = "Spring Object/Relational Mapping"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-jdbc"))
-	compile(project(":spring-tx"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-jdbc"))
+	api(project(":spring-tx"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-web"))
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
 	optional("org.hibernate:hibernate-core")
 	optional("javax.servlet:javax.servlet-api")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.hsqldb:hsqldb")
-	testRuntime("javax.xml.bind:jaxb-api")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.hsqldb:hsqldb")
+	testRuntimeOnly("javax.xml.bind:jaxb-api")
 }
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index 901c4ba072b4..a78b41049e0c 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -23,23 +23,23 @@ sourceSets {
 }
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional("javax.xml.bind:jaxb-api")
 	optional("javax.activation:javax.activation-api")
 	optional("com.thoughtworks.xstream:xstream")
 	optional("org.jibx:jibx-run")
-	testCompile(project(":spring-context"))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.ogce:xpp3")
-	testCompile("org.codehaus.jettison:jettison") {
+	testImplementation(project(":spring-context"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.ogce:xpp3")
+	testImplementation("org.codehaus.jettison:jettison") {
 		exclude group: "stax", module: "stax-api"
 	}
-	//testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
+	//testImplementation(files(genJaxb.classesDir).builtBy(genJaxb))
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
 // JiBX compiler is currently not compatible with JDK 9+.
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index 8fd50bf2e780..5c60dd7d3ad6 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -3,23 +3,23 @@ description = "Spring R2DBC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-tx"))
-	compile("io.r2dbc:r2dbc-spi")
-	compile("io.projectreactor:reactor-core")
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-tx"))
+	api("io.r2dbc:r2dbc-spi")
+	api("io.projectreactor:reactor-core")
 	compileOnly(project(":kotlin-coroutines"))
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("io.r2dbc:r2dbc-h2")
-	testCompile("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("io.r2dbc:r2dbc-spi-test:0.8.1.RELEASE") {
 		exclude group: "org.springframework", module: "spring-jdbc"
 	}
 }
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index e27977c1af02..e15134600b87 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -3,7 +3,7 @@ description = "Spring TestContext Framework"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
+	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-beans"))
 	optional(project(":spring-context"))
@@ -45,41 +45,41 @@ dependencies {
 	optional("io.projectreactor:reactor-test")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":spring-context-support"))
-	testCompile(project(":spring-oxm"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.annotation:javax.annotation-api")
-	testCompile("javax.cache:cache-api")
-	testCompile("javax.ejb:javax.ejb-api")
-	testCompile("javax.interceptor:javax.interceptor-api")
-	testCompile("javax.mail:javax.mail-api")
-	testCompile("org.hibernate:hibernate-core")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("org.junit.platform:junit-platform-runner") {
+	testImplementation(project(":spring-context-support"))
+	testImplementation(project(":spring-oxm"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.annotation:javax.annotation-api")
+	testImplementation("javax.cache:cache-api")
+	testImplementation("javax.ejb:javax.ejb-api")
+	testImplementation("javax.interceptor:javax.interceptor-api")
+	testImplementation("javax.mail:javax.mail-api")
+	testImplementation("org.hibernate:hibernate-core")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("org.junit.platform:junit-platform-runner") {
 		exclude group: "junit", module: "junit"
 	}
-	testCompile("org.junit.platform:junit-platform-testkit")
-	testCompile("com.fasterxml.jackson.core:jackson-databind")
-	testCompile("com.thoughtworks.xstream:xstream")
-	testCompile("com.rometools:rome")
-	testCompile("org.apache.tiles:tiles-api")
-	testCompile("org.apache.tiles:tiles-core")
-	testCompile("org.apache.tiles:tiles-servlet")
-	testCompile("org.hsqldb:hsqldb")
-	testCompile("org.apache.httpcomponents:httpclient")
-	testCompile("io.projectreactor.netty:reactor-netty-http")
-	testCompile("de.bechte.junit:junit-hierarchicalcontextrunner")
-	testRuntime("org.junit.vintage:junit-vintage-engine") {
+	testImplementation("org.junit.platform:junit-platform-testkit")
+	testImplementation("com.fasterxml.jackson.core:jackson-databind")
+	testImplementation("com.thoughtworks.xstream:xstream")
+	testImplementation("com.rometools:rome")
+	testImplementation("org.apache.tiles:tiles-api")
+	testImplementation("org.apache.tiles:tiles-core")
+	testImplementation("org.apache.tiles:tiles-servlet")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.apache.httpcomponents:httpclient")
+	testImplementation("io.projectreactor.netty:reactor-netty-http")
+	testImplementation("de.bechte.junit:junit-hierarchicalcontextrunner")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "junit", module: "junit"
 	}
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
 task junit(type: Test) {
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index 99c829892646..c9447732bc59 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -3,8 +3,8 @@ description = "Spring Transaction"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
 	optional(project(":kotlin-coroutines"))
@@ -19,11 +19,11 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("org.aspectj:aspectjweaver")
-	testCompile("org.codehaus.groovy:groovy")
-	testCompile("org.eclipse.persistence:javax.persistence")
-	testCompile("io.projectreactor:reactor-test")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("org.aspectj:aspectjweaver")
+	testImplementation("org.codehaus.groovy:groovy")
+	testImplementation("org.eclipse.persistence:javax.persistence")
+	testImplementation("io.projectreactor:reactor-test")
 }
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 6d1ca73a86b2..f774f0afb8a9 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -4,8 +4,8 @@ apply plugin: "kotlin"
 apply plugin: "kotlinx-serialization"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional(project(":spring-aop"))
@@ -58,30 +58,30 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("org.apache.taglibs:taglibs-standard-jstlel")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-joda")
-	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-	testCompile("com.fasterxml.jackson.module:jackson-module-kotlin")
-	testCompile("org.apache.tomcat:tomcat-util")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.eclipse.jetty:jetty-server")
-	testCompile("org.eclipse.jetty:jetty-servlet")
-	testCompile("com.squareup.okhttp3:mockwebserver")
-	testCompile("org.jetbrains.kotlin:kotlin-reflect")
-	testCompile("org.skyscreamer:jsonassert")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile("io.projectreactor.tools:blockhound")
-	testRuntime("com.sun.mail:javax.mail")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("javax.json:javax.json-api")
-	testRuntime("org.apache.johnzon:johnzon-jsonb")
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("org.apache.taglibs:taglibs-standard-jstlel")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-joda")
+	testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+	testImplementation("org.apache.tomcat:tomcat-util")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.eclipse.jetty:jetty-server")
+	testImplementation("org.eclipse.jetty:jetty-servlet")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation("io.projectreactor.tools:blockhound")
+	testRuntimeOnly("com.sun.mail:javax.mail")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("javax.json:javax.json-api")
+	testRuntimeOnly("org.apache.johnzon:johnzon-jsonb")
 	testFixturesApi("javax.servlet:javax.servlet-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-params")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index c793b31804ea..7e9e49c69fde 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -3,10 +3,10 @@ description = "Spring WebFlux"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
-	compile(project(":spring-web"))
-	compile("io.projectreactor:reactor-core")
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
+	api(project(":spring-web"))
+	api("io.projectreactor:reactor-core")
 	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-context-support"))  // for FreeMarker support
@@ -27,35 +27,35 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.xml.bind:jaxb-api")
-	testCompile("com.fasterxml:aalto-xml")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("io.reactivex.rxjava3:rxjava")
-	testCompile("io.projectreactor:reactor-test")
-	testCompile("io.undertow:undertow-core")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.apache.tomcat:tomcat-util")
-	testCompile("org.eclipse.jetty:jetty-server")
-	testCompile("org.eclipse.jetty:jetty-servlet")
-	testCompile("org.eclipse.jetty:jetty-reactive-httpclient")
-	testCompile('org.apache.httpcomponents.client5:httpclient5')
-	testCompile('org.apache.httpcomponents.core5:httpcore5-reactive')
-	testCompile("com.squareup.okhttp3:mockwebserver")
-	testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
-	testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223")
-	testRuntime("org.jruby:jruby")
-	testRuntime("org.python:jython-standalone")
-	testRuntime("org.synchronoss.cloud:nio-multipart-parser")
-	testRuntime("org.webjars:underscorejs")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("com.sun.activation:javax.activation")
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.xml.bind:jaxb-api")
+	testImplementation("com.fasterxml:aalto-xml")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.undertow:undertow-core")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.apache.tomcat:tomcat-util")
+	testImplementation("org.eclipse.jetty:jetty-server")
+	testImplementation("org.eclipse.jetty:jetty-servlet")
+	testImplementation("org.eclipse.jetty:jetty-reactive-httpclient")
+	testImplementation('org.apache.httpcomponents.client5:httpclient5')
+	testImplementation('org.apache.httpcomponents.core5:httpcore5-reactive')
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
+	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
+	testRuntimeOnly("org.jruby:jruby")
+	testRuntimeOnly("org.python:jython-standalone")
+	testRuntimeOnly("org.synchronoss.cloud:nio-multipart-parser")
+	testRuntimeOnly("org.webjars:underscorejs")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("com.sun.activation:javax.activation")
 }
 
 test {
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 92deba6aa2f6..36ad9f649ef3 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -3,12 +3,12 @@ description = "Spring Web MVC"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-aop"))
-	compile(project(":spring-beans"))
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
-	compile(project(":spring-expression"))
-	compile(project(":spring-web"))
+	api(project(":spring-aop"))
+	api(project(":spring-beans"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
+	api(project(":spring-expression"))
+	api(project(":spring-web"))
 	compileOnly("javax.servlet:javax.servlet-api")
 	compileOnly("com.google.code.findbugs:findbugs")  // for groovy-templates
 	optional(project(":spring-context-support"))  // for FreeMarker support
@@ -37,38 +37,38 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testCompile(project(":kotlin-coroutines"))
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("javax.servlet:javax.servlet-api")
-	testCompile("org.eclipse.jetty:jetty-servlet") {
+	testImplementation(project(":kotlin-coroutines"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("javax.servlet:javax.servlet-api")
+	testImplementation("org.eclipse.jetty:jetty-servlet") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.eclipse.jetty:jetty-server") {
+	testImplementation("org.eclipse.jetty:jetty-server") {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
-	testCompile("org.apache.httpcomponents:httpclient")
-	testCompile("commons-fileupload:commons-fileupload")
-	testCompile("commons-io:commons-io")
-	testCompile("joda-time:joda-time")
-	testCompile("org.mozilla:rhino")
-	testCompile("org.dom4j:dom4j")
-	testCompile("jaxen:jaxen")
-	testCompile("org.xmlunit:xmlunit-assertj")
-	testCompile("org.xmlunit:xmlunit-matchers")
-	testCompile("org.hibernate:hibernate-validator")
-	testCompile("javax.validation:validation-api")
-	testCompile("io.projectreactor:reactor-core")
-	testCompile("io.reactivex.rxjava3:rxjava")
-	testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
-	testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223")
-	testRuntime("org.jruby:jruby")
-	testRuntime("org.python:jython-standalone")
-	testRuntime("org.webjars:underscorejs")
-	testRuntime("org.glassfish:javax.el")
-	testRuntime("com.sun.xml.bind:jaxb-core")
-	testRuntime("com.sun.xml.bind:jaxb-impl")
-	testRuntime("com.sun.activation:javax.activation")
+	testImplementation("org.apache.httpcomponents:httpclient")
+	testImplementation("commons-fileupload:commons-fileupload")
+	testImplementation("commons-io:commons-io")
+	testImplementation("joda-time:joda-time")
+	testImplementation("org.mozilla:rhino")
+	testImplementation("org.dom4j:dom4j")
+	testImplementation("jaxen:jaxen")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("javax.validation:validation-api")
+	testImplementation("io.projectreactor:reactor-core")
+	testImplementation("io.reactivex.rxjava3:rxjava")
+	testImplementation("org.jetbrains.kotlin:kotlin-script-runtime")
+	testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223")
+	testRuntimeOnly("org.jruby:jruby")
+	testRuntimeOnly("org.python:jython-standalone")
+	testRuntimeOnly("org.webjars:underscorejs")
+	testRuntimeOnly("org.glassfish:javax.el")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("com.sun.activation:javax.activation")
 }
diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle
index 6b311234386b..4ffe0ef667bd 100644
--- a/spring-websocket/spring-websocket.gradle
+++ b/spring-websocket/spring-websocket.gradle
@@ -1,9 +1,9 @@
 description = "Spring WebSocket"
 
 dependencies {
-	compile(project(":spring-context"))
-	compile(project(":spring-core"))
-	compile(project(":spring-web"))
+	api(project(":spring-context"))
+	api(project(":spring-core"))
+	api(project(":spring-web"))
 	optional(project(":spring-messaging"))
 	optional(project(":spring-webmvc"))
 	optional("javax.servlet:javax.servlet-api")
@@ -21,9 +21,9 @@ dependencies {
 	optional("io.undertow:undertow-servlet")
 	optional("io.undertow:undertow-websockets-jsr")
 	optional("com.fasterxml.jackson.core:jackson-databind")
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-web")))
-	testCompile("org.apache.tomcat.embed:tomcat-embed-core")
-	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket")
-	testCompile("io.projectreactor.netty:reactor-netty-http")
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket")
+	testImplementation("io.projectreactor.netty:reactor-netty-http")
 }

From ab41db474e2a94d672fa44f4f66c34c136f7db46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= <sdeleuze@vmware.com>
Date: Sat, 12 Sep 2020 19:41:08 +0200
Subject: [PATCH 110/140] Update dokka to 1.5.0

See gh-26870
---
 build.gradle             |  2 ++
 gradle/docs-dokka.gradle | 30 ++++++++++++++++++++++++++++++
 settings.gradle          |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 gradle/docs-dokka.gradle

diff --git a/build.gradle b/build.gradle
index 059b5fec1d3d..474a370a7657 100644
--- a/build.gradle
+++ b/build.gradle
@@ -313,6 +313,8 @@ configure([rootProject] + javaProjects) { project ->
 
 	pluginManager.withPlugin("kotlin") {
 		apply plugin: "org.jetbrains.dokka"
+		apply from: "${rootDir}/gradle/docs-dokka.gradle"
+
 		compileKotlin {
 			kotlinOptions {
 				languageVersion = "1.3"
diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
new file mode 100644
index 000000000000..ee5e4f15d701
--- /dev/null
+++ b/gradle/docs-dokka.gradle
@@ -0,0 +1,30 @@
+tasks.findByName("dokkaHtmlPartial")?.configure {
+    outputDirectory.set(new File(buildDir, "docs/kdoc"))
+    dokkaSourceSets {
+        configureEach {
+            sourceRoots.setFrom(file("src/main/kotlin"))
+            classpath.from(sourceSets["main"].runtimeClasspath)
+            externalDocumentationLink {
+                url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
+            }
+            externalDocumentationLink {
+                url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
+            }
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 6c2fb1952c6b..8af23c7ca953 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url 'https://repo.spring.io/plugins-release' }
+		maven { url "https://repo.spring.io/plugins-release" }
 	}
 }
 

From ca34d0cce8cb10a989ad60f98114c62c734f834c Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 13 Sep 2021 09:36:07 +0200
Subject: [PATCH 111/140] Polish Gradle upgrade

Closes gh-26870
---
 build.gradle             |  9 +++++---
 gradle/docs-dokka.gradle | 48 ++++++++++++++++++++--------------------
 gradle/docs.gradle       | 45 ++++++++-----------------------------
 3 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/build.gradle b/build.gradle
index 474a370a7657..5d930a2240cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
-	id 'org.asciidoctor.jvm.convert' version '3.1.0'
-	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
+	id 'org.asciidoctor.jvm.convert' version '3.3.2'
+	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
 	id 'de.undercouch.download' version '4.1.2'
 	id "io.freefair.aspectj" version '6.1.0' apply false
 	id "com.github.ben-manes.versions" version '0.39.0'
@@ -381,7 +381,10 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.7.2/api/"
+			"https://junit.org/junit5/docs/5.7.2/api/",
+			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
+			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
+			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
 	] as String[]
 }
 
diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index ee5e4f15d701..85c7a62468a2 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -2,29 +2,29 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
     outputDirectory.set(new File(buildDir, "docs/kdoc"))
     dokkaSourceSets {
         configureEach {
-            sourceRoots.setFrom(file("src/main/kotlin"))
-            classpath.from(sourceSets["main"].runtimeClasspath)
-            externalDocumentationLink {
-                url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
-            }
-            externalDocumentationLink {
-                url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
-            }
-        }
+			sourceRoots.setFrom(file("src/main/kotlin"))
+			classpath.from(sourceSets["main"].runtimeClasspath)
+			externalDocumentationLink {
+				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
+			}
+			externalDocumentationLink {
+				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
+			}
+		}
     }
 }
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 3d1ee01934b8..bfb26d152b9c 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -61,42 +61,15 @@ task api(type: Javadoc) {
 /**
  * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
  */
-/*
-moduleProjects.each { module ->
-	dokkaHtmlPartial {
-		dokkaSourceSets {
-			configureEach {
-				externalDocumentationLink {
-					url.set(URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/"))
-					packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
-				}
-				externalDocumentationLink {
-					url.set(URL("https://projectreactor.io/docs/core/release/api/"))
-				}
-				externalDocumentationLink {
-					url.set(URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/"))
-				}
-				/*
-			This link causes errors, removing to fix the build.
-			externalDocumentationLink {
-				url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
-			}
-			//
-				externalDocumentationLink {
-					url.set(URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/"))
-				}
-			}
+pluginManager.withPlugin("kotlin") {
+	tasks.dokkaHtmlMultiModule.configure {
+		dependsOn {
+			tasks.getByName("api")
 		}
+		moduleName.set("spring-framework")
+		outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 	}
 }
-*/
-tasks.dokkaHtmlMultiModule.configure {
-	dependsOn {
-		tasks.getByName("api")
-	}
-	moduleName.set("spring-framework")
-	outputDirectory.set(project.file("$buildDir/docs/kdoc"))
-}
 
 task downloadResources(type: Download) {
 	def version = "0.2.5"
@@ -195,7 +168,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokkaHtmlMultiModule) {
+	from (dokkaHtmlMultiModule.outputDirectory) {
 		into "kdoc-api"
 	}
 }
@@ -252,11 +225,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}
 
-	from(zipTree(docsZip.archivePath)) {
+	from(zipTree(docsZip.archiveFile)) {
 		into "${baseDir}/docs"
 	}
 
-	from(zipTree(schemaZip.archivePath)) {
+	from(zipTree(schemaZip.archiveFile)) {
 		into "${baseDir}/schema"
 	}
 

From c02ae7bcb86a0aeddc66812d8cadec6cd45a6037 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Mon, 13 Sep 2021 10:14:58 +0200
Subject: [PATCH 112/140] Fix noHttp failure

---
 gradle/docs-dokka.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
index 85c7a62468a2..ef06f904185c 100644
--- a/gradle/docs-dokka.gradle
+++ b/gradle/docs-dokka.gradle
@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("http://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+				url.set(new URL("https://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))

From a087d13aea77cd93b39b36b6e9b68270b140f9da Mon Sep 17 00:00:00 2001
From: Mustafa Ulu <mustafau@sabanciuniv.edu>
Date: Sun, 12 Sep 2021 14:18:54 +0300
Subject: [PATCH 113/140] Fix wording in Javadoc of ClientResponse.mutate()

Removed an extra "the".
---
 .../web/reactive/function/client/ClientResponse.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
index 897a1a28b5d7..5895c4294b00 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -193,7 +193,7 @@ public interface ClientResponse {
 	String logPrefix();
 
 	/**
-	 * Return a builder to mutate the this response, for example to change
+	 * Return a builder to mutate this response, for example to change
 	 * the status, headers, cookies, and replace or transform the body.
 	 * @return a builder to mutate the request with
 	 * @since 5.3

From db424d0bc5b5a8b6d77062039f260edea02bfb66 Mon Sep 17 00:00:00 2001
From: Mustafa Ulu <mustafau@sabanciuniv.edu>
Date: Sun, 12 Sep 2021 14:27:33 +0300
Subject: [PATCH 114/140] Replace word "request" with "response"

---
 .../web/reactive/function/client/ClientResponse.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
index 5895c4294b00..90384a6ede04 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
@@ -195,7 +195,7 @@ public interface ClientResponse {
 	/**
 	 * Return a builder to mutate this response, for example to change
 	 * the status, headers, cookies, and replace or transform the body.
-	 * @return a builder to mutate the request with
+	 * @return a builder to mutate the response with
 	 * @since 5.3
 	 */
 	default Builder mutate() {

From 04e6b233cade1510a2d32bc2f7bfcf2d6e21b9c7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 6 Sep 2021 16:38:37 +0200
Subject: [PATCH 115/140] Upgrade to JUnit 5.8

Closes gh-27392
---
 build.gradle                                     |  6 ++++--
 .../SpringTestContextFrameworkTestSuite.java     | 11 ++++-------
 .../context/env/TestPropertySourceTestSuite.java | 11 ++++-------
 .../junit/SpringJUnitJupiterTestSuite.java       | 16 +++++-----------
 .../reactive/ClientHttpConnectorTests.java       | 11 +++++++----
 .../handler/PathPatternsParameterizedTest.java   |  7 +++++--
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5d930a2240cf..f5419026e941 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ configure(allprojects) { project ->
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
-			mavenBom "org.junit:junit-bom:5.7.2"
+			mavenBom "org.junit:junit-bom:5.8.0"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
@@ -346,6 +346,7 @@ configure([rootProject] + javaProjects) { project ->
 	dependencies {
 		testImplementation("org.junit.jupiter:junit-jupiter-api")
 		testImplementation("org.junit.jupiter:junit-jupiter-params")
+		testImplementation("org.junit.platform:junit-platform-suite-api")
 		testImplementation("org.mockito:mockito-core")
 		testImplementation("org.mockito:mockito-junit-jupiter")
 		testImplementation("io.mockk:mockk")
@@ -353,6 +354,7 @@ configure([rootProject] + javaProjects) { project ->
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
 		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
@@ -381,7 +383,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.7.2/api/",
+			"https://junit.org/junit5/docs/5.8.0/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/0.8.5.RELEASE/api/"
diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
index d1532dfcffc1..4500d5566899 100644
--- a/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/SpringTestContextFrameworkTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 
 package org.springframework.test.context;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.ExcludeTags;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * JUnit Platform based test suite for tests that involve the Spring TestContext
@@ -42,10 +40,9 @@
  * @author Sam Brannen
  * @since 5.2
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @SelectPackages("org.springframework.test.context")
 @IncludeClassNamePatterns(".*Tests?$")
 @ExcludeTags("failing-test-case")
-@UseTechnicalNames
-public class SpringTestContextFrameworkTestSuite {
+class SpringTestContextFrameworkTestSuite {
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
index 97c5c62e2527..e67528774a8b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/env/TestPropertySourceTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@
 
 package org.springframework.test.context.env;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 import org.springframework.test.context.TestPropertySource;
 
@@ -35,10 +33,9 @@
  * @author Sam Brannen
  * @since 5.2
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @IncludeEngines("junit-jupiter")
 @SelectPackages("org.springframework.test.context.env")
 @IncludeClassNamePatterns(".*Tests$")
-@UseTechnicalNames
-public class TestPropertySourceTestSuite {
+class TestPropertySourceTestSuite {
 }
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
index 0a0cf2f84ead..28c8071e1c8c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit/SpringJUnitJupiterTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,17 @@
 
 package org.springframework.test.context.junit;
 
-import org.junit.platform.runner.JUnitPlatform;
 import org.junit.platform.suite.api.ExcludeTags;
 import org.junit.platform.suite.api.IncludeClassNamePatterns;
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.UseTechnicalNames;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.Suite;
 
 /**
- * JUnit 4 based test suite for tests that involve the Spring TestContext
+ * JUnit Platform based test suite for tests that involve the Spring TestContext
  * Framework and JUnit Jupiter (i.e., JUnit 5's programming model).
  *
- * <p>This class intentionally does not reside in the "jupiter" package
- * so that the entire "jupiter" package can be excluded from the Gradle
- * build. This class is therefore responsible for executing all JUnit
- * Jupiter based tests in Spring's official test suite.
+ * <p><strong>This suite is only intended to be used manually within an IDE.</strong>
  *
  * <h3>Logging Configuration</h3>
  *
@@ -46,11 +41,10 @@
  * @author Sam Brannen
  * @since 5.0
  */
-@RunWith(JUnitPlatform.class)
+@Suite
 @IncludeEngines("junit-jupiter")
 @SelectPackages("org.springframework.test.context.junit.jupiter")
 @IncludeClassNamePatterns(".*Tests$")
 @ExcludeTags("failing-test-case")
-@UseTechnicalNames
 public class SpringJUnitJupiterTestSuite {
 }
diff --git a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
index 3c3debef9790..0f30c2391e05 100644
--- a/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/reactive/ClientHttpConnectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,9 @@ void stopServer() throws IOException {
 		server.shutdown();
 	}
 
-	@ParameterizedTest
+	// Do not auto-close arguments since HttpComponentsClientHttpConnector implements
+	// AutoCloseable and is shared between parameterized test invocations.
+	@ParameterizedTest(autoCloseArguments = false)
 	@MethodSource("org.springframework.http.client.reactive.ClientHttpConnectorTests#methodsWithConnectors")
 	void basic(ClientHttpConnector connector, HttpMethod method) throws Exception {
 		URI uri = this.server.url("/").uri();
@@ -198,10 +200,11 @@ private void expectRequest(Consumer<RecordedRequest> consumer) {
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.METHOD)
-	@ParameterizedTest
+	// Do not auto-close arguments since HttpComponentsClientHttpConnector implements
+	// AutoCloseable and is shared between parameterized test invocations.
+	@ParameterizedTest(autoCloseArguments = false)
 	@MethodSource("org.springframework.http.client.reactive.ClientHttpConnectorTests#connectors")
 	public @interface ParameterizedConnectorTest {
-
 	}
 
 	static List<ClientHttpConnector> connectors() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
index 7dc77ff73d18..ead6e38ab1da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathPatternsParameterizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.handler;
 
 import java.lang.annotation.ElementType;
@@ -30,7 +31,9 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-@org.junit.jupiter.params.ParameterizedTest
+// Do not auto-close arguments since ConfigurableWebApplicationContext implements
+// AutoCloseable and is shared between parameterized test invocations.
+@org.junit.jupiter.params.ParameterizedTest(autoCloseArguments = false)
 @org.junit.jupiter.params.provider.MethodSource("pathPatternsArguments")
 public @interface PathPatternsParameterizedTest {
 }

From d55cbf8b4dc2c45259bf69bf983f6b575e188938 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 13 Sep 2021 16:52:00 +0200
Subject: [PATCH 116/140] Avoid use of deprecated API in aggregateTestReports
 task

See gh-26870
---
 spring-test/spring-test.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index e15134600b87..365ce7d316f9 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -112,7 +112,7 @@ test {
 
 task aggregateTestReports(type: TestReport) {
 	description = "Aggregates JUnit and TestNG test reports."
-	destinationDir = test.reports.html.destination
+	destinationDir = test.reports.html.outputLocation.get().getAsFile()
 	reportOn junit, testNG
 }
 

From 52b03e3326559189c329ec3851164a76cc4ee530 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 2 Aug 2021 10:28:20 -0700
Subject: [PATCH 117/140] Migrate CoroutinesUtils to Java

Migrate `CoroutinesUtils` from Kotlin code to Java and drop the
`kotlin-coroutines` module.

This update removes the need for Kotlin tooling IDE plugins to be
installed.

Closes gh-27379
---
 settings.gradle                               |  4 +-
 .../kotlin-coroutines.gradle                  | 35 -------
 .../springframework/core/CoroutinesUtils.kt   | 71 --------------
 spring-core/spring-core.gradle                |  8 +-
 .../springframework/core/CoroutinesUtils.java | 98 +++++++++++++++++++
 spring-messaging/spring-messaging.gradle      |  2 -
 spring-r2dbc/spring-r2dbc.gradle              |  2 -
 spring-tx/spring-tx.gradle                    |  1 -
 spring-web/spring-web.gradle                  |  1 -
 spring-webflux/spring-webflux.gradle          |  2 -
 spring-webmvc/spring-webmvc.gradle            |  1 -
 11 files changed, 101 insertions(+), 124 deletions(-)
 delete mode 100644 spring-core/kotlin-coroutines/kotlin-coroutines.gradle
 delete mode 100644 spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
 create mode 100644 spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java

diff --git a/settings.gradle b/settings.gradle
index 8af23c7ca953..811aa851d64e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,8 +17,6 @@ include "spring-context"
 include "spring-context-indexer"
 include "spring-context-support"
 include "spring-core"
-include "kotlin-coroutines"
-project(':kotlin-coroutines').projectDir = file('spring-core/kotlin-coroutines')
 include "spring-expression"
 include "spring-instrument"
 include "spring-jcl"
@@ -51,7 +49,7 @@ settings.gradle.projectsLoaded {
 			buildScanPublished { scan ->
 				if (buildDir.exists()) {
 					new File(buildDir, "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
-				} 
+				}
 			}
 		}
 	}
diff --git a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle b/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
deleted file mode 100644
index 94d7f1531456..000000000000
--- a/spring-core/kotlin-coroutines/kotlin-coroutines.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-description = "Spring Core Coroutines support"
-
-apply plugin: "kotlin"
-
-configurations {
-	classesOnlyElements {
-		canBeConsumed = true
-		canBeResolved = false
-	}
-}
-
-artifacts {
-	classesOnlyElements(compileKotlin.destinationDir)
-}
-
-dependencies {
-	api("org.jetbrains.kotlin:kotlin-reflect")
-	api("org.jetbrains.kotlin:kotlin-stdlib")
-	api("io.projectreactor:reactor-core")
-	api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	api("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-}
-
-eclipse {
-	project {
-		buildCommand "org.jetbrains.kotlin.ui.kotlinBuilder"
-		buildCommand "org.eclipse.jdt.core.javabuilder"
-		natures "org.jetbrains.kotlin.core.kotlinNature"
-		natures "org.eclipse.jdt.core.javanature"
-		linkedResource name: "kotlin_bin", type: "2", locationUri: "org.jetbrains.kotlin.core.filesystem:/" + project.name + "/kotlin_bin"
-	}
-	classpath {
-		containers "org.jetbrains.kotlin.core.KOTLIN_CONTAINER"
-	}
-}
diff --git a/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt b/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
deleted file mode 100644
index 3d716bb685e0..000000000000
--- a/spring-core/kotlin-coroutines/src/main/kotlin/org/springframework/core/CoroutinesUtils.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@file:JvmName("CoroutinesUtils")
-package org.springframework.core
-
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.reactive.awaitSingleOrNull
-import kotlinx.coroutines.reactor.asFlux
-
-import kotlinx.coroutines.reactor.mono
-import org.reactivestreams.Publisher
-import reactor.core.publisher.Mono
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
-import kotlin.reflect.full.callSuspend
-import kotlin.reflect.jvm.kotlinFunction
-
-/**
- * Convert a [Deferred] instance to a [Mono] one.
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-internal fun <T: Any> deferredToMono(source: Deferred<T>) =
-		mono(Dispatchers.Unconfined) { source.await() }
-
-/**
- * Convert a [Mono] instance to a [Deferred] one.
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-@Suppress("DEPRECATION")
-@OptIn(DelicateCoroutinesApi::class)
-internal fun <T: Any> monoToDeferred(source: Mono<T>) =
-		GlobalScope.async(Dispatchers.Unconfined) { source.awaitSingleOrNull() }
-
-/**
- * Invoke a suspending function and converts it to [Mono] or [reactor.core.publisher.Flux].
- *
- * @author Sebastien Deleuze
- * @since 5.2
- */
-@Suppress("UNCHECKED_CAST")
-fun invokeSuspendingFunction(method: Method, target: Any, vararg args: Any?): Publisher<*> {
-	val function = method.kotlinFunction!!
-	val mono = mono(Dispatchers.Unconfined) {
-		function.callSuspend(target, *args.sliceArray(0..(args.size-2))).let { if (it == Unit) null else it }
-	}.onErrorMap(InvocationTargetException::class.java) { it.targetException }
-	return if (function.returnType.classifier == Flow::class) {
-		mono.flatMapMany { (it as Flow<Any>).asFlux() }
-	}
-	else {
-		mono
-	}
-}
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index d0b294876ef3..a6e5e309b073 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -13,7 +13,6 @@ def objenesisVersion = "3.2"
 configurations {
 	cglib
 	objenesis
-	coroutines
 }
 
 task cglibRepackJar(type: ShadowJar) {
@@ -34,16 +33,16 @@ task objenesisRepackJar(type: ShadowJar) {
 dependencies {
 	cglib("cglib:cglib:${cglibVersion}@jar")
 	objenesis("org.objenesis:objenesis:${objenesisVersion}@jar")
-	coroutines(project(path: ":kotlin-coroutines", configuration: 'classesOnlyElements'))
 	api(files(cglibRepackJar))
 	api(files(objenesisRepackJar))
 	api(project(":spring-jcl"))
-	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional("net.sf.jopt-simple:jopt-simple")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("io.projectreactor:reactor-core")
 	optional("io.reactivex:rxjava")
 	optional("io.reactivex:rxjava-reactive-streams")
@@ -58,7 +57,6 @@ dependencies {
 	testImplementation("com.fasterxml.woodstox:woodstox-core")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation("io.projectreactor.tools:blockhound")
 	testFixturesImplementation("io.projectreactor:reactor-test")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
@@ -91,8 +89,6 @@ jar {
 	from(zipTree(objenesisRepackJar.archivePath)) {
 		include "org/springframework/objenesis/**"
 	}
-
-	from configurations.coroutines
 }
 
 test {
diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
new file mode 100644
index 000000000000..e942ff48ee11
--- /dev/null
+++ b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2002-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+import kotlin.Unit;
+import kotlin.jvm.JvmClassMappingKt;
+import kotlin.reflect.KClassifier;
+import kotlin.reflect.KFunction;
+import kotlin.reflect.full.KCallables;
+import kotlin.reflect.jvm.ReflectJvmMapping;
+import kotlinx.coroutines.BuildersKt;
+import kotlinx.coroutines.CoroutineStart;
+import kotlinx.coroutines.Deferred;
+import kotlinx.coroutines.Dispatchers;
+import kotlinx.coroutines.GlobalScope;
+import kotlinx.coroutines.flow.Flow;
+import kotlinx.coroutines.reactor.MonoKt;
+import kotlinx.coroutines.reactor.ReactorFlowKt;
+import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * Utilities for working with Kotlin Coroutines.
+ *
+ * @author Sebastien Deleuze
+ * @author Phillip Webb
+ * @since 5.2
+ */
+public final class CoroutinesUtils {
+
+	private CoroutinesUtils() {
+	}
+
+	/**
+	 * Convert a {@link Deferred} instance to a {@link Mono}.
+	 */
+	public static <T> Mono<T> deferredToMono(Deferred<T> source) {
+		return MonoKt.mono(Dispatchers.getUnconfined(),
+				(scope, continuation) -> source.await(continuation));
+	}
+
+	/**
+	 * Convert a {@link Mono} instance to a {@link Deferred}.
+	 */
+	public static <T> Deferred<T> monoToDeferred(Mono<T> source) {
+		return BuildersKt.async(GlobalScope.INSTANCE, Dispatchers.getUnconfined(),
+				CoroutineStart.DEFAULT,
+				(scope, continuation) -> MonoKt.awaitSingleOrNull(source, continuation));
+	}
+
+	/**
+	 * Invoke a suspending function and converts it to {@link Mono} or
+	 * {@link Flux}.
+	 */
+	public static Publisher<?> invokeSuspendingFunction(Method method, Object target, Object... args) {
+		KFunction<?> function = Objects.requireNonNull(ReflectJvmMapping.getKotlinFunction(method));
+		KClassifier classifier = function.getReturnType().getClassifier();
+		Mono<Object> mono = MonoKt.mono(Dispatchers.getUnconfined(), (scope, continuation) ->
+					KCallables.callSuspend(function, getSuspendedFunctionArgs(target, args), continuation))
+				.filter(result -> !Objects.equals(result, Unit.INSTANCE))
+				.onErrorMap(InvocationTargetException.class, InvocationTargetException::getTargetException);
+		if (classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
+			return mono.flatMapMany(CoroutinesUtils::asFlux);
+		}
+		return mono;
+	}
+
+	private static Object[] getSuspendedFunctionArgs(Object target, Object... args) {
+		Object[] functionArgs = new Object[args.length];
+		functionArgs[0] = target;
+		System.arraycopy(args, 0, functionArgs, 1, args.length - 1);
+		return functionArgs;
+	}
+
+	private static Flux<?> asFlux(Object flow) {
+		return ReactorFlowKt.asFlux(((Flow<?>) flow));
+	}
+
+}
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index eed544b526b3..c0c7270ebde2 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -6,7 +6,6 @@ apply plugin: "kotlinx-serialization"
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
 	optional("io.projectreactor.netty:reactor-netty-http")
@@ -19,7 +18,6 @@ dependencies {
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("javax.inject:javax.inject-tck")
 	testImplementation("javax.servlet:javax.servlet-api")
diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle
index 5c60dd7d3ad6..dfb6b1ece9d6 100644
--- a/spring-r2dbc/spring-r2dbc.gradle
+++ b/spring-r2dbc/spring-r2dbc.gradle
@@ -8,12 +8,10 @@ dependencies {
 	api(project(":spring-tx"))
 	api("io.r2dbc:r2dbc-spi")
 	api("io.projectreactor:reactor-core")
-	compileOnly(project(":kotlin-coroutines"))
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
index c9447732bc59..f3ec8c3f3ac3 100644
--- a/spring-tx/spring-tx.gradle
+++ b/spring-tx/spring-tx.gradle
@@ -7,7 +7,6 @@ dependencies {
 	api(project(":spring-core"))
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
-	optional(project(":kotlin-coroutines"))
 	optional("javax.ejb:javax.ejb-api")
 	optional("javax.interceptor:javax.interceptor-api")
 	optional("javax.resource:javax.resource-api")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index f774f0afb8a9..716ecb4cecf3 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -6,7 +6,6 @@ apply plugin: "kotlinx-serialization"
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	compileOnly(project(":kotlin-coroutines"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 7e9e49c69fde..b762e09c5cb6 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -7,7 +7,6 @@ dependencies {
 	api(project(":spring-core"))
 	api(project(":spring-web"))
 	api("io.projectreactor:reactor-core")
-	compileOnly(project(":kotlin-coroutines"))
 	optional(project(":spring-context"))
 	optional(project(":spring-context-support"))  // for FreeMarker support
 	optional("javax.servlet:javax.servlet-api")
@@ -27,7 +26,6 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-web")))
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index 36ad9f649ef3..99e70f68f622 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -37,7 +37,6 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":kotlin-coroutines"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))

From 0a776a76d114c95361105a9b7917874815bf3a2e Mon Sep 17 00:00:00 2001
From: yokotaso <tomoya-yokota@cybozu.co.jp>
Date: Thu, 9 Sep 2021 13:58:05 +0900
Subject: [PATCH 118/140] Fix memory leak on AOP Proxy class definition cache

---
 .../org/springframework/aop/framework/AdvisedSupport.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
index 5664cf7ffd55..b2b8060b8a6a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java
@@ -521,8 +521,8 @@ AdvisedSupport getConfigurationOnlyCopy() {
 		copy.copyFrom(this);
 		copy.targetSource = EmptyTargetSource.forClass(getTargetClass(), getTargetSource().isStatic());
 		copy.advisorChainFactory = this.advisorChainFactory;
-		copy.interfaces = this.interfaces;
-		copy.advisors = this.advisors;
+		copy.interfaces = new ArrayList<>(this.interfaces);
+		copy.advisors = new ArrayList<>(this.advisors);
 		return copy;
 	}
 

From 6c17e9375b0d277ea28cb7220b4a162cc9ec0436 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 13 Sep 2021 18:13:41 +0200
Subject: [PATCH 119/140] Reduce log statement for non-unique JavaBean property
 to debug level

Closes gh-27372
---
 .../beans/GenericTypeAwarePropertyDescriptor.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
index 603f5aae150e..b4052b7b84e9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,7 +138,7 @@ public Method getWriteMethodForActualAccess() {
 		Set<Method> ambiguousCandidates = this.ambiguousWriteMethods;
 		if (ambiguousCandidates != null) {
 			this.ambiguousWriteMethods = null;
-			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).warn("Invalid JavaBean property '" +
+			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).debug("Non-unique JavaBean property '" +
 					getName() + "' being accessed! Ambiguous write methods found next to actually used [" +
 					this.writeMethod + "]: " + ambiguousCandidates);
 		}

From 6540e87ac0660f5ec0bc9610656fe658ea75159f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Mon, 13 Sep 2021 18:14:05 +0200
Subject: [PATCH 120/140] Upgrade to Netty 4.1.68, Jackson 2.12.5, Mockito
 3.12.4, MockK 1.12, JsonPath 2.6

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index f5419026e941..881ed62e7ea2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.4"
-			mavenBom "io.netty:netty-bom:4.1.67.Final"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
+			mavenBom "io.netty:netty-bom:4.1.68.Final"
 			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
@@ -197,13 +197,13 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '3.11.0') {
+			dependencySet(group: 'org.mockito', version: '3.12.4') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.11.0"
+			dependency "io.mockk:mockk:1.12.0"
 
 			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
@@ -216,7 +216,7 @@ configure(allprojects) { project ->
 				exclude group: "io.netty", name: "netty"
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
-			dependency "com.jayway.jsonpath:json-path:2.5.0"
+			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
 
 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {

From 18ee308e4e3c59117f4bd41da16e837f88db0933 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 10:58:38 +0200
Subject: [PATCH 121/140] Delete obsolete Assume test utility

---
 .../core/testfixture/Assume.java              | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java

diff --git a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java
deleted file mode 100644
index 83c3dd8d9e90..000000000000
--- a/spring-core/src/testFixtures/java/org/springframework/core/testfixture/Assume.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.core.testfixture;
-
-import org.apache.commons.logging.Log;
-
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-
-/**
- * Utility methods that allow JUnit tests to assume certain conditions hold
- * {@code true}. If an assumption fails, it means the test should be aborted.
- *
- * @author Rob Winch
- * @author Phillip Webb
- * @author Sam Brannen
- * @since 3.2
- * @see #notLogging(Log)
- * @see EnabledForTestGroups @EnabledForTestGroups
- */
-public abstract class Assume {
-
-	/**
-	 * Assume that the specified log is not set to Trace or Debug.
-	 * @param log the log to test
-	 * @throws org.opentest4j.TestAbortedException if the assumption fails
-	 */
-	public static void notLogging(Log log) {
-		assumeFalse(log.isTraceEnabled());
-		assumeFalse(log.isDebugEnabled());
-	}
-
-}

From 8c14251a1a9b0d0f5a2c4fbdcd1d1703fb07cea3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 11:24:28 +0200
Subject: [PATCH 122/140] Upgrade to nohttp 0.0.10

This upgrade avoids warnings about the following on Gradle 7.1+.

- The Report.destination property has been deprecated.
- The JavaExec.main property has been deprecated.

See gh-26870
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 881ed62e7ea2..c7fb7843f22f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
-	id 'io.spring.nohttp' version '0.0.5.RELEASE'
+	id 'io.spring.nohttp' version '0.0.10'
 	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'

From b1a4d3033be769073d3b4408ececf2cef63164d9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 11:35:12 +0200
Subject: [PATCH 123/140] Avoid usage of deprecated Gradle API in
 spring-oxm.gradle

This upgrade avoids the warning about the following on Gradle 7.1+.

- The SourceDirectorySet.outputDir property has been deprecated.

Closes gh-26870
---
 spring-oxm/spring-oxm.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index a78b41049e0c..f47726a8bd5b 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -16,6 +16,7 @@ dependencies {
 xjc {
 	xjcVersion = '2.2'
 }
+
 sourceSets {
 	test {
 		xjcTargetPackage = 'org.springframework.oxm.jaxb.test'
@@ -55,7 +56,7 @@ if ((JavaVersion.current() == JavaVersion.VERSION_1_8) && !project.hasProperty("
 						classpath: configurations.jibx.asPath)
 
 				jibx(verbose: false, load: true, binding: bindingXml) {
-					classpathset(dir: sourceSets.test.java.outputDir) {
+					classpathset(dir: sourceSets.test.java.classesDirectory.get().getAsFile()) {
 						include(name: "**/jibx/**/*")
 					}
 				}

From 8adf28763bd01bec4647ce70f9111481141cf5f1 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 14 Sep 2021 14:24:47 +0200
Subject: [PATCH 124/140] Upgrade to Reactor 2020.0.11

Closes gh-27399
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c7fb7843f22f..8a3207ccc859 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ configure(allprojects) { project ->
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
 			mavenBom "io.netty:netty-bom:4.1.68.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.10"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
 			mavenBom "io.rsocket:rsocket-bom:1.1.1"
 			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"

From 674dc2f2039fb6186b35ab674c3046ecd5809bb3 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Sep 2021 13:40:26 +0100
Subject: [PATCH 125/140] Do not log request parameters for multipart requests

Closes gh-27350
---
 .../org/springframework/web/servlet/DispatcherServlet.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
index 19cb32564ce7..5be28f3e13e0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
@@ -978,7 +978,10 @@ protected void doService(HttpServletRequest request, HttpServletResponse respons
 	private void logRequest(HttpServletRequest request) {
 		LogFormatUtils.traceDebug(logger, traceOn -> {
 			String params;
-			if (isEnableLoggingRequestDetails()) {
+			if (StringUtils.startsWithIgnoreCase(request.getContentType(), "multipart/")) {
+				params = "multipart";
+			}
+			else if (isEnableLoggingRequestDetails()) {
 				params = request.getParameterMap().entrySet().stream()
 						.map(entry -> entry.getKey() + ":" + Arrays.toString(entry.getValue()))
 						.collect(Collectors.joining(", "));

From c46cc666d6bd5b26860964d8bceddb528d7897b2 Mon Sep 17 00:00:00 2001
From: Dmitriy Bogdanov <d@di72nn.com>
Date: Fri, 10 Sep 2021 17:38:42 +0400
Subject: [PATCH 126/140] Fix some typos and mistakes in ref docs

Closes gh-27388
---
 src/docs/asciidoc/core/core-aop.adoc          |  4 +-
 src/docs/asciidoc/core/core-beans.adoc        | 99 ++++++++++---------
 .../asciidoc/core/core-databuffer-codec.adoc  |  6 +-
 src/docs/asciidoc/core/core-expressions.adoc  |  4 +-
 src/docs/asciidoc/core/core-validation.adoc   |  9 +-
 src/docs/asciidoc/data-access.adoc            | 43 ++++----
 src/docs/asciidoc/integration.adoc            | 27 ++---
 src/docs/asciidoc/overview.adoc               |  2 +-
 src/docs/asciidoc/testing.adoc                |  1 +
 src/docs/asciidoc/web/integration.adoc        |  6 +-
 src/docs/asciidoc/web/web-uris.adoc           |  6 +-
 src/docs/asciidoc/web/webflux-view.adoc       |  2 +-
 src/docs/asciidoc/web/webmvc-cors.adoc        |  2 +-
 src/docs/asciidoc/web/webmvc-functional.adoc  |  4 +-
 src/docs/asciidoc/web/webmvc-view.adoc        |  4 +-
 src/docs/asciidoc/web/webmvc.adoc             | 38 +++----
 src/docs/asciidoc/web/websocket.adoc          |  6 +-
 17 files changed, 134 insertions(+), 129 deletions(-)

diff --git a/src/docs/asciidoc/core/core-aop.adoc b/src/docs/asciidoc/core/core-aop.adoc
index a6412096e492..6479f329b5d9 100644
--- a/src/docs/asciidoc/core/core-aop.adoc
+++ b/src/docs/asciidoc/core/core-aop.adoc
@@ -366,7 +366,7 @@ the https://www.eclipse.org/aspectj/doc/released/progguide/index.html[AspectJ
 Programming Guide] (and, for extensions, the
 https://www.eclipse.org/aspectj/doc/released/adk15notebook/index.html[AspectJ 5
 Developer's Notebook]) or one of the books on AspectJ (such as _Eclipse AspectJ_, by Colyer
-et. al., or _AspectJ in Action_, by Ramnivas Laddad).
+et al., or _AspectJ in Action_, by Ramnivas Laddad).
 
 
 [[aop-pointcuts-designators]]
@@ -893,7 +893,7 @@ scoping). You can include the contextual designators to match based on
 join point context or bind that context for use in the advice. Supplying only a
 kinded designator or only a contextual designator works but could affect weaving
 performance (time and memory used), due to extra processing and analysis. Scoping
-designators are very fast to match, and using them usage means AspectJ can very quickly
+designators are very fast to match, and using them means AspectJ can very quickly
 dismiss groups of join points that should not be further processed. A good
 pointcut should always include one if possible.
 
diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc
index 2a8c526d2617..5ba741761f28 100644
--- a/src/docs/asciidoc/core/core-beans.adoc
+++ b/src/docs/asciidoc/core/core-beans.adoc
@@ -1024,7 +1024,7 @@ by type without help. Consider the following class:
 
 	class ExampleBean(
 		private val years: Int, // Number of years to calculate the Ultimate Answer
-		private val ultimateAnswer: String// The Answer to Life, the Universe, and Everything
+		private val ultimateAnswer: String // The Answer to Life, the Universe, and Everything
 	)
 ----
 
@@ -1608,7 +1608,7 @@ listings shows how to use the `parent` attribute:
 ----
 	<!-- in the parent context -->
 	<bean id="accountService" class="com.something.SimpleAccountService">
-		<!-- insert dependencies as required as here -->
+		<!-- insert dependencies as required here -->
 	</bean>
 ----
 
@@ -1690,7 +1690,7 @@ respectively. The following example shows how to use them:
 		<property name="someMap">
 			<map>
 				<entry key="an entry" value="just some string"/>
-				<entry key ="a ref" value-ref="myDataSource"/>
+				<entry key="a ref" value-ref="myDataSource"/>
 			</map>
 		</property>
 		<!-- results in a setSomeSet(java.util.Set) call -->
@@ -1834,7 +1834,7 @@ class SomeClass {
 When the `accounts` property of the `something` bean is prepared for injection, the generics
 information about the element type of the strongly-typed `Map<String, Float>` is
 available by reflection. Thus, Spring's type conversion infrastructure recognizes the
-various value elements as being of type `Float`, and the string values (`9.99, 2.75`, and
+various value elements as being of type `Float`, and the string values (`9.99`, `2.75`, and
 `3.99`) are converted into an actual `Float` type.
 
 
@@ -2028,7 +2028,7 @@ not commonly used since the plain order of declaration is usually sufficient the
 In practice, the constructor resolution
 <<beans-factory-ctor-arguments-resolution,mechanism>> is quite efficient in matching
 arguments, so unless you really need to, we recommend using the name notation
-through-out your configuration.
+throughout your configuration.
 
 
 [[beans-compound-property-names]]
@@ -2503,13 +2503,13 @@ declared return type of the lookup method:
 	public abstract class CommandManager {
 
 		public Object process(Object commandState) {
-			MyCommand command = createCommand();
+			Command command = createCommand();
 			command.setState(commandState);
 			return command.execute();
 		}
 
 		@Lookup
-		protected abstract MyCommand createCommand();
+		protected abstract Command createCommand();
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -2604,9 +2604,9 @@ interface provides the new method definition, as the following example shows:
 .Kotlin
 ----
 	/**
-	* meant to be used to override the existing computeValue(String)
-	* implementation in MyValueCalculator
-	*/
+	 * meant to be used to override the existing computeValue(String)
+	 * implementation in MyValueCalculator
+	 */
 	class ReplacementComputeValue : MethodReplacer {
 
 		override fun reimplement(obj: Any, method: Method, args: Array<out Any>): Any {
@@ -2806,7 +2806,7 @@ prototype-scoped bean repeatedly at runtime. You cannot dependency-inject a
 prototype-scoped bean into your singleton bean, because that injection occurs only
 once, when the Spring container instantiates the singleton bean and resolves
 and injects its dependencies. If you need a new instance of a prototype bean at
-runtime more than once, see <<beans-factory-method-injection>>
+runtime more than once, see <<beans-factory-method-injection>>.
 
 
 
@@ -2984,7 +2984,7 @@ The Spring container creates a new instance of the `AppPreferences` bean by usin
 `appPreferences` bean is scoped at the `ServletContext` level and stored as a regular
 `ServletContext` attribute. This is somewhat similar to a Spring singleton bean but
 differs in two important ways: It is a singleton per `ServletContext`, not per Spring
-'ApplicationContext' (for which there may be several in any given web application),
+`ApplicationContext` (for which there may be several in any given web application),
 and it is actually exposed and therefore visible as a `ServletContext` attribute.
 
 When using annotation-driven components or Java configuration, you can use the
@@ -3100,7 +3100,7 @@ to the HTTP `Session`-scoped bean (`userPreferences`). The salient point here is
 `userManager` bean is a singleton: it is instantiated exactly once per
 container, and its dependencies (in this case only one, the `userPreferences` bean) are
 also injected only once. This means that the `userManager` bean operates only on the
-exact same `userPreferences` object (that is, the one with which it was originally injected.
+exact same `userPreferences` object (that is, the one with which it was originally injected).
 
 This is not the behavior you want when injecting a shorter-lived scoped bean into a
 longer-lived scoped bean (for example, injecting an HTTP `Session`-scoped collaborating
@@ -3928,7 +3928,7 @@ shows the definition of the BeanNameAware interface:
 ----
 
 The callback is invoked after population of normal bean properties but before an
-initialization callback such as `InitializingBean`, `afterPropertiesSet`, or a custom
+initialization callback such as `InitializingBean.afterPropertiesSet()` or a custom
 init-method.
 
 
@@ -3960,7 +3960,7 @@ dependency type. The following table summarizes the most important `Aware` inter
 
 | `BeanFactoryAware`
 | Declaring `BeanFactory`.
-| <<beans-factory-aware>>
+| <<beans-beanfactory>>
 
 | `BeanNameAware`
 | Name of the declaring bean.
@@ -4142,7 +4142,7 @@ or it may wrap a bean with a proxy. Some Spring AOP infrastructure classes are
 implemented as bean post-processors in order to provide proxy-wrapping logic.
 
 An `ApplicationContext` automatically detects any beans that are defined in the
-configuration metadata that implements the `BeanPostProcessor` interface. The
+configuration metadata that implement the `BeanPostProcessor` interface. The
 `ApplicationContext` registers these beans as post-processors so that they can be called
 later, upon bean creation. Bean post-processors can be deployed in the container in the
 same fashion as any other beans.
@@ -4673,11 +4673,11 @@ example:
 ----
 	class SimpleMovieLister {
 
-	@Required
-	lateinit var movieFinder: MovieFinder
+		@Required
+		lateinit var movieFinder: MovieFinder
 
-	// ...
-}
+		// ...
+	}
 ----
 
 This annotation indicates that the affected bean property must be populated at
@@ -5373,7 +5373,7 @@ Letting qualifier values select against target bean names, within the type-match
 candidates, does not require a `@Qualifier` annotation at the injection point.
 If there is no other resolution indicator (such as a qualifier or a primary marker),
 for a non-unique dependency situation, Spring matches the injection point name
-(that is, the field name or parameter name) against the target bean names and choose the
+(that is, the field name or parameter name) against the target bean names and chooses the
 same-named candidate, if any.
 ====
 
@@ -6042,14 +6042,14 @@ example shows:
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
-    @Configuration
-    public class AppConfig {
+	@Configuration
+	public class AppConfig {
 
-         @Bean
-         public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
-               return new PropertySourcesPlaceholderConfigurer();
-         }
-    }
+		@Bean
+		public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+			return new PropertySourcesPlaceholderConfigurer();
+		}
+	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -6075,7 +6075,7 @@ will get properties from `application.properties` and `application.yml` files.
 
 Built-in converter support provided by Spring allows simple type conversion (to `Integer`
 or `int` for example) to be automatically handled. Multiple comma-separated values can be
-automatically converted to String array without extra effort.
+automatically converted to `String` array without extra effort.
 
 It is possible to provide a default value as following:
 
@@ -6099,8 +6099,8 @@ It is possible to provide a default value as following:
 	class MovieRecommender(@Value("\${catalog.name:defaultCatalog}") private val catalog: String)
 ----
 
-A Spring `BeanPostProcessor` uses a `ConversionService` behind the scene to handle the
-process for converting the String value in `@Value` to the target type. If you want to
+A Spring `BeanPostProcessor` uses a `ConversionService` behind the scenes to handle the
+process for converting the `String` value in `@Value` to the target type. If you want to
 provide conversion support for your own custom type, you can provide your own
 `ConversionService` bean instance as the following example shows:
 
@@ -6126,7 +6126,7 @@ provide conversion support for your own custom type, you can provide your own
 
 		@Bean
 		fun conversionService(): ConversionService {
-				return DefaultFormattingConversionService().apply {
+			return DefaultFormattingConversionService().apply {
 				addConverter(MyCustomConverter())
 			}
 		}
@@ -6315,7 +6315,7 @@ is meta-annotated with `@Component`, as the following example shows:
 		// ...
 	}
 ----
-<1> The `Component` causes `@Service` to be treated in the same way as `@Component`.
+<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
 
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
@@ -6329,7 +6329,7 @@ is meta-annotated with `@Component`, as the following example shows:
 		// ...
 	}
 ----
-<1> The `Component` causes `@Service` to be treated in the same way as `@Component`.
+<1> The `@Component` causes `@Service` to be treated in the same way as `@Component`.
 
 You can also combine meta-annotations to create "`composed annotations`". For example,
 the `@RestController` annotation from Spring MVC is composed of `@Controller` and
@@ -6591,7 +6591,7 @@ and using "`stub`" repositories instead:
 			includeFilters = @Filter(type = FilterType.REGEX, pattern = ".*Stub.*Repository"),
 			excludeFilters = @Filter(Repository.class))
 	public class AppConfig {
-		...
+		// ...
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -7157,7 +7157,7 @@ configuration, as shown in the following example:
 With Gradle 4.6 and later, the dependency should be declared in the `annotationProcessor`
 configuration, as shown in the following example:
 
-[source,groovy,indent=0subs="verbatim,quotes,attributes"]
+[source,groovy,indent=0,subs="verbatim,quotes,attributes"]
 ----
 	dependencies {
 		annotationProcessor "org.springframework:spring-context-indexer:{spring-version}"
@@ -7631,7 +7631,7 @@ to reduce subtle bugs that can be hard to track down when operating in "`lite`"
 ****
 
 The `@Bean` and `@Configuration` annotations are discussed in depth in the following sections.
-First, however, we cover the various ways of creating a spring container using by
+First, however, we cover the various ways of creating a spring container by using
 Java-based configuration.
 
 
@@ -7758,7 +7758,7 @@ To enable component scanning, you can annotate your `@Configuration` class as fo
 	@Configuration
 	@ComponentScan(basePackages = "com.acme") // <1>
 	public class AppConfig  {
-		...
+		// ...
 	}
 ----
 <1> This annotation enables component scanning.
@@ -7892,6 +7892,7 @@ init-param):
 
 `@Bean` is a method-level annotation and a direct analog of the XML `<bean/>` element.
 The annotation supports some of the attributes offered by `<bean/>`, such as:
+
 * <<beans-factory-lifecycle-initializingbean, init-method>>
 * <<beans-factory-lifecycle-disposablebean, destroy-method>>
 * <<beans-factory-autowire,autowiring>>
@@ -7980,7 +7981,7 @@ return type, as the following example shows:
 
 However, this limits the visibility for advance type prediction to the specified
 interface type (`TransferService`). Then, with the full type (`TransferServiceImpl`)
-known to the container only once, the affected singleton bean has been instantiated.
+known to the container only once the affected singleton bean has been instantiated.
 Non-lazy singleton beans get instantiated according to their declaration order,
 so you may see different type matching results depending on when another component
 tries to match by a non-declared type (such as `@Autowired TransferServiceImpl`,
@@ -8295,7 +8296,7 @@ as the following example shows:
 	@Configuration
 	public class AppConfig {
 
-		@Bean(name = "myThing")
+		@Bean("myThing")
 		public Thing thing() {
 			return new Thing();
 		}
@@ -8388,7 +8389,7 @@ annotation, as the following example shows:
 === Using the `@Configuration` annotation
 
 `@Configuration` is a class-level annotation indicating that an object is a source of
-bean definitions. `@Configuration` classes declare beans through `@Bean` annotated
+bean definitions. `@Configuration` classes declare beans through `@Bean`-annotated
 methods. Calls to `@Bean` methods on `@Configuration` classes can also be used to define
 inter-bean dependencies. See <<beans-java-basic-concepts>> for a general introduction.
 
@@ -9137,7 +9138,7 @@ method that returns `true` or `false`. For example, the following listing shows
 		val attrs = metadata.getAllAnnotationAttributes(Profile::class.java.name)
 		if (attrs != null) {
 			for (value in attrs["value"]!!) {
-				if (context.environment.acceptsProfiles(Profiles .of(*value as Array<String>))) {
+				if (context.environment.acceptsProfiles(Profiles.of(*value as Array<String>))) {
 					return true
 				}
 			}
@@ -9901,7 +9902,7 @@ as a way to provide a default definition for one or more beans. If any
 profile is enabled, the default profile does not apply.
 
 You can change the name of the default profile by using `setDefaultProfiles()` on
-the `Environment` or ,declaratively, by using the `spring.profiles.default` property.
+the `Environment` or, declaratively, by using the `spring.profiles.default` property.
 
 
 
@@ -10720,7 +10721,7 @@ following example shows how to do so:
 ----
 
 It is also possible to add additional runtime filtering by using the `condition` attribute
-of the annotation that defines a <<expressions, `SpEL` expression>> , which should match
+of the annotation that defines a <<expressions, `SpEL` expression>>, which should match
 to actually invoke the method for a particular event.
 
 The following example shows how our notifier can be rewritten to be invoked only if the
@@ -10832,10 +10833,12 @@ The following example shows how to do so:
 Be aware of the following limitations when using asynchronous events:
 
 * If an asynchronous event listener throws an `Exception`, it is not propagated to the
-  caller. See `AsyncUncaughtExceptionHandler` for more details.
+  caller. See
+  {api-spring-framework}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`AsyncUncaughtExceptionHandler`]
+  for more details.
 * Asynchronous event listener methods cannot publish a subsequent event by returning a
   value. If you need to publish another event as the result of the processing, inject an
-  {api-spring-framework}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`ApplicationEventPublisher`]
+  {api-spring-framework}/context/ApplicationEventPublisher.html[`ApplicationEventPublisher`]
   to publish the event manually.
 
 
@@ -11093,8 +11096,8 @@ For a simple deployment of a Spring ApplicationContext as a Java EE RAR file:
 . Package
 all application classes into a RAR file (which is a standard JAR file with a different
 file extension).
-.Add all required library JARs into the root of the RAR archive.
-.Add a
+. Add all required library JARs into the root of the RAR archive.
+. Add a
 `META-INF/ra.xml` deployment descriptor (as shown in the {api-spring-framework}/jca/context/SpringContextResourceAdapter.html[javadoc for `SpringContextResourceAdapter`])
 and the corresponding Spring XML bean definition file(s) (typically
 `META-INF/applicationContext.xml`).
diff --git a/src/docs/asciidoc/core/core-databuffer-codec.adoc b/src/docs/asciidoc/core/core-databuffer-codec.adoc
index ca5065144961..7abf40a0cdaa 100644
--- a/src/docs/asciidoc/core/core-databuffer-codec.adoc
+++ b/src/docs/asciidoc/core/core-databuffer-codec.adoc
@@ -12,7 +12,7 @@ APIs as follows:
 * <<databuffers-buffer>> represents a byte buffer, which may be
 <<databuffers-buffer-pooled, pooled>>.
 * <<databuffers-utils>> offers utility methods for data buffers.
-* <<Codecs>> decode or encode streams data buffer streams into higher level objects.
+* <<Codecs>> decode or encode data buffer streams into higher level objects.
 
 
 
@@ -127,9 +127,9 @@ others that prefetch and cache data items internally, or is using operators such
 `filter`, `skip`, and others that leave out items, then
 `doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release)` must be added to the
 composition chain to ensure such buffers are released prior to being discarded, possibly
-also as a result an error or cancellation signal.
+also as a result of an error or cancellation signal.
 . If a `Decoder` holds on to one or more data buffers in any other way, it must
-ensure they are released when fully read, or in case an error or cancellation signals that
+ensure they are released when fully read, or in case of an error or cancellation signals that
 take place before the cached data buffers have been read and released.
 
 Note that `DataBufferUtils#join` offers a safe and efficient way to aggregate a data
diff --git a/src/docs/asciidoc/core/core-expressions.adoc b/src/docs/asciidoc/core/core-expressions.adoc
index c0cd157e2fb2..074523d392d1 100644
--- a/src/docs/asciidoc/core/core-expressions.adoc
+++ b/src/docs/asciidoc/core/core-expressions.adoc
@@ -357,7 +357,7 @@ the list:
 	// Turn on:
 	// - auto null reference initialization
 	// - auto collection growing
-	SpelParserConfiguration config = new SpelParserConfiguration(true,true);
+	SpelParserConfiguration config = new SpelParserConfiguration(true, true);
 
 	ExpressionParser parser = new SpelExpressionParser(config);
 
@@ -465,7 +465,7 @@ following example shows how to do so:
 .Java
 ----
 	SpelParserConfiguration config = new SpelParserConfiguration(SpelCompilerMode.IMMEDIATE,
-		this.getClass().getClassLoader());
+			this.getClass().getClassLoader());
 
 	SpelExpressionParser parser = new SpelExpressionParser(config);
 
diff --git a/src/docs/asciidoc/core/core-validation.adoc b/src/docs/asciidoc/core/core-validation.adoc
index 5d80f2a0820a..cded5e664ee0 100644
--- a/src/docs/asciidoc/core/core-validation.adoc
+++ b/src/docs/asciidoc/core/core-validation.adoc
@@ -382,7 +382,7 @@ properties:
 ----
 
 The following code snippets show some examples of how to retrieve and manipulate some of
-the properties of instantiated `Companies` and `Employees`:
+the properties of instantiated ``Company``s and ``Employee``s:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -629,7 +629,7 @@ Note that all bean factories and application contexts automatically use a number
 built-in property editors, through their use of a `BeanWrapper` to
 handle property conversions. The standard property editors that the `BeanWrapper`
 registers are listed in the <<beans-beans-conversion, previous section>>.
-Additionally, `ApplicationContexts` also override or add additional editors to handle
+Additionally, ``ApplicationContext``s also override or add additional editors to handle
 resource lookups in a manner appropriate to the specific application context type.
 
 Standard JavaBeans `PropertyEditor` instances are used to convert property values
@@ -790,7 +790,7 @@ The following example shows how to create your own `PropertyEditorRegistrar` imp
 
 See also the `org.springframework.beans.support.ResourceEditorRegistrar` for an example
 `PropertyEditorRegistrar` implementation. Notice how in its implementation of the
-`registerCustomEditors(..)` method ,it creates new instances of each property editor.
+`registerCustomEditors(..)` method, it creates new instances of each property editor.
 
 The next example shows how to configure a `CustomEditorConfigurer` and inject an instance of our
 `CustomPropertyEditorRegistrar` into it:
@@ -1347,6 +1347,7 @@ listing shows the definition of the `AnnotationFormatterFactory` interface:
 ----
 
 To create an implementation:
+
 . Parameterize A to be the field `annotationType` with which you wish to associate
 formatting  logic -- for example `org.springframework.format.annotation.DateTimeFormat`.
 . Have `getFieldTypes()` return the types of fields on which the annotation can be used.
@@ -1470,7 +1471,7 @@ The following example uses `@DateTimeFormat` to format a `java.util.Date` as an
 .Kotlin
 ----
 	class MyModel(
-		@DateTimeFormat(iso= ISO.DATE) private val date: Date
+		@DateTimeFormat(iso=ISO.DATE) private val date: Date
 	)
 ----
 
diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 61c8b6330c6f..388e4bbf5cd8 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -445,7 +445,7 @@ relevant `TransactionManager`.
 [[tx-resource-synchronization-high]]
 ==== High-level Synchronization Approach
 
-The preferred approach is to use Spring's highest-level template based persistence
+The preferred approach is to use Spring's highest-level template-based persistence
 integration APIs or to use native ORM APIs with transaction-aware factory beans or
 proxies for managing the native resource factories. These transaction-aware solutions
 internally handle resource creation and reuse, cleanup, optional transaction
@@ -1878,7 +1878,7 @@ rollback rules, timeouts, and other features.
 ==== Transaction Propagation
 
 This section describes some semantics of transaction propagation in Spring. Note
-that this section is not an introduction to transaction propagation proper. Rather, it
+that this section is not a proper introduction to transaction propagation. Rather, it
 details some of the semantics regarding transaction propagation in Spring.
 
 In Spring-managed transactions, be aware of the difference between physical and
@@ -2121,7 +2121,7 @@ declarative approach:
 
 		<aop:config>
 			<aop:pointcut id="entryPointMethod" expression="execution(* x.y..*Service.*(..))"/>
-			<!-- runs after the profiling advice (c.f. the order attribute) -->
+			<!-- runs after the profiling advice (cf. the order attribute) -->
 
 			<aop:advisor advice-ref="txAdvice" pointcut-ref="entryPointMethod" order="2"/>
 			<!-- order value is higher than the profiling aspect -->
@@ -2164,7 +2164,7 @@ container by means of an AspectJ aspect. To do so, first annotate your classes
 (and optionally your classes' methods) with the `@Transactional` annotation,
 and then link (weave) your application with the
 `org.springframework.transaction.aspectj.AnnotationTransactionAspect` defined in the
-`spring-aspects.jar` file. You must also configure The aspect with a transaction
+`spring-aspects.jar` file. You must also configure the aspect with a transaction
 manager. You can use the Spring Framework's IoC container to take care of
 dependency-injecting the aspect. The simplest way to configure the transaction
 management aspect is to use the `<tx:annotation-driven/>` element and specify the `mode`
@@ -2585,8 +2585,7 @@ following example shows how to do so:
 	TransactionStatus status = txManager.getTransaction(def);
 	try {
 		// put your business logic here
-	}
-	catch (MyException ex) {
+	} catch (MyException ex) {
 		txManager.rollback(status);
 		throw ex;
 	}
@@ -3295,7 +3294,7 @@ For example, it may be better to write the preceding code snippet as follows:
 	};
 
 	public List<Actor> findAllActors() {
-		return this.jdbcTemplate.query( "select first_name, last_name from t_actor", actorRowMapper);
+		return this.jdbcTemplate.query("select first_name, last_name from t_actor", actorRowMapper);
 	}
 ----
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -3605,7 +3604,7 @@ variable and the corresponding value that is plugged into the `namedParameters`
 variable (of type `MapSqlParameterSource`).
 
 Alternatively, you can pass along named parameters and their corresponding values to a
-`NamedParameterJdbcTemplate` instance by using the `Map`-based style.The remaining
+`NamedParameterJdbcTemplate` instance by using the `Map`-based style. The remaining
 methods exposed by the `NamedParameterJdbcOperations` and implemented by the
 `NamedParameterJdbcTemplate` class follow a similar pattern and are not covered here.
 
@@ -3743,7 +3742,7 @@ See also <<jdbc-JdbcTemplate-idioms>> for guidelines on using the
 ==== Using `SQLExceptionTranslator`
 
 `SQLExceptionTranslator` is an interface to be implemented by classes that can translate
-between `SQLExceptions` and Spring's own `org.springframework.dao.DataAccessException`,
+between ``SQLException``s and Spring's own `org.springframework.dao.DataAccessException`,
 which is agnostic in regard to data access strategy. Implementations can be generic (for
 example, using SQLState codes for JDBC) or proprietary (for example, using Oracle error
 codes) for greater precision.
@@ -3799,9 +3798,9 @@ You can extend `SQLErrorCodeSQLExceptionTranslator`, as the following example sh
 
 		override fun customTranslate(task: String, sql: String?, sqlEx: SQLException): DataAccessException? {
 			if (sqlEx.errorCode == -12345) {
-					return DeadlockLoserDataAccessException(task, sqlEx)
-				}
-				return null;
+				return DeadlockLoserDataAccessException(task, sqlEx)
+			}
+			return null
 		}
 	}
 ----
@@ -4034,7 +4033,7 @@ The following example updates a column for a certain primary key:
 
 In the preceding example,
 an SQL statement has placeholders for row parameters. You can pass the parameter values
-in as varargs or ,alternatively, as an array of objects. Thus, you should explicitly wrap primitives
+in as varargs or, alternatively, as an array of objects. Thus, you should explicitly wrap primitives
 in the primitive wrapper classes, or you should use auto-boxing.
 
 
@@ -4577,7 +4576,7 @@ The following example shows a batch update that uses a batch size of 100:
 	}
 ----
 
-The batch update methods for this call returns an array of `int` arrays that contains an
+The batch update method for this call returns an array of `int` arrays that contains an
 array entry for each batch with an array of the number of affected rows for each update.
 The top-level array's length indicates the number of batches run, and the second level
 array's length indicates the number of updates in that batch. The number of updates in
@@ -5173,11 +5172,9 @@ as the following example shows:
 ----
 	public class JdbcActorDao implements ActorDao {
 
-		private JdbcTemplate jdbcTemplate;
 		private SimpleJdbcCall funcGetActorName;
 
 		public void setDataSource(DataSource dataSource) {
-			this.jdbcTemplate = new JdbcTemplate(dataSource);
 			JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 			jdbcTemplate.setResultsMapCaseInsensitive(true);
 			this.funcGetActorName = new SimpleJdbcCall(jdbcTemplate)
@@ -5443,7 +5440,7 @@ example shows such a method:
 The `SqlUpdate` class encapsulates an SQL update. As with a query, an update object is
 reusable, and, as with all `RdbmsOperation` classes, an update can have parameters and is
 defined in SQL. This class provides a number of `update(..)` methods analogous to the
-`execute(..)` methods of query objects. The `SQLUpdate` class is concrete. It can be
+`execute(..)` methods of query objects. The `SqlUpdate` class is concrete. It can be
 subclassed -- for example, to add a custom update method.
 However, you do not have to subclass the `SqlUpdate`
 class, since it can easily be parameterized by setting SQL and declaring parameters.
@@ -6031,7 +6028,7 @@ limit is 1000.
 In addition to the primitive values in the value list, you can create a `java.util.List`
 of object arrays. This list can support multiple expressions being defined for the `in`
 clause, such as `select * from T_ACTOR where (id, last_name) in \((1, 'Johnson'), (2,
-'Harrop'\))`. This, of course, requires that your database supports this syntax.
+'Harrop'))`. This, of course, requires that your database supports this syntax.
 
 
 [[jdbc-complex-types]]
@@ -7093,7 +7090,7 @@ databases, you may want multiple `DatabaseClient` instances, which requires mult
 instances.
 
 [[r2dbc-auto-generated-keys]]
-== Retrieving Auto-generated Keys
+=== Retrieving Auto-generated Keys
 
 `INSERT` statements may generate keys when inserting rows into a table
 that defines an auto-increment or identity column. To get full control over
@@ -7387,7 +7384,9 @@ examples (one for Java configuration and one for XML configuration) show how to
 ----
 	@Repository
 	class ProductDaoImpl : ProductDao {
+
 		// class body here...
+
 	}
 ----
 
@@ -7427,7 +7426,7 @@ cover the other ORM technologies and show brief examples.
 
 NOTE: As of Spring Framework 5.3, Spring requires Hibernate ORM 5.2+ for Spring's
 `HibernateJpaVendorAdapter` as well as for a native Hibernate `SessionFactory` setup.
-Is is strongly recommended to go with Hibernate ORM 5.4 for a newly started application.
+It is strongly recommended to go with Hibernate ORM 5.4 for a newly started application.
 For use with `HibernateJpaVendorAdapter`, Hibernate Search needs to be upgraded to 5.11.6.
 
 
@@ -7958,7 +7957,7 @@ persistence unit name. The following XML example configures such a bean:
 This form of JPA deployment is the simplest and the most limited. You cannot refer to an
 existing JDBC `DataSource` bean definition, and no support for global transactions
 exists. Furthermore, weaving (byte-code transformation) of persistent classes is
-provider-specific, often requiring a specific JVM agent to specified on startup. This
+provider-specific, often requiring a specific JVM agent to be specified on startup. This
 option is sufficient only for stand-alone applications and test environments, for which
 the JPA specification is designed.
 
@@ -8093,7 +8092,7 @@ more insight regarding the `LoadTimeWeaver` implementations and their setup, eit
 generic or customized to various platforms (such as Tomcat, JBoss and WebSphere).
 
 As described in <<core.adoc#aop-aj-ltw-spring, Spring configuration>>, you can configure
-a context-wide `LoadTimeWeaver` by using the `@EnableLoadTimeWeaving` annotation of the
+a context-wide `LoadTimeWeaver` by using the `@EnableLoadTimeWeaving` annotation or the
 `context:load-time-weaver` XML element. Such a global weaver is automatically picked up
 by all JPA `LocalContainerEntityManagerFactoryBean` instances. The following example
 shows the preferred way of setting up a load-time weaver, delivering auto-detection
diff --git a/src/docs/asciidoc/integration.adoc b/src/docs/asciidoc/integration.adoc
index aa17752e28e5..883acc17867a 100644
--- a/src/docs/asciidoc/integration.adoc
+++ b/src/docs/asciidoc/integration.adoc
@@ -390,7 +390,7 @@ model and corresponding services:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	public class Account implements Serializable{
+	public class Account implements Serializable {
 
 		private String name;
 
@@ -445,7 +445,7 @@ section of the Spring AMQP reference.
 [[remoting-autodection-remote-interfaces]]
 [NOTE]
 ====
-Auto-detection is not implemented for remote interfaces
+Auto-detection is not implemented for remote interfaces.
 
 The main reason why auto-detection of implemented interfaces does not occur for remote
 interfaces is to avoid opening too many doors to remote callers. The target object might
@@ -514,7 +514,7 @@ Spring provides full support for the standard Java web services APIs:
 * Accessing web services using JAX-WS
 
 In addition to stock support for JAX-WS in Spring Core, the Spring portfolio also
-features http://www.springframework.org/spring-ws[Spring Web Services], which is a solution for
+features https://projects.spring.io/spring-ws[Spring Web Services], which is a solution for
 contract-first, document-driven web services -- highly recommended for building modern,
 future-proof web services.
 
@@ -711,7 +711,7 @@ as the following example shows:
 ----
 
 NOTE: The above is slightly simplified in that JAX-WS requires endpoint interfaces
-and implementation classes to be annotated with `@WebService`, `@SOAPBinding` etc
+and implementation classes to be annotated with `@WebService`, `@SOAPBinding`, etc.
 annotations. This means that you cannot (easily) use plain Java interfaces and
 implementation classes as JAX-WS endpoint artifacts; you need to annotate them
 accordingly first. Check the JAX-WS documentation for details on those requirements.
@@ -1610,7 +1610,7 @@ cache size is set to `1`. You can use the `sessionCacheSize` property to increas
 cached sessions. Note that the number of actual cached sessions is more than that
 number, as sessions are cached based on their acknowledgment mode, so there can be up to
 four cached session instances (one for each
-acknowledgment mode) when `sessionCacheSize` is set to one . `MessageProducer` and `MessageConsumer` instances are cached within their
+acknowledgment mode) when `sessionCacheSize` is set to one. `MessageProducer` and `MessageConsumer` instances are cached within their
 owning session and also take into account the unique properties of the producers and
 consumers when caching. MessageProducers are cached based on their destination.
 MessageConsumers are cached based on a key composed of the destination, selector,
@@ -1621,7 +1621,7 @@ noLocal delivery flag, and the durable subscription name (if creating durable co
 ==== Destination Management
 
 Destinations, as `ConnectionFactory` instances, are JMS administered objects that you can store
-and retrieved in JNDI. When configuring a Spring application context, you can use the
+and retrieve in JNDI. When configuring a Spring application context, you can use the
 JNDI `JndiObjectFactoryBean` factory class or `<jee:jndi-lookup>` to perform dependency
 injection on your object's references to JMS destinations. However, this strategy
 is often cumbersome if there are a large number of destinations in the application or if there
@@ -1734,7 +1734,7 @@ use a proper cache level in such a case.
 This container also has recoverable capabilities when the broker goes down. By default,
 a simple `BackOff` implementation retries every five seconds. You can specify
 a custom `BackOff` implementation for more fine-grained recovery options. See
-api-spring-framework/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
+{api-spring-framework}/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
 
 NOTE: Like its sibling (<<jms-mdp-simple, `SimpleMessageListenerContainer`>>),
 `DefaultMessageListenerContainer` supports native JMS transactions and allows for
@@ -1747,7 +1747,7 @@ Any such arrangements are significantly more efficient than the alternative:
 wrapping your entire processing with an XA transaction (through configuring your
 `DefaultMessageListenerContainer` with an `JtaTransactionManager`) to cover the
 reception of the JMS message as well as the execution of the business logic in your
-message listener (including database operations etc).
+message listener (including database operations, etc.).
 
 IMPORTANT: The default `AUTO_ACKNOWLEDGE` mode does not provide proper reliability guarantees.
 Messages can get lost when listener execution fails (since the provider automatically
@@ -1864,7 +1864,7 @@ content. The overloaded methods `convertAndSend()` and `receiveAndConvert()` met
 `JmsTemplate` delegate the conversion process to an instance of the `MessageConverter`
 interface. This interface defines a simple contract to convert between Java objects and
 JMS messages. The default implementation (`SimpleMessageConverter`) supports conversion
-between `String` and `TextMessage`, `byte[]` and `BytesMesssage`, and `java.util.Map`
+between `String` and `TextMessage`, `byte[]` and `BytesMessage`, and `java.util.Map`
 and `MapMessage`. By using the converter, you and your application code can focus on the
 business object that is being sent or received through JMS and not be concerned with the
 details of how it is represented as a JMS message.
@@ -4392,7 +4392,7 @@ email when someone places an order:
 					+ order.getCustomer().getLastName()
 					+ ", thank you for placing order. Your order number is "
 					+ order.getOrderNumber());
-			try{
+			try {
 				this.mailSender.send(msg);
 			}
 			catch (MailException ex) {
@@ -5646,15 +5646,16 @@ compliant caches (such as Ehcache 3.x). See <<cache-plug>> for more information
 plugging in other cache stores and providers.
 
 IMPORTANT: The caching abstraction has no special handling for multi-threaded and
-multi-process environments, as such features are handled by the cache implementation. .
+multi-process environments, as such features are handled by the cache implementation.
 
 If you have a multi-process environment (that is, an application deployed on several nodes),
 you need to configure your cache provider accordingly. Depending on your use cases, a copy
 of the same data on several nodes can be enough. However, if you change the data during
 the course of the application, you may need to enable other propagation mechanisms.
 
-Caching a particular item is a direct equivalent of the typical get-if-not-found-then-
-proceed-and-put-eventually code blocks found with programmatic cache interaction.
+Caching a particular item is a direct equivalent of the typical
+get-if-not-found-then-proceed-and-put-eventually code blocks
+found with programmatic cache interaction.
 No locks are applied, and several threads may try to load the same item concurrently.
 The same applies to eviction. If several threads are trying to update or evict data
 concurrently, you may use stale data. Certain cache providers offer advanced features
diff --git a/src/docs/asciidoc/overview.adoc b/src/docs/asciidoc/overview.adoc
index ba74cd35647b..fb24ceef6352 100644
--- a/src/docs/asciidoc/overview.adoc
+++ b/src/docs/asciidoc/overview.adoc
@@ -44,7 +44,7 @@ parallel, the Spring WebFlux reactive web framework.
 A note about modules: Spring's framework jars allow for deployment to JDK 9's module path
 ("Jigsaw"). For use in Jigsaw-enabled applications, the Spring Framework 5 jars come with
 "Automatic-Module-Name" manifest entries which define stable language-level module names
-("spring.core", "spring.context" etc) independent from jar artifact names (the jars follow
+("spring.core", "spring.context", etc.) independent from jar artifact names (the jars follow
 the same naming pattern with "-" instead of ".", e.g. "spring-core" and "spring-context").
 Of course, Spring's framework jars keep working fine on the classpath on both JDK 8 and 9+.
 
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 64f07918d46e..6c03726905f5 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -503,6 +503,7 @@ The following example shows such a case:
 		// class body...
 	}
 ----
+<1> Declaring an initializer class.
 
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
diff --git a/src/docs/asciidoc/web/integration.adoc b/src/docs/asciidoc/web/integration.adoc
index 3bac6bb28b96..62d0ef27516b 100644
--- a/src/docs/asciidoc/web/integration.adoc
+++ b/src/docs/asciidoc/web/integration.adoc
@@ -29,12 +29,12 @@ entry points into a server-side application, and it delegates to service objects
 (facades) that are defined in a service layer to satisfy business-specific (and
 presentation-technology agnostic) use cases. In Spring, these service objects, any other
 business-specific objects, data-access objects, and others exist in a distinct "`business
-context`", which contains no web or presentation layer objects (presentation objects
-,such as Spring MVC controllers, are typically configured in a distinct "`presentation
+context`", which contains no web or presentation layer objects (presentation objects,
+such as Spring MVC controllers, are typically configured in a distinct "`presentation
 context`"). This section details how you can configure a Spring container (a
 `WebApplicationContext`) that contains all of the 'business beans' in your application.
 
-Moving on to specifics, all you one need to do is declare a
+Moving on to specifics, all you need to do is declare a
 {api-spring-framework}/web/context/ContextLoaderListener.html[`ContextLoaderListener`]
 in the standard Java EE servlet `web.xml` file of your web application and add a
 `contextConfigLocation`<context-param/> section (in the same file) that defines which
diff --git a/src/docs/asciidoc/web/web-uris.adoc b/src/docs/asciidoc/web/web-uris.adoc
index a36394043b10..11fffde9226f 100644
--- a/src/docs/asciidoc/web/web-uris.adoc
+++ b/src/docs/asciidoc/web/web-uris.adoc
@@ -95,8 +95,8 @@ You can shorten it further still with a full URI template, as the following exam
 .Kotlin
 ----
 	val uri = UriComponentsBuilder
-		.fromUriString("https://example.com/hotels/{hotel}?q={q}")
-		.build("Westin", "123")
+			.fromUriString("https://example.com/hotels/{hotel}?q={q}")
+			.build("Westin", "123")
 ----
 
 
@@ -278,7 +278,7 @@ You can shorten it further still with a full URI template, as the following exam
 ----
 
 The `WebClient` and the `RestTemplate` expand and encode URI templates internally through
-the `UriBuilderFactory` strategy. Both can be configured with a custom strategy.
+the `UriBuilderFactory` strategy. Both can be configured with a custom strategy,
 as the following example shows:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
diff --git a/src/docs/asciidoc/web/webflux-view.adoc b/src/docs/asciidoc/web/webflux-view.adoc
index 51a7a1500879..379d5e1a29ff 100644
--- a/src/docs/asciidoc/web/webflux-view.adoc
+++ b/src/docs/asciidoc/web/webflux-view.adoc
@@ -232,7 +232,7 @@ Java 8+. Using the latest update release available is highly recommended.
  line should be added for Kotlin script support. See
  https://github.com/sdeleuze/kotlin-script-templating[this example] for more detail.
 
-You need to have the script templating library. One way to do that for Javascript is
+You need to have the script templating library. One way to do that for JavaScript is
 through https://www.webjars.org/[WebJars].
 
 
diff --git a/src/docs/asciidoc/web/webmvc-cors.adoc b/src/docs/asciidoc/web/webmvc-cors.adoc
index f86e775c39c6..c73e88bebf22 100644
--- a/src/docs/asciidoc/web/webmvc-cors.adoc
+++ b/src/docs/asciidoc/web/webmvc-cors.adoc
@@ -50,7 +50,7 @@ Each `HandlerMapping` can be
 {api-spring-framework}/web/servlet/handler/AbstractHandlerMapping.html#setCorsConfigurations-java.util.Map-[configured]
 individually with URL pattern-based `CorsConfiguration` mappings. In most cases, applications
 use the MVC Java configuration or the XML namespace to declare such mappings, which results
-in a single global map being passed to all `HandlerMappping` instances.
+in a single global map being passed to all `HandlerMapping` instances.
 
 You can combine global CORS configuration at the `HandlerMapping` level with more
 fine-grained, handler-level CORS configuration. For example, annotated controllers can use
diff --git a/src/docs/asciidoc/web/webmvc-functional.adoc b/src/docs/asciidoc/web/webmvc-functional.adoc
index 1dd3779e1ed4..e40758a781e6 100644
--- a/src/docs/asciidoc/web/webmvc-functional.adoc
+++ b/src/docs/asciidoc/web/webmvc-functional.adoc
@@ -103,7 +103,7 @@ as the following example shows:
 
 
 If you register the `RouterFunction` as a bean, for instance by exposing it in a
-@Configuration class, it will be auto-detected by the servlet, as explained in <<webmvc-fn-running>>.
+`@Configuration` class, it will be auto-detected by the servlet, as explained in <<webmvc-fn-running>>.
 
 
 
@@ -475,7 +475,7 @@ For instance, the router function builder offers the method `GET(String, Handler
 Besides HTTP method-based mapping, the route builder offers a way to introduce additional
 predicates when mapping to requests.
 For each HTTP method there is an overloaded variant that takes a `RequestPredicate` as a
-parameter, though which additional constraints can be expressed.
+parameter, through which additional constraints can be expressed.
 
 
 [[webmvc-fn-predicates]]
diff --git a/src/docs/asciidoc/web/webmvc-view.adoc b/src/docs/asciidoc/web/webmvc-view.adoc
index fdca1d02bca4..c127d1ffe43a 100644
--- a/src/docs/asciidoc/web/webmvc-view.adoc
+++ b/src/docs/asciidoc/web/webmvc-view.adoc
@@ -615,7 +615,7 @@ Java 8+. Using the latest update release available is highly recommended.
  line should be added for Kotlin script support. See
  https://github.com/sdeleuze/kotlin-script-templating[this example] for more details.
 
-You need to have the script templating library. One way to do that for Javascript is
+You need to have the script templating library. One way to do that for JavaScript is
 through https://www.webjars.org/[WebJars].
 
 
@@ -1697,7 +1697,7 @@ located in the `WEB-INF/defs` directory. At initialization of the `WebApplicatio
 the files are loaded, and the definitions factory are initialized. After that has
 been done, the Tiles included in the definition files can be used as views within your
 Spring web application. To be able to use the views, you have to have a `ViewResolver`
-as with any other view technology in Spring : typically a convenient `TilesViewResolver`.
+as with any other view technology in Spring: typically a convenient `TilesViewResolver`.
 
 You can specify locale-specific Tiles definitions by adding an underscore and then
 the locale, as the following example shows:
diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc
index 077bcf39cc56..d12b6ab923e8 100644
--- a/src/docs/asciidoc/web/webmvc.adoc
+++ b/src/docs/asciidoc/web/webmvc.adoc
@@ -580,12 +580,12 @@ itself, excluding the `contextPath` and any `servletMapping` prefix, if present.
 
 The `servletPath` and `pathInfo` are decoded and that makes them impossible to compare
 directly to the full `requestURI` in order to derive the lookupPath and that makes it
-necessary to decode the `requestUri`. However this introduces its own issues because the
+necessary to decode the `requestURI`. However this introduces its own issues because the
 path may contain encoded reserved characters such as `"/"` or `";"` that can in turn
 alter the structure of the path after they are decoded which can also lead to security
 issues. In addition, Servlet containers may normalize the `servletPath` to varying
 degrees which makes it further impossible to perform `startsWith` comparisons against
-the `requestUri`.
+the `requestURI`.
 
 This is why it is best to avoid reliance on the `servletPath` which comes with the
 prefix-based `servletPath` mapping type. If the `DispatcherServlet` is mapped as the
@@ -597,7 +597,7 @@ a `UrlPathHelper` with `alwaysUseFullPath=true` via <<mvc-config-path-matching>>
 the MVC config.
 
 Fortunately the default Servlet mapping `"/"` is a good choice. However, there is still
-an issue in that the `requestUri` needs to be decoded to make it possible to compare to
+an issue in that the `requestURI` needs to be decoded to make it possible to compare to
 controller mappings. This is again undesirable because of the potential to decode
 reserved characters that alter the path structure. If such characters are not expected,
 then you can reject them (like the Spring Security HTTP firewall), or you can configure
@@ -787,7 +787,7 @@ The following table provides more details on the `ViewResolver` hierarchy:
   you can use the `removeFromCache(String viewName, Locale loc)` method.
 
 | `UrlBasedViewResolver`
-| Simple implementation of the `ViewResolver` interface that affects the direct
+| Simple implementation of the `ViewResolver` interface that effects the direct
   resolution of logical view names to URLs without an explicit mapping definition.
   This is appropriate if your logical names match the names of your view resources
   in a straightforward manner, without the need for arbitrary mappings.
@@ -1545,8 +1545,8 @@ There are also HTTP method specific shortcut variants of `@RequestMapping`:
 
 The shortcuts are <<mvc-ann-requestmapping-composed>> that are provided because,
 arguably, most controller methods should be mapped to a specific HTTP method versus
-using `@RequestMapping`, which, by default, matches to all HTTP methods. At the same,
-a `@RequestMapping` is still needed at the class level to express shared mappings.
+using `@RequestMapping`, which, by default, matches to all HTTP methods.
+A `@RequestMapping` is still needed at the class level to express shared mappings.
 
 The following example has type and method level mappings:
 
@@ -1723,7 +1723,7 @@ one of the following depending on whether use of parsed `PathPattern` is enabled
 * {api-spring-framework}/web/util/pattern/PathPattern.html#SPECIFICITY_COMPARATOR[`PathPattern.SPECIFICITY_COMPARATOR`]
 * {api-spring-framework}/util/AntPathMatcher.html#getPatternComparator-java.lang.String-[`AntPathMatcher.getPatternComparator(String path)`]
 
-Both help to sorts patterns with more specific ones on top. A pattern is less specific if
+Both help to sort patterns with more specific ones on top. A pattern is less specific if
 it has a lower count of URI variables (counted as 1), single wildcards (counted as 1),
 and double wildcards (counted as 2). Given an equal score, the longer pattern is chosen.
 Given the same score and length, the pattern with more URI variables than wildcards is
@@ -1752,7 +1752,7 @@ using the `Accept` header should be the preferred choice.
 Over time, the use of file name extensions has proven problematic in a variety of ways.
 It can cause ambiguity when overlain with the use of URI variables, path parameters, and
 URI encoding. Reasoning about URL-based authorization
-and security (see next section for more details) also become more difficult.
+and security (see next section for more details) also becomes more difficult.
 
 To completely disable the use of path extensions in versions prior to 5.3, set the following:
 
@@ -2171,7 +2171,7 @@ and others) and is equivalent to `required=false`.
 | If a method argument is not matched to any of the earlier values in this table and it is
   a simple type (as determined by
 	{api-spring-framework}/beans/BeanUtils.html#isSimpleProperty-java.lang.Class-[BeanUtils#isSimpleProperty],
-  it is a resolved as a `@RequestParam`. Otherwise, it is resolved as a `@ModelAttribute`.
+  it is resolved as a `@RequestParam`. Otherwise, it is resolved as a `@ModelAttribute`.
 |===
 
 
@@ -2300,7 +2300,7 @@ argument as `@Nullable`.
 ====
 As of 5.3, non-null arguments will be enforced even after type conversion. If your handler
 method intends to accept a null value as well, either declare your argument as `@Nullable`
-or mark it as `required=false` in the corresponding `@RequestParam` etc annotation. This is
+or mark it as `required=false` in the corresponding `@RequestParam`, etc. annotation. This is
 a best practice and the recommended solution for regressions encountered in a 5.3 upgrade.
 
 Alternatively, you may specifically handle e.g. the resulting `MissingPathVariableException`
@@ -2777,8 +2777,8 @@ alternatively, set `@ModelAttribute(binding=false)`, as the following example sh
 <1> Setting `@ModelAttribute(binding=false)`.
 
 You can automatically apply validation after data binding by adding the
-`javax.validation.Valid` annotation or Spring's `@Validated` annotation (
-<<core.adoc#validation-beanvalidation, Bean Validation>> and
+`javax.validation.Valid` annotation or Spring's `@Validated` annotation
+(<<core.adoc#validation-beanvalidation, Bean Validation>> and
 <<core.adoc#validation, Spring validation>>). The following example shows how to do so:
 
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
@@ -2841,7 +2841,7 @@ The following example uses the `@SessionAttributes` annotation:
 ----
 	@Controller
 	@SessionAttributes("pet") // <1>
-	public class EditPetForm {
+	class EditPetForm {
 		// ...
 	}
 ----
@@ -2866,9 +2866,8 @@ storage, as the following example shows:
 			if (errors.hasErrors) {
 				// ...
 			}
-				status.setComplete(); // <2>
-				// ...
-			}
+			status.setComplete(); // <2>
+			// ...
 		}
 	}
 ----
@@ -4357,7 +4356,7 @@ Spring MVC has an extensive integration with Servlet 3.0 asynchronous request
 <<mvc-ann-async-processing,processing>>:
 
 * <<mvc-ann-async-deferredresult, `DeferredResult`>> and <<mvc-ann-async-callable, `Callable`>>
-return values in controller methods and provide basic support for a single asynchronous
+return values in controller methods provide basic support for a single asynchronous
 return value.
 * Controllers can <<mvc-ann-async-http-streaming,stream>> multiple values, including
 <<mvc-ann-async-sse, SSE>> and <<mvc-ann-async-output-stream, raw data>>.
@@ -4889,7 +4888,7 @@ use case-oriented approach that focuses on the common scenarios:
 	val ccCustom = CacheControl.maxAge(10, TimeUnit.DAYS).noTransform().cachePublic()
 ----
 
-`WebContentGenerator` also accept a simpler `cachePeriod` property (defined in seconds) that
+`WebContentGenerator` also accepts a simpler `cachePeriod` property (defined in seconds) that
 works as follows:
 
 * A `-1` value does not generate a `Cache-Control` response header.
@@ -4941,7 +4940,7 @@ settings to a `ResponseEntity`, as the following example shows:
 	}
 ----
 
-The preceding example sends an 304 (NOT_MODIFIED) response with an empty body if the comparison
+The preceding example sends a 304 (NOT_MODIFIED) response with an empty body if the comparison
 to the conditional request headers indicates that the content has not changed. Otherwise, the
 `ETag` and `Cache-Control` headers are added to the response.
 
@@ -5104,6 +5103,7 @@ following example shows:
 	@Configuration
 	@EnableWebMvc
 	class WebConfig : WebMvcConfigurer {
+
 		// Implement configuration methods...
 	}
 ----
diff --git a/src/docs/asciidoc/web/websocket.adoc b/src/docs/asciidoc/web/websocket.adoc
index 07751ff57317..e4ee1e49c055 100644
--- a/src/docs/asciidoc/web/websocket.adoc
+++ b/src/docs/asciidoc/web/websocket.adoc
@@ -1118,7 +1118,7 @@ Contract for sending a message that enables loose coupling between producers and
 `SubscribableChannel` that uses an `Executor` for delivering messages.
 
 Both the Java configuration (that is, `@EnableWebSocketMessageBroker`) and the XML namespace configuration
-(that is,`<websocket:message-broker>`) use the preceding components to assemble a message
+(that is, `<websocket:message-broker>`) use the preceding components to assemble a message
 workflow. The following diagram shows the components used when the simple built-in message
 broker is enabled:
 
@@ -1191,7 +1191,7 @@ is established, STOMP frames begin to flow on it.
 . The client sends a SUBSCRIBE frame with a destination header of `/topic/greeting`. Once received
 and decoded, the message is sent to the `clientInboundChannel` and is then routed to the
 message broker, which stores the client subscription.
-. The client sends a aSEND frame to `/app/greeting`. The `/app` prefix helps to route it to
+. The client sends a SEND frame to `/app/greeting`. The `/app` prefix helps to route it to
 annotated controllers. After the `/app` prefix is stripped, the remaining `/greeting`
 part of the destination is mapped to the `@MessageMapping` method in `GreetingController`.
 . The value returned from `GreetingController` is turned into a Spring `Message` with
@@ -1768,7 +1768,7 @@ WebSocket and SockJS requests.
 
 Therefore, applications that wish to avoid the use of cookies may not have any good
 alternatives for authentication at the HTTP protocol level. Instead of using cookies,
-they may prefer to authenticate with headers at the STOMP messaging protocol level
+they may prefer to authenticate with headers at the STOMP messaging protocol level.
 Doing so requires two simple steps:
 
 . Use the STOMP client to pass authentication headers at connect time.

From 813dbbce5894231193a3006c5d72e8a58e0863f9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 15:05:45 +0200
Subject: [PATCH 127/140] Polish contribution

See gh-27388
---
 src/docs/asciidoc/data-access.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc
index 388e4bbf5cd8..fa0ccbe73f4a 100644
--- a/src/docs/asciidoc/data-access.adoc
+++ b/src/docs/asciidoc/data-access.adoc
@@ -6027,7 +6027,7 @@ limit is 1000.
 
 In addition to the primitive values in the value list, you can create a `java.util.List`
 of object arrays. This list can support multiple expressions being defined for the `in`
-clause, such as `select * from T_ACTOR where (id, last_name) in \((1, 'Johnson'), (2,
+clause, such as `select * from T_ACTOR where (id, last_name) in ((1, 'Johnson'), (2,
 'Harrop'))`. This, of course, requires that your database supports this syntax.
 
 

From caf88ff2cc311b345f5fc0a5ced54d24bd9d553f Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Tue, 14 Sep 2021 14:57:45 +0100
Subject: [PATCH 128/140] Improve HandlerMethod#bridgedMethod initialization

Ensure makeAccessible is called once when the bridgedMethod is
initialized.

Closes gh-19795
---
 .../springframework/messaging/handler/HandlerMethod.java    | 6 +++++-
 .../handler/invocation/InvocableHandlerMethod.java          | 4 +---
 .../handler/invocation/reactive/InvocableHandlerMethod.java | 4 +---
 .../java/org/springframework/web/method/HandlerMethod.java  | 4 ++++
 .../web/method/support/InvocableHandlerMethod.java          | 2 --
 .../web/reactive/result/method/InvocableHandlerMethod.java  | 4 +---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
index 496266b1089d..4ace844929fb 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -87,6 +88,7 @@ public HandlerMethod(Object bean, Method method) {
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
@@ -102,6 +104,7 @@ public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = bean.getClass().getMethod(methodName, parameterTypes);
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(this.method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
@@ -123,6 +126,7 @@ public HandlerMethod(String beanName, BeanFactory beanFactory, Method method) {
 		this.beanType = ClassUtils.getUserClass(beanType);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 	}
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
index b9430fdb9aa6..3dc5e2ec2630 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.HandlerMethod;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Extension of {@link HandlerMethod} that invokes the underlying method with
@@ -166,7 +165,6 @@ protected Object[] getMethodArgumentValues(Message<?> message, Object... provide
 	 */
 	@Nullable
 	protected Object doInvoke(Object... args) throws Exception {
-		ReflectionUtils.makeAccessible(getBridgedMethod());
 		try {
 			return getBridgedMethod().invoke(getBean(), args);
 		}
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
index d4dfe1530683..aad9384af251 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@
 import org.springframework.messaging.handler.HandlerMethod;
 import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Extension of {@link HandlerMethod} that invokes the underlying method with
@@ -130,7 +129,6 @@ public Mono<Object> invoke(Message<?> message, Object... providedArgs) {
 			boolean isSuspendingFunction = false;
 			try {
 				Method method = getBridgedMethod();
-				ReflectionUtils.makeAccessible(method);
 				if (KotlinDetector.isSuspendingFunction(method)) {
 					isSuspendingFunction = true;
 					value = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
index 35bf35ac01c5..80d6e7999eb4 100644
--- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
@@ -42,6 +42,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
@@ -119,6 +120,7 @@ protected HandlerMethod(Object bean, Method method, @Nullable MessageSource mess
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
@@ -137,6 +139,7 @@ public HandlerMethod(Object bean, String methodName, Class<?>... parameterTypes)
 		this.beanType = ClassUtils.getUserClass(bean);
 		this.method = bean.getClass().getMethod(methodName, parameterTypes);
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(this.method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
@@ -172,6 +175,7 @@ public HandlerMethod(
 		this.beanType = ClassUtils.getUserClass(beanType);
 		this.method = method;
 		this.bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+		ReflectionUtils.makeAccessible(this.bridgedMethod);
 		this.parameters = initMethodParameters();
 		evaluateResponseStatus();
 		this.description = initDescription(this.beanType, this.method);
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
index 80f98393f3a3..970afd65503d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -28,7 +28,6 @@
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -199,7 +198,6 @@ protected Object[] getMethodArgumentValues(NativeWebRequest request, @Nullable M
 	@Nullable
 	protected Object doInvoke(Object... args) throws Exception {
 		Method method = getBridgedMethod();
-		ReflectionUtils.makeAccessible(method);
 		try {
 			if (KotlinDetector.isSuspendingFunction(method)) {
 				return CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
index fb2e31a52479..b117a197aa8e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
@@ -137,7 +136,6 @@ public Mono<HandlerResult> invoke(
 		return getMethodArgumentValues(exchange, bindingContext, providedArgs).flatMap(args -> {
 			Object value;
 			try {
-				ReflectionUtils.makeAccessible(getBridgedMethod());
 				Method method = getBridgedMethod();
 				if (KotlinDetector.isSuspendingFunction(method)) {
 					value = CoroutinesUtils.invokeSuspendingFunction(method, getBean(), args);

From 92cd680a2c3e93f7415562f03e3e96cc4d8fb526 Mon Sep 17 00:00:00 2001
From: takeaction21 <90566622+takeaction21@users.noreply.github.com>
Date: Sun, 12 Sep 2021 23:50:07 +0800
Subject: [PATCH 129/140] Support float and double primitive default values in
 BeanUtils.instantiateClass()

See gh-27390
---
 .../src/main/java/org/springframework/beans/BeanUtils.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 6e97683f889a..3d9f9000efd4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -88,6 +88,8 @@ public abstract class BeanUtils {
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
 		values.put(long.class, (long) 0);
+		values.put(float.class, (float) 0);
+		values.put(double.class, (double) 0);
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}
 

From 5cc09849cedfc21a5922930d17bce7a61fccd238 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 15:59:33 +0200
Subject: [PATCH 130/140] Introduce test for gh-27390

---
 .../springframework/beans/BeanUtilsTests.java | 95 +++++++++++++++----
 1 file changed, 75 insertions(+), 20 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index f3e9d2eaa9a1..5240d97f7a1e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -49,6 +49,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 /**
  * Unit tests for {@link BeanUtils}.
@@ -85,19 +86,42 @@ void instantiateClassWithOptionalNullableType() throws NoSuchMethodException {
 	}
 
 	@Test  // gh-22531
-	void instantiateClassWithOptionalPrimitiveType() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
-		assertThat(bean.getCounter()).isEqualTo(0);
-		assertThat(bean.isFlag()).isEqualTo(false);
-		assertThat(bean.getValue()).isEqualTo("foo");
+	void instantiateClassWithFewerArgsThanParameters() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
+				BeanUtils.instantiateClass(constructor, null, null, "foo"));
 	}
 
 	@Test  // gh-22531
 	void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(ctor, null, null, "foo", null));
+				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo", null));
+	}
+
+	@Test  // gh-22531, gh-27390
+	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo");
+
+		assertSoftly(softly -> {
+			softly.assertThat(bean.isFlag()).isEqualTo(false);
+			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
+			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
+			softly.assertThat(bean.getIntCount()).isEqualTo(0);
+			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
+			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
+			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
+			softly.assertThat(bean.getText()).isEqualTo("foo");
+		});
+	}
+
+	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
+		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
+				long.class, float.class, double.class, String.class);
 	}
 
 	@Test
@@ -628,30 +652,61 @@ public String getValue() {
 
 	private static class BeanWithPrimitiveTypes {
 
-		private int counter;
-
 		private boolean flag;
+		private byte byteCount;
+		private short shortCount;
+		private int intCount;
+		private long longCount;
+		private float floatCount;
+		private double doubleCount;
+		private String text;
 
-		private String value;
 
 		@SuppressWarnings("unused")
-		public BeanWithPrimitiveTypes(int counter, boolean flag, String value) {
-			this.counter = counter;
+		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
+				float floatCount, double doubleCount, String text) {
 			this.flag = flag;
-			this.value = value;
-		}
-
-		public int getCounter() {
-			return counter;
+			this.byteCount = byteCount;
+			this.shortCount = shortCount;
+			this.intCount = intCount;
+			this.longCount = longCount;
+			this.floatCount = floatCount;
+			this.doubleCount = doubleCount;
+			this.text = text;
 		}
 
 		public boolean isFlag() {
 			return flag;
 		}
 
-		public String getValue() {
-			return value;
+		public byte getByteCount() {
+			return byteCount;
+		}
+
+		public short getShortCount() {
+			return shortCount;
+		}
+
+		public int getIntCount() {
+			return intCount;
+		}
+
+		public long getLongCount() {
+			return longCount;
+		}
+
+		public float getFloatCount() {
+			return floatCount;
+		}
+
+		public double getDoubleCount() {
+			return doubleCount;
+		}
+
+		public String getText() {
+			return text;
 		}
+
 	}
 
 	private static class PrivateBeanWithPrivateConstructor {

From f07e6a1b9de59331647b2c8dd54f696d59a8b902 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 16:05:29 +0200
Subject: [PATCH 131/140] Support char primitive default values in
 BeanUtils.instantiateClass()

Closes gh-27390
---
 .../org/springframework/beans/BeanUtils.java   |  7 ++++---
 .../springframework/beans/BeanUtilsTests.java  | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
index 3d9f9000efd4..8ddd6ff74467 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -87,9 +87,10 @@ public abstract class BeanUtils {
 		values.put(byte.class, (byte) 0);
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
-		values.put(long.class, (long) 0);
-		values.put(float.class, (float) 0);
-		values.put(double.class, (double) 0);
+		values.put(long.class, 0L);
+		values.put(float.class, 0F);
+		values.put(double.class, 0D);
+		values.put(char.class, '\0');
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index 5240d97f7a1e..b90fd515dc36 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -98,30 +98,31 @@ void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
 		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
 
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo", null));
+				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo", null));
 	}
 
 	@Test  // gh-22531, gh-27390
 	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
 		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
 
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, "foo");
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo");
 
 		assertSoftly(softly -> {
-			softly.assertThat(bean.isFlag()).isEqualTo(false);
+			softly.assertThat(bean.isFlag()).isFalse();
 			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
 			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
 			softly.assertThat(bean.getIntCount()).isEqualTo(0);
 			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
 			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
 			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
+			softly.assertThat(bean.getCharacter()).isEqualTo('\0');
 			softly.assertThat(bean.getText()).isEqualTo("foo");
 		});
 	}
 
 	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
 		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
-				long.class, float.class, double.class, String.class);
+				long.class, float.class, double.class, char.class, String.class);
 	}
 
 	@Test
@@ -659,12 +660,14 @@ private static class BeanWithPrimitiveTypes {
 		private long longCount;
 		private float floatCount;
 		private double doubleCount;
+		private char character;
 		private String text;
 
 
 		@SuppressWarnings("unused")
 		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
-				float floatCount, double doubleCount, String text) {
+				float floatCount, double doubleCount, char character, String text) {
+
 			this.flag = flag;
 			this.byteCount = byteCount;
 			this.shortCount = shortCount;
@@ -672,6 +675,7 @@ public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, in
 			this.longCount = longCount;
 			this.floatCount = floatCount;
 			this.doubleCount = doubleCount;
+			this.character = character;
 			this.text = text;
 		}
 
@@ -703,6 +707,10 @@ public double getDoubleCount() {
 			return doubleCount;
 		}
 
+		public char getCharacter() {
+			return character;
+		}
+
 		public String getText() {
 			return text;
 		}

From 9e986c031b92ea7035e639436c79deb77c33e842 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 20:51:59 +0200
Subject: [PATCH 132/140] Polish ide.gradle

---
 gradle/ide.gradle | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 7db543d3bc4d..6c112fd5b39e 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -1,7 +1,7 @@
 import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
 
-apply plugin: "eclipse"
+apply plugin: 'eclipse'
 
 eclipse.jdt {
 	sourceCompatibility = 1.8
@@ -30,17 +30,17 @@ eclipse.classpath.file.whenMerged { classpath ->
 }
 
 // Use separate main/test outputs (prevents WTP from packaging test classes)
-eclipse.classpath.defaultOutputDir = file(project.name+"/bin/eclipse")
+eclipse.classpath.defaultOutputDir = file(project.name + '/bin/eclipse')
 eclipse.classpath.file.beforeMerged { classpath ->
 	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		if (it.output.startsWith("bin/")) {
+		if (it.output.startsWith('bin/')) {
 			it.output = null
 		}
 	}
 }
 eclipse.classpath.file.whenMerged { classpath ->
 	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		it.output = "bin/" + it.path.split("/")[1]
+		it.output = 'bin/' + it.path.split('/')[1]
 	}
 }
 
@@ -65,46 +65,45 @@ eclipse.classpath.file.whenMerged {
 }
 
 // Allow projects to be used as WTP modules
-eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
+eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
 
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
-		"src/eclipse/org.eclipse.jdt.ui.prefs",
-		"src/eclipse/org.eclipse.wst.common.project.facet.core.xml")
+		'src/eclipse/org.eclipse.jdt.ui.prefs',
+		'src/eclipse/org.eclipse.wst.common.project.facet.core.xml')
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
 task eclipseWstComponent(type: Copy) {
-	from rootProject.files(
-		"src/eclipse/org.eclipse.wst.common.component")
+	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
 	into project.file('.settings/')
 	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
 task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs")
-	into project.file(".settings/")
+	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
 task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
-	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
-	delete project.file(".settings/org.eclipse.wst.common.component")
-	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
+	delete project.file('.settings/org.eclipse.jdt.core.prefs')
+	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
+	delete project.file('.settings/org.eclipse.wst.common.component')
+	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
 task eclipseBuildship(type: Copy) {
 	from rootProject.files(
-		"src/eclipse/org.eclipse.jdt.ui.prefs",
-		"src/eclipse/org.eclipse.jdt.core.prefs")
+		'src/eclipse/org.eclipse.jdt.ui.prefs',
+		'src/eclipse/org.eclipse.jdt.core.prefs')
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
-tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
-tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
-tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
+tasks['eclipseJdt'].dependsOn(eclipseJdtPrepare)
+tasks['cleanEclipse'].dependsOn(cleanEclipseJdtUi)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseWstComponent)

From 3faf445603e760d0b9223c194861809b410577c9 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:05:57 +0200
Subject: [PATCH 133/140] Re-enable import into Eclipse IDE

The migration to Gradle 7.2 resulted in a regression for our Eclipse
IDE support: several projects ended up with recursive classpath entries
in their generated .classpath files which prevent those projects from
being built within Eclipse.

This commit addresses this issue with a solution that may well be a
"hack". Nonetheless, a working hack is better than not being able to
import into Eclipse at all.

See gh-26870
---
 gradle/ide.gradle | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 6c112fd5b39e..20bf5f494e73 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -18,10 +18,13 @@ eclipse.classpath.file.whenMerged { classpath ->
 		if (matcher) {
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
-			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
-				def dependency = new ProjectDependency(path)
-				dependency.exported = true
-				classpath.entries.add(dependency)
+			if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
+				// Avoid recursive dependency on current project.
+				if (!entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')) {
+					def dependency = new ProjectDependency(path)
+					dependency.exported = true
+					classpath.entries.add(dependency)
+				}
 			}
 			classpath.entries.remove(entry)
 		}

From 4322ee194452bc1c2c1fb51932279b038c27205c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:42:00 +0200
Subject: [PATCH 134/140] Polish Eclipse IDE support

---
 gradle/ide.gradle                    | 42 +++++++++++++---------------
 src/eclipse/org.eclipse.jdt.ui.prefs |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 20bf5f494e73..913628b8e880 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -41,20 +41,20 @@ eclipse.classpath.file.beforeMerged { classpath ->
 		}
 	}
 }
-eclipse.classpath.file.whenMerged { classpath ->
-	classpath.entries.findAll{ it instanceof SourceFolder }.each {
+eclipse.classpath.file.whenMerged {
+	entries.findAll{ it instanceof SourceFolder }.each {
 		it.output = 'bin/' + it.path.split('/')[1]
 	}
 }
 
 // Ensure project dependencies come after 3rd-party libs (SPR-11836)
 // https://jira.spring.io/browse/SPR-11836
-eclipse.classpath.file.whenMerged { classpath ->
-	classpath.entries.findAll { it instanceof ProjectDependency }.each {
+eclipse.classpath.file.whenMerged {
+	entries.findAll { it instanceof ProjectDependency }.each {
 		// delete from original position
-		classpath.entries.remove(it)
+		entries.remove(it)
 		// append to end of classpath
-		classpath.entries.add(it)
+		entries.add(it)
 	}
 }
 
@@ -79,34 +79,30 @@ task eclipseSettings(type: Copy) {
 	outputs.upToDateWhen { false }
 }
 
-task eclipseWstComponent(type: Copy) {
-	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
+task eclipseJdtSettings(type: Copy) {
+	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
 	into project.file('.settings/')
-	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
-task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+task eclipseBuildship {
+	dependsOn eclipseSettings, eclipseJdtSettings
+}
+
+task eclipseWstComponentSettings(type: Copy) {
+	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
 	into project.file('.settings/')
+	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
-task cleanEclipseJdtUi(type: Delete) {
+task cleanEclipseSettings(type: Delete) {
 	delete project.file('.settings/org.eclipse.jdt.core.prefs')
 	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
 	delete project.file('.settings/org.eclipse.wst.common.component')
 	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
-task eclipseBuildship(type: Copy) {
-	from rootProject.files(
-		'src/eclipse/org.eclipse.jdt.ui.prefs',
-		'src/eclipse/org.eclipse.jdt.core.prefs')
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-tasks['eclipseJdt'].dependsOn(eclipseJdtPrepare)
-tasks['cleanEclipse'].dependsOn(cleanEclipseJdtUi)
-tasks['eclipse'].dependsOn(eclipseSettings, eclipseWstComponent)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
+tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
+tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs
index 26c219437105..1685154bbab8 100644
--- a/src/eclipse/org.eclipse.jdt.ui.prefs
+++ b/src/eclipse/org.eclipse.jdt.ui.prefs
@@ -63,4 +63,4 @@ org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=9999
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.2\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2002-${year} the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n * @author ${user}\n * @since 5.3.11\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

From 3baacedfd9c8d908ac95be00ee745d938033cd67 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Sep 2021 21:49:12 +0200
Subject: [PATCH 135/140] Alignment with other abstract utils classes

---
 .../java/org/springframework/core/CoroutinesUtils.java     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
index e942ff48ee11..50aec2deb3a6 100644
--- a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -45,10 +45,7 @@
  * @author Phillip Webb
  * @since 5.2
  */
-public final class CoroutinesUtils {
-
-	private CoroutinesUtils() {
-	}
+public abstract class CoroutinesUtils {
 
 	/**
 	 * Convert a {@link Deferred} instance to a {@link Mono}.
@@ -78,7 +75,7 @@ public static Publisher<?> invokeSuspendingFunction(Method method, Object target
 					KCallables.callSuspend(function, getSuspendedFunctionArgs(target, args), continuation))
 				.filter(result -> !Objects.equals(result, Unit.INSTANCE))
 				.onErrorMap(InvocationTargetException.class, InvocationTargetException::getTargetException);
-		if (classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
+		if (classifier != null && classifier.equals(JvmClassMappingKt.getKotlinClass(Flow.class))) {
 			return mono.flatMapMany(CoroutinesUtils::asFlux);
 		}
 		return mono;

From b8b85a6a59db19ae3283becadf7f60de606d5616 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Tue, 14 Sep 2021 21:49:23 +0200
Subject: [PATCH 136/140] Defensive handling of dimensions nullability

---
 .../spel/ast/ConstructorReference.java        | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index 7ccc4c16d962..d42a375410f6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -57,7 +57,7 @@
  */
 public class ConstructorReference extends SpelNodeImpl {
 
-	private boolean isArrayConstructor = false;
+	private final boolean isArrayConstructor;
 
 	@Nullable
 	private SpelNodeImpl[] dimensions;
@@ -234,6 +234,7 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 					FormatHelper.formatClassNameForMessage(
 							intendedArrayType != null ? intendedArrayType.getClass() : null));
 		}
+
 		String type = (String) intendedArrayType;
 		Class<?> componentType;
 		TypeCode arrayTypeCode = TypeCode.forName(type);
@@ -243,7 +244,8 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 		else {
 			componentType = arrayTypeCode.getType();
 		}
-		Object newArray;
+
+		Object newArray = null;
 		if (!hasInitializer()) {
 			// Confirm all dimensions were specified (for example [3][][5] is missing the 2nd dimension)
 			if (this.dimensions != null) {
@@ -252,23 +254,22 @@ private TypedValue createArray(ExpressionState state) throws EvaluationException
 						throw new SpelEvaluationException(getStartPosition(), SpelMessage.MISSING_ARRAY_DIMENSION);
 					}
 				}
-			}
-			TypeConverter typeConverter = state.getEvaluationContext().getTypeConverter();
-
-			// Shortcut for 1 dimensional
-			if (this.dimensions.length == 1) {
-				TypedValue o = this.dimensions[0].getTypedValue(state);
-				int arraySize = ExpressionUtils.toInt(typeConverter, o);
-				newArray = Array.newInstance(componentType, arraySize);
-			}
-			else {
-				// Multi-dimensional - hold onto your hat!
-				int[] dims = new int[this.dimensions.length];
-				for (int d = 0; d < this.dimensions.length; d++) {
-					TypedValue o = this.dimensions[d].getTypedValue(state);
-					dims[d] = ExpressionUtils.toInt(typeConverter, o);
+				TypeConverter typeConverter = state.getEvaluationContext().getTypeConverter();
+				if (this.dimensions.length == 1) {
+					// Shortcut for 1-dimensional
+					TypedValue o = this.dimensions[0].getTypedValue(state);
+					int arraySize = ExpressionUtils.toInt(typeConverter, o);
+					newArray = Array.newInstance(componentType, arraySize);
+				}
+				else {
+					// Multi-dimensional - hold onto your hat!
+					int[] dims = new int[this.dimensions.length];
+					for (int d = 0; d < this.dimensions.length; d++) {
+						TypedValue o = this.dimensions[d].getTypedValue(state);
+						dims[d] = ExpressionUtils.toInt(typeConverter, o);
+					}
+					newArray = Array.newInstance(componentType, dims);
 				}
-				newArray = Array.newInstance(componentType, dims);
 			}
 		}
 		else {

From 2d65bce18ee22e4eb5afde83b71033097f5bbf26 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 14 Sep 2021 21:58:22 +0200
Subject: [PATCH 137/140] Polish Eclipse IDE support

---
 gradle/ide.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gradle/ide.gradle b/gradle/ide.gradle
index 913628b8e880..af4664e06018 100644
--- a/gradle/ide.gradle
+++ b/gradle/ide.gradle
@@ -19,16 +19,18 @@ eclipse.classpath.file.whenMerged { classpath ->
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
 			if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
+				def recursiveDependency = entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')
 				// Avoid recursive dependency on current project.
-				if (!entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')) {
-					def dependency = new ProjectDependency(path)
-					dependency.exported = true
-					classpath.entries.add(dependency)
+				if (!recursiveDependency) {
+					classpath.entries.add(new ProjectDependency(path))
 				}
 			}
 			classpath.entries.remove(entry)
 		}
 	}
+
+	// Remove any remaining direct depencencies on JARs in the build/libs folder
+	// except Spring's spring-cglib-repack and spring-objenesis-repack JARs.
 	classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
 }
 

From 4c720eaa38704cb97705b86761cd505ceb59835e Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Sep 2021 08:41:10 +0200
Subject: [PATCH 138/140] Fix GitHub credentials to use token rather than
 password

Closes gh-27402
---
 ci/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f919a1b681fc..b9fe3db2f917 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -2,7 +2,7 @@ anchors:
   git-repo-resource-source: &git-repo-resource-source
     uri: ((github-repo))
     username: ((github-username))
-    password: ((github-password))
+    password: ((github-ci-release-token))
     branch: ((branch))
   gradle-enterprise-task-params: &gradle-enterprise-task-params
     GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))

From aa14c248990bcfe8345bd1a93ef8f7fa0b415101 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 15 Sep 2021 09:06:44 +0200
Subject: [PATCH 139/140] Migrate to Spring Builds account

---
 ci/scripts/stage-version.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/scripts/stage-version.sh b/ci/scripts/stage-version.sh
index 0b285de014bf..73c57755451c 100755
--- a/ci/scripts/stage-version.sh
+++ b/ci/scripts/stage-version.sh
@@ -29,8 +29,8 @@ fi
 echo "Staging $stageVersion (next version will be $nextVersion)"
 sed -i "s/version=$snapshotVersion/version=$stageVersion/" gradle.properties
 
-git config user.name "Spring Buildmaster" > /dev/null
-git config user.email "buildmaster@springframework.org" > /dev/null
+git config user.name "Spring Builds" > /dev/null
+git config user.email "spring-builds@users.noreply.github.com" > /dev/null
 git add gradle.properties > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null

From 21c3b51e1fcf0a20f9880d280a71cbace4905e41 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Wed, 15 Sep 2021 07:20:13 +0000
Subject: [PATCH 140/140] Release v5.3.10

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 28b12e96c3a3..13ade94eb912 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.10-SNAPSHOT
+version=5.3.10
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true