Release v5.3.22

Add Consumer methods to configure Jackson modules
Closes gh-28633
2026-06-08 17:33:33 +00:00 · 2022-07-14 08:39:33 +00:00 · 2022-07-13 19:10:51 +01:00 · 2022-07-13 18:43:51 +01:00 · 2022-07-13 16:48:02 +02:00 · 2022-07-13 16:47:35 +02:00
614 changed files with 2361 additions and 1757 deletions
@@ -21,6 +21,7 @@ classes/
 /build
 buildSrc/build
 /spring-*/build
+/spring-core/graalvm/build
 /spring-core/kotlin-coroutines/build
 /framework-bom/build
 /integration-tests/build
@@ -14,16 +14,16 @@ For access to artifacts or a distribution zip, see the [Spring Framework Artifac

 ## Documentation

-The Spring Framework maintains reference documentation ([published](https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and [source](src/docs/asciidoc)), Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
+The Spring Framework maintains reference documentation ([published](https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and [source](src/docs/asciidoc)), GitHub [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
 [API reference](https://docs.spring.io/spring-framework/docs/current/javadoc-api/). There are also [guides and tutorials](https://spring.io/guides) across Spring projects.

 ## Micro-Benchmarks

-See the [Micro-Benchmarks](https://github.com/spring-projects/spring-framework/wiki/Micro-Benchmarks) Wiki page.
+See the [Micro-Benchmarks](https://github.com/spring-projects/spring-framework/wiki/Micro-Benchmarks) wiki page.

 ## Build from Source

-See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source) Wiki page and the [CONTRIBUTING.md](CONTRIBUTING.md) file.
+See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source) wiki page and the [CONTRIBUTING.md](CONTRIBUTING.md) file.

 ## Continuous Integration Builds

@@ -28,18 +28,18 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.7"
-			mavenBom "io.netty:netty-bom:4.1.77.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.20"
+			mavenBom "io.netty:netty-bom:4.1.79.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.21"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
 			mavenBom "io.rsocket:rsocket-bom:1.1.2"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.46.v20220331"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.48.v20220622"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			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.8.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.18.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -79,7 +79,7 @@ configure(allprojects) { project ->
 			dependency "com.google.code.gson:gson:2.8.9"
 			dependency "com.google.protobuf:protobuf-java-util:3.19.3"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.19") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
@@ -94,9 +94,9 @@ configure(allprojects) { project ->
 			dependency "org.ogce:xpp3:1.1.6"
 			dependency "org.yaml:snakeyaml:1.30"

-			dependency "com.h2database:h2:2.1.212"
+			dependency "com.h2database:h2:2.1.214"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
-			dependency "com.github.librepdf:openpdf:1.3.28"
+			dependency "com.github.librepdf:openpdf:1.3.29"
 			dependency "com.rometools:rome:1.18.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.4"
@@ -139,7 +139,7 @@ configure(allprojects) { project ->
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.17.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.18.Final') {
 				entry 'undertow-core'
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@@ -150,7 +150,7 @@ configure(allprojects) { project ->
 				}
 			}

-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.11"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.12"
 			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
@@ -188,8 +188,8 @@ configure(allprojects) { project ->
 				exclude group: "junit", name: "junit"
 			}
 			dependency "org.testng:testng:7.4.0"
-			dependency "org.junit.support:testng-engine:1.0.1"
-			dependency "org.hamcrest:hamcrest:2.1"
+			dependency "org.junit.support:testng-engine:1.0.4"
+			dependency "org.hamcrest:hamcrest:2.2"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.23.0"
 			dependencySet(group: 'org.xmlunit', version: '2.9.0') {
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.1"

-			dependency("net.sourceforge.htmlunit:htmlunit:2.62.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.63.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.62.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.63.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -218,7 +218,7 @@ configure(allprojects) { project ->
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
 			dependency "com.jayway.jsonpath:json-path:2.6.0"
-			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
+			dependency "org.bouncycastle:bcpkix-jdk18on:1.71"

 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
 				entry 'tiles-api'
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}

 	checkstyle {
-		toolVersion = "10.3"
+		toolVersion = "10.3.1"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}

@@ -380,7 +380,8 @@ configure([rootProject] + javaProjects) { project ->
 			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
-			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
+			// TODO Uncomment once httpclient5 API docs are again online.
+			// "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/",
 			// Disabling linking to JUnit 5.8.2, since the `package-list` file no longer exists due to
@@ -413,6 +414,8 @@ configure(rootProject) {

 	nohttp {
 		source.exclude "**/test-output/**"
+		source.exclude "spring-core/graalvm/build/**" // only available on `main`
+		source.exclude "spring-core-test/build/**" // only available on `main`
 		allowlistFile = project.file("src/nohttp/allowlist.lines")
 		def rootPath = file(rootDir).toPath()
 		def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"
@@ -1,4 +1,4 @@
-version=5.3.21-SNAPSHOT
+version=5.3.22
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.parallel=true
@@ -72,6 +72,7 @@ eclipse.classpath.file.whenMerged {
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
+		'src/eclipse/org.eclipse.core.resources.prefs',
 		'src/eclipse/org.eclipse.jdt.core.prefs',
 		'src/eclipse/org.eclipse.jdt.ui.prefs')
 	into project.file('.settings/')
@@ -79,6 +80,7 @@ task eclipseSettings(type: Copy) {
 }

 task cleanEclipseSettings(type: Delete) {
+	delete project.file('.settings/org.eclipse.core.resources.prefs')
 	delete project.file('.settings/org.eclipse.jdt.core.prefs')
 	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
 }
@@ -7,8 +7,8 @@ pluginManagement {
 }

 plugins {
-	id "com.gradle.enterprise" version "3.9"
-	id "io.spring.ge.conventions" version "0.0.9"
+	id "com.gradle.enterprise" version "3.10.2"
+	id "io.spring.ge.conventions" version "0.0.10"
 }

 include "spring-aop"
@@ -63,7 +63,7 @@ public interface Joinpoint {
 	/**
 	 * Return the static part of this joinpoint.
 	 * <p>The static part is an accessible object on which a chain of
-	 * interceptors are installed.
+	 * interceptors is installed.
 	 */
 	@Nonnull
 	AccessibleObject getStaticPart();
@@ -36,7 +36,7 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher {
 	 * @param targetClass the target class
 	 * @param hasIntroductions {@code true} if the object on whose behalf we are
 	 * asking is the subject on one or more introductions; {@code false} otherwise
-	 * @return whether or not this method matches statically
+	 * @return whether this method matches statically
 	 */
 	boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions);

@@ -60,7 +60,7 @@ public interface MethodMatcher {
 	 * will be made.
 	 * @param method the candidate method
 	 * @param targetClass the target class
-	 * @return whether or not this method matches statically
+	 * @return whether this method matches statically
 	 */
 	boolean matches(Method method, Class<?> targetClass);

@@ -70,7 +70,7 @@ public interface MethodMatcher {
 	 * runtime even if the 2-arg matches method returns {@code true}?
 	 * <p>Can be invoked when an AOP proxy is created, and need not be invoked
 	 * again before each method invocation,
-	 * @return whether or not a runtime match via the 3-arg
+	 * @return whether a runtime match via the 3-arg
 	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} method
 	 * is required if static matching passed
 	 */
@@ -18,7 +18,7 @@ package org.springframework.aop;

 /**
 * Marker interface implemented by all AOP proxies. Used to detect
- * whether or not objects are Spring-generated proxies.
+ * whether objects are Spring-generated proxies.
 *
 * @author Rob Harrop
 * @since 2.0.1
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -368,7 +368,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	 * to which argument name. There are multiple strategies for determining
 	 * this binding, which are arranged in a ChainOfResponsibility.
 	 */
-	public final synchronized void calculateArgumentBindings() {
+	public final void calculateArgumentBindings() {
 		// The simple case... nothing to bind.
 		if (this.argumentsIntrospected || this.parameterTypes.length == 0) {
 			return;
@@ -39,7 +39,7 @@ import org.springframework.lang.Nullable;
 public interface AspectJAdvisorFactory {

 	/**
-	 * Determine whether or not the given class is an aspect, as reported
+	 * Determine whether the given class is an aspect, as reported
 	 * by AspectJ's {@link org.aspectj.lang.reflect.AjTypeSystem}.
 	 * <p>Will simply return {@code false} if the supposed aspect is
 	 * invalid (such as an extension of a concrete aspect class).
@@ -47,7 +47,7 @@ public interface AspectJAdvisorFactory {
 	 * such as those with unsupported instantiation models.
 	 * Use the {@link #validate} method to handle these cases if necessary.
 	 * @param clazz the supposed annotation-style AspectJ class
-	 * @return whether or not this class is recognized by AspectJ as an aspect class
+	 * @return whether this class is recognized by AspectJ as an aspect class
 	 */
 	boolean isAspect(Class<?> clazz);

@@ -67,7 +67,7 @@ public class AspectMetadata implements Serializable {

 	/**
 	 * Spring AOP pointcut corresponding to the per clause of the
-	 * aspect. Will be the Pointcut.TRUE canonical instance in the
+	 * aspect. Will be the {@code Pointcut.TRUE} canonical instance in the
 	 * case of a singleton, otherwise an AspectJExpressionPointcut.
 	 */
 	private final Pointcut perClausePointcut;
@@ -60,8 +60,8 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 	 * <li>Otherwise the advice declared first gets highest precedence (i.e., runs
 	 * first).</li>
 	 * </ul>
-	 * <p><b>Important:</b> Advisors are sorted in precedence order, from highest
-	 * precedence to lowest. "On the way in" to a join point, the highest precedence
+	 * <p><b>Important:</b> Advisors are sorted in precedence order, from the highest
+	 * precedence to the lowest. "On the way in" to a join point, the highest precedence
 	 * advisor should run first. "On the way out" of a join point, the highest
 	 * precedence advisor should run last.
 	 */
@@ -314,7 +314,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}

 	/**
-	 * Add all of the given advisors to this proxy configuration.
+	 * Add all the given advisors to this proxy configuration.
 	 * @param advisors the advisors to register
 	 */
 	public void addAdvisors(Advisor... advisors) {
@@ -322,7 +322,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}

 	/**
-	 * Add all of the given advisors to this proxy configuration.
+	 * Add all the given advisors to this proxy configuration.
 	 * @param advisors the advisors to register
 	 */
 	public void addAdvisors(Collection<Advisor> advisors) {
@@ -72,8 +72,8 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	 * NOTE: We could avoid the code duplication between this class and the CGLIB
 	 * proxies by refactoring "invoke" into a template method. However, this approach
 	 * adds at least 10% performance overhead versus a copy-paste solution, so we sacrifice
-	 * elegance for performance. (We have a good test suite to ensure that the different
-	 * proxies behave the same :-)
+	 * elegance for performance (we have a good test suite to ensure that the different
+	 * proxies behave the same :-)).
 	 * This way, we can also more easily take advantage of minor optimizations in each class.
 	 */

@@ -198,7 +198,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 			// Get the interception chain for this method.
 			List<Object> chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(method, targetClass);

-			// Check whether we have any advice. If we don't, we can fallback on direct
+			// Check whether we have any advice. If we don't, we can fall back on direct
 			// reflective invocation of the target, and avoid creating a MethodInvocation.
 			if (chain.isEmpty()) {
 				// We can skip creating a MethodInvocation: just invoke the target directly
@@ -50,7 +50,7 @@ import org.springframework.util.ObjectUtils;

 /**
 * {@link org.springframework.beans.factory.FactoryBean} implementation that builds an
- * AOP proxy based on beans in Spring {@link org.springframework.beans.factory.BeanFactory}.
+ * AOP proxy based on beans in a Spring {@link org.springframework.beans.factory.BeanFactory}.
 *
 * <p>{@link org.aopalliance.intercept.MethodInterceptor MethodInterceptors} and
 * {@link org.springframework.aop.Advisor Advisors} are identified by a list of bean
@@ -61,10 +61,11 @@ import org.springframework.util.ObjectUtils;
 *
 * <p>Global interceptors and advisors can be added at the factory level. The specified
 * ones are expanded in an interceptor list where an "xxx*" entry is included in the
- * list, matching the given prefix with the bean names (e.g. "global*" would match
- * both "globalBean1" and "globalBean2", "*" all defined interceptors). The matching
- * interceptors get applied according to their returned order value, if they implement
- * the {@link org.springframework.core.Ordered} interface.
+ * list, matching the given prefix with the bean names &mdash; for example, "global*"
+ * would match both "globalBean1" and "globalBean2"; whereas, "*" would match all
+ * defined interceptors. The matching interceptors get applied according to their
+ * returned order value, if they implement the {@link org.springframework.core.Ordered}
+ * interface.
 *
 * <p>Creates a JDK proxy when proxy interfaces are given, and a CGLIB proxy for the
 * actual target class if not. Note that the latter will only work if the target class
@@ -75,7 +76,7 @@ import org.springframework.util.ObjectUtils;
 * This won't work for existing prototype references, which are independent. However,
 * it will work for prototypes subsequently obtained from the factory. Changes to
 * interception will work immediately on singletons (including existing references).
- * However, to change interfaces or target it's necessary to obtain a new instance
+ * However, to change interfaces or a target it's necessary to obtain a new instance
 * from the factory. This means that singleton instances obtained from the factory
 * do not have the same object identity. However, they do have the same interceptors
 * and target, and changing any reference will change all objects.
@@ -406,7 +407,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		if (namedBeanClass != null) {
 			return (Advisor.class.isAssignableFrom(namedBeanClass) || Advice.class.isAssignableFrom(namedBeanClass));
 		}
-		// Treat it as an target bean if we can't tell.
+		// Treat it as a target bean if we can't tell.
 		if (logger.isDebugEnabled()) {
 			logger.debug("Could not determine type of bean with name '" + beanName +
 					"' - assuming it is neither an Advisor nor an Advice");
@@ -119,7 +119,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	private AdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.getInstance();

 	/**
-	 * Indicates whether or not the proxy should be frozen. Overridden from super
+	 * Indicates whether the proxy should be frozen. Overridden from super
 	 * to prevent the configuration from becoming frozen too early.
 	 */
 	private boolean freezeProxy = false;
@@ -145,7 +145,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport


 	/**
-	 * Set whether or not the proxy should be frozen, preventing advice
+	 * Set whether the proxy should be frozen, preventing advice
 	 * from being added to it once it is created.
 	 * <p>Overridden from the super class to prevent the proxy configuration
 	 * from being frozen before the proxy is created.
@@ -56,7 +56,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 	protected transient Log defaultLogger = LogFactory.getLog(getClass());

 	/**
-	 * Indicates whether or not proxy class names should be hidden when using dynamic loggers.
+	 * Indicates whether proxy class names should be hidden when using dynamic loggers.
 	 * @see #setUseDynamicLogger
 	 */
 	private boolean hideProxyClassNames = false;
@@ -119,7 +119,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser


 	/**
-	 * Determines whether or not logging is enabled for the particular {@code MethodInvocation}.
+	 * Determines whether logging is enabled for the particular {@code MethodInvocation}.
 	 * If not, the method invocation proceeds as normal, otherwise the method invocation is passed
 	 * to the {@code invokeUnderTrace} method for handling.
 	 * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
@@ -36,7 +36,7 @@ public interface AsyncUncaughtExceptionHandler {
 	 * Handle the given uncaught exception thrown from an asynchronous method.
 	 * @param ex the exception thrown from the asynchronous method
 	 * @param method the asynchronous method
-	 * @param params the parameters used to invoked the method
+	 * @param params the parameters used to invoke the method
 	 */
 	void handleUncaughtException(Throwable ex, Method method, Object... params);

@@ -217,7 +217,7 @@ public abstract class AopUtils {
 	 * out a pointcut for a class.
 	 * @param pc the static or dynamic pointcut to check
 	 * @param targetClass the class to test
-	 * @param hasIntroductions whether or not the advisor chain
+	 * @param hasIntroductions whether the advisor chain
 	 * for this bean includes any introductions
 	 * @return whether the pointcut can apply on any method
 	 */
@@ -261,7 +261,7 @@ public abstract class AopUtils {
 	/**
 	 * Can the given advisor apply at all on the given class?
 	 * This is an important test as it can be used to optimize
-	 * out a advisor for a class.
+	 * out an advisor for a class.
 	 * @param advisor the advisor to check
 	 * @param targetClass class we're testing
 	 * @return whether the pointcut can apply on any method
@@ -272,11 +272,11 @@ public abstract class AopUtils {

 	/**
 	 * Can the given advisor apply at all on the given class?
-	 * <p>This is an important test as it can be used to optimize out a advisor for a class.
+	 * <p>This is an important test as it can be used to optimize out an advisor for a class.
 	 * This version also takes into account introductions (for IntroductionAwareMethodMatchers).
 	 * @param advisor the advisor to check
 	 * @param targetClass class we're testing
-	 * @param hasIntroductions whether or not the advisor chain for this bean includes
+	 * @param hasIntroductions whether the advisor chain for this bean includes
 	 * any introductions
 	 * @return whether the pointcut can apply on any method
 	 */
@@ -43,7 +43,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple

 	/**
 	 * Create an empty DefaultPointcutAdvisor.
-	 * <p>Advice must be set before use using setter methods.
+	 * <p>Advice must be set before using setter methods.
 	 * Pointcut will normally be set also, but defaults to {@code Pointcut.TRUE}.
 	 */
 	public DefaultPointcutAdvisor() {
@@ -90,7 +90,7 @@ public abstract class MethodMatchers {
 	 * @param targetClass the target class
 	 * @param hasIntroductions {@code true} if the object on whose behalf we are
 	 * asking is the subject on one or more introductions; {@code false} otherwise
-	 * @return whether or not this method matches statically
+	 * @return whether this method matches statically
 	 */
 	public static boolean matches(MethodMatcher mm, Method method, Class<?> targetClass, boolean hasIntroductions) {
 		Assert.notNull(mm, "MethodMatcher must not be null");
@@ -37,7 +37,7 @@ import org.springframework.lang.Nullable;
 * {@link AbstractPrototypeBasedTargetSource} can be used to create objects
 * in order to put them into the pool.
 *
- * <p>Subclasses must also implement some of the monitoring methods from the
+ * <p>Subclasses must also implement some monitoring methods from the
 * {@link PoolingConfig} interface. The {@link #getPoolingConfigMixin()} method
 * makes these stats available on proxied objects through an IntroductionAdvisor.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -142,11 +142,11 @@ public class TrickyAspectJPointcutExpressionTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Documented
 	@Inherited
-	public static @interface Log {
+	@interface Log {
 	}


-	public static interface TestService {
+	public interface TestService {

 		public String sayHello();
 	}
@@ -931,7 +931,7 @@ abstract class AbstractMakeModifiable {
 			return setter.getDeclaringClass().getMethod(getterName);
 		}
 		catch (NoSuchMethodException ex) {
-			// must be write only
+			// must be write-only
 			return null;
 		}
 	}
@@ -48,7 +48,7 @@ public class IntroductionBenchmarkTests {
 		}
 	}

-	public static interface Counter {
+	public interface Counter {
 		int getCount();
 	}

@@ -307,7 +307,7 @@ public class DelegatingIntroductionInterceptorTests {
 	}


-	private static interface SubTimeStamped extends TimeStamped {
+	private interface SubTimeStamped extends TimeStamped {
 	}

 }
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import;

 /**
 * Signals the current application context to apply dependency injection to
- * non-managed classes that are instantiated outside of the Spring bean factory
+ * non-managed classes that are instantiated outside the Spring bean factory
 * (typically classes annotated with the
 * {@link org.springframework.beans.factory.annotation.Configurable @Configurable}
 * annotation).
@@ -82,7 +82,7 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
 	 * Obtain the property descriptor for a specific property
 	 * of the wrapped object.
 	 * @param propertyName the property to obtain the descriptor for
-	 * (may be a nested path, but no indexed/mapped property)
+	 * (may be a nested path, but not an indexed/mapped property)
 	 * @return the property descriptor for the specified property
 	 * @throws InvalidPropertyException if there is no such property
 	 */
@@ -327,7 +327,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	/**
 	 * Register the specified property as "processed" in the sense
 	 * of some processor calling the corresponding setter method
-	 * outside of the PropertyValue(s) mechanism.
+	 * outside the PropertyValue(s) mechanism.
 	 * <p>This will lead to {@code true} being returned from
 	 * a {@link #contains} call for the specified property.
 	 * @param propertyName the name of the property.
@@ -22,7 +22,7 @@ package org.springframework.beans;
 * {@link org.springframework.beans.PropertyEditorRegistry property editor registry}.
 *
 * <p>This is particularly useful when you need to use the same set of
- * property editors in several different situations: write a corresponding
+ * property editors in several situations: write a corresponding
 * registrar and reuse that in each case.
 *
 * @author Juergen Hoeller
@@ -45,7 +45,7 @@ import org.springframework.lang.Nullable;
 *
 * <p><b>The container is only responsible for managing the lifecycle of the FactoryBean
 * instance, not the lifecycle of the objects created by the FactoryBean.</b> Therefore,
- * a destroy method on an exposed bean object (such as {@link java.io.Closeable#close()}
+ * a destroy method on an exposed bean object (such as {@link java.io.Closeable#close()})
 * will <i>not</i> be called automatically. Instead, a FactoryBean should implement
 * {@link DisposableBean} and delegate any such close call to the underlying object.
 *
@@ -108,7 +108,7 @@ public interface FactoryBean<T> {
 	 * been fully initialized. It must not rely on state created during
 	 * initialization; of course, it can still use such state if available.
 	 * <p><b>NOTE:</b> Autowiring will simply ignore FactoryBeans that return
-	 * {@code null} here. Therefore it is highly recommended to implement
+	 * {@code null} here. Therefore, it is highly recommended to implement
 	 * this method properly, using the current state of the FactoryBean.
 	 * @return the type of object that this FactoryBean creates,
 	 * or {@code null} if not known at the time of the call
@@ -343,7 +343,7 @@ public interface ListableBeanFactory extends BeanFactory {

 	/**
 	 * Find an {@link Annotation} of {@code annotationType} on the specified bean,
-	 * traversing its interfaces and super classes if no annotation can be found on
+	 * traversing its interfaces and superclasses if no annotation can be found on
 	 * the given class itself, as well as checking the bean's factory method (if any).
 	 * @param beanName the name of the bean to look for annotations on
 	 * @param annotationType the type of annotation to look for
@@ -361,7 +361,7 @@ public interface ListableBeanFactory extends BeanFactory {

 	/**
 	 * Find an {@link Annotation} of {@code annotationType} on the specified bean,
-	 * traversing its interfaces and super classes if no annotation can be found on
+	 * traversing its interfaces and superclasses if no annotation can be found on
 	 * the given class itself, as well as checking the bean's factory method (if any).
 	 * @param beanName the name of the bean to look for annotations on
 	 * @param annotationType the type of annotation to look for
@@ -137,7 +137,7 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 	 * as a <em>qualifier</em>, the bean must 'match' against the annotation as
 	 * well as any attributes it may contain. The bean definition must contain
 	 * the same qualifier or match by meta attributes. A "value" attribute will
-	 * fallback to match against the bean name or an alias if a qualifier or
+	 * fall back to match against the bean name or an alias if a qualifier or
 	 * attribute does not match.
 	 * @see Qualifier
 	 */
@@ -186,7 +186,7 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 					if (isQualifier(metaType)) {
 						foundMeta = true;
 						// Only accept fallback match if @Qualifier annotation has a value...
-						// Otherwise it is just a marker for a custom qualifier annotation.
+						// Otherwise, it is just a marker for a custom qualifier annotation.
 						if ((fallbackToMeta && ObjectUtils.isEmpty(AnnotationUtils.getValue(metaAnn))) ||
 								!checkQualifier(bdHolder, metaAnn, typeConverter)) {
 							return false;
@@ -30,7 +30,7 @@ import org.springframework.beans.BeansException;
 *
 * <p>A {@code BeanFactoryPostProcessor} may interact with and modify bean
 * definitions, but never bean instances. Doing so may cause premature bean
- * instantiation, violating the container and causing unintended side-effects.
+ * instantiation, violating the container and causing unintended side effects.
 * If bean instance interaction is required, consider implementing
 * {@link BeanPostProcessor} instead.
 *
@@ -65,7 +65,7 @@ public class ConstructorArgumentValues {

 	/**
 	 * Copy all given argument values into this object, using separate holder
-	 * instances to keep the values independent from the original object.
+	 * instances to keep the values independent of the original object.
 	 * <p>Note: Identical ValueHolder instances will only be registered once,
 	 * to allow for merging and re-merging of argument value definitions. Distinct
 	 * ValueHolder instances carrying the same content are of course allowed.
@@ -155,7 +155,7 @@ public abstract class YamlProcessor {
 	 * resources. Each resource is parsed in turn and the documents inside checked against
 	 * the {@link #setDocumentMatchers(DocumentMatcher...) matchers}. If a document
 	 * matches it is passed into the callback, along with its representation as Properties.
-	 * Depending on the {@link #setResolutionMethod(ResolutionMethod)} not all of the
+	 * Depending on the {@link #setResolutionMethod(ResolutionMethod)} not all the
 	 * documents will be parsed.
 	 * @param callback a callback to delegate to once matching documents are found
 	 * @see #createYaml()
@@ -124,7 +124,7 @@ public class BeanComponentDefinition extends BeanDefinitionHolder implements Com
 	}

 	/**
-	 * This implementations expects the other object to be of type BeanComponentDefinition
+	 * This implementation expects the other object to be of type BeanComponentDefinition
 	 * as well, in addition to the superclass's equality requirements.
 	 */
 	@Override
@@ -50,13 +50,13 @@ import org.springframework.beans.factory.config.BeanReference;
 * {@link #getBeanReferences}, tools may wish to inspect all {@link BeanDefinition BeanDefinitions} to gather
 * the full set of {@link BeanReference BeanReferences}. Implementations are required to provide
 * all {@link BeanReference BeanReferences} that are required to validate the configuration of the
- * overall logical entity as well as those required to provide full user visualisation of the configuration.
+ * overall logical entity as well as those required to provide full user visualization of the configuration.
 * It is expected that certain {@link BeanReference BeanReferences} will not be important to
 * validation or to the user view of the configuration and as such these may be omitted. A tool may wish to
 * display any additional {@link BeanReference BeanReferences} sourced through the supplied
 * {@link BeanDefinition BeanDefinitions} but this is not considered to be a typical case.
 *
- * <p>Tools can determine the important of contained {@link BeanDefinition BeanDefinitions} by checking the
+ * <p>Tools can determine the importance of contained {@link BeanDefinition BeanDefinitions} by checking the
 * {@link BeanDefinition#getRole role identifier}. The role is essentially a hint to the tool as to how
 * important the configuration provider believes a {@link BeanDefinition} is to the end user. It is expected
 * that tools will <strong>not</strong> display all {@link BeanDefinition BeanDefinitions} for a given
@@ -1510,7 +1510,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			try {
 				PropertyDescriptor pd = bw.getPropertyDescriptor(propertyName);
 				// Don't try autowiring by type for type Object: never makes sense,
-				// even if it technically is a unsatisfied, non-simple property.
+				// even if it technically is an unsatisfied, non-simple property.
 				if (Object.class != pd.getPropertyType()) {
 					MethodParameter methodParam = BeanUtils.getWriteMethodParameter(pd);
 					// Do not allow eager init for type matching in case of a prioritized post-processor.
@@ -945,7 +945,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}

 	/**
-	 * Specify whether or not the configured initializer method is the default.
+	 * Specify whether the configured initializer method is the default.
 	 * <p>The default value is {@code true} for a locally specified init method
 	 * but switched to {@code false} for a shared setting in a defaults section
 	 * (e.g. {@code bean init-method} versus {@code beans default-init-method}
@@ -984,7 +984,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}

 	/**
-	 * Specify whether or not the configured destroy method is the default.
+	 * Specify whether the configured destroy method is the default.
 	 * <p>The default value is {@code true} for a locally specified destroy method
 	 * but switched to {@code false} for a shared setting in a defaults section
 	 * (e.g. {@code bean destroy-method} versus {@code beans default-destroy-method}
@@ -593,7 +593,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
 		BeanDefinitionHolder dbd = mbd.getDecoratedDefinition();

-		// Setup the types that we want to match against
+		// Set up the types that we want to match against
 		Class<?> classToMatch = typeToMatch.resolve();
 		if (classToMatch == null) {
 			classToMatch = FactoryBean.class;
@@ -293,7 +293,7 @@ public final class BeanDefinitionBuilder {
 	}

 	/**
-	 * Set whether or not this definition is abstract.
+	 * Set whether this definition is abstract.
 	 */
 	public BeanDefinitionBuilder setAbstract(boolean flag) {
 		this.beanDefinition.setAbstract(flag);
@@ -280,7 +280,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	}

 	/**
-	 * Return the dependency comparator for this BeanFactory (may be {@code null}.
+	 * Return the dependency comparator for this BeanFactory (may be {@code null}).
 	 * @since 4.0
 	 */
 	@Nullable
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
 /**
 * Basic {@link AutowireCandidateResolver} that performs a full generic type
 * match with the candidate's type if the dependency is declared as a generic type
- * (e.g. Repository&lt;Customer&gt;).
+ * (e.g. {@code Repository<Customer>}).
 *
 * <p>This is the base class for
 * {@link org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver},
@@ -124,7 +124,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 	/**
 	 * Register the supplied {@link BeanDefinitionHolder bean} with the supplied
 	 * {@link BeanDefinitionRegistry registry}.
-	 * <p>Subclasses can override this method to control whether or not the supplied
+	 * <p>Subclasses can override this method to control whether the supplied
 	 * {@link BeanDefinitionHolder bean} is actually even registered, or to
 	 * register even more beans.
 	 * <p>The default implementation registers the supplied {@link BeanDefinitionHolder bean}
@@ -1362,7 +1362,7 @@ public class BeanDefinitionParserDelegate {
 	}

 	/**
-	 * Parse a custom element (outside of the default namespace).
+	 * Parse a custom element (outside the default namespace).
 	 * @param ele the element to parse
 	 * @return the resulting bean definition
 	 */
@@ -1372,7 +1372,7 @@ public class BeanDefinitionParserDelegate {
 	}

 	/**
-	 * Parse a custom element (outside of the default namespace).
+	 * Parse a custom element (outside the default namespace).
 	 * @param ele the element to parse
 	 * @param containingBd the containing bean definition (if any)
 	 * @return the resulting bean definition
@@ -96,7 +96,7 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 	 * Create a new {@code DefaultNamespaceHandlerResolver} using the
 	 * supplied mapping file location.
 	 * @param classLoader the {@link ClassLoader} instance used to load mapping resources
-	 * may be {@code null}, in which case the thread context ClassLoader will be used)
+	 * may be {@code null}, in which case the thread context ClassLoader will be used
 	 * @param handlerMappingsLocation the mapping file location
 	 */
 	public DefaultNamespaceHandlerResolver(@Nullable ClassLoader classLoader, String handlerMappingsLocation) {
@@ -56,7 +56,7 @@ public class DelegatingEntityResolver implements EntityResolver {
 	 * <p>Configures the {@link PluggableSchemaResolver} with the supplied
 	 * {@link ClassLoader}.
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be {@code null}) to use the default ClassLoader)
+	 * (can be {@code null} to use the default ClassLoader)
 	 */
 	public DelegatingEntityResolver(@Nullable ClassLoader classLoader) {
 		this.dtdResolver = new BeansDtdResolver();
@@ -80,7 +80,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 	 * Loads the schema URL &rarr; schema file location mappings using the default
 	 * mapping file pattern "META-INF/spring.schemas".
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be {@code null}) to use the default ClassLoader)
+	 * (can be {@code null} to use the default ClassLoader)
 	 * @see PropertiesLoaderUtils#loadAllProperties(String, ClassLoader)
 	 */
 	public PluggableSchemaResolver(@Nullable ClassLoader classLoader) {
@@ -92,7 +92,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 	 * Loads the schema URL &rarr; schema file location mappings using the given
 	 * mapping file pattern.
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be {@code null}) to use the default ClassLoader)
+	 * (can be {@code null} to use the default ClassLoader)
 	 * @param schemaMappingsLocation the location of the file that defines schema mappings
 	 * (must not be empty)
 	 * @see PropertiesLoaderUtils#loadAllProperties(String, ClassLoader)
@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
 * the bean that will be considered as a parameter.
 *
 * <b>Note</b>: This implementation supports only named parameters - there is no
- * support for indexes or types. Further more, the names are used as hints by
+ * support for indexes or types. Furthermore, the names are used as hints by
 * the container which, by default, does type introspection.
 *
 * @author Costin Leau
@@ -184,7 +184,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	}

 	/**
-	 * Set whether or not the XML parser should be XML namespace aware.
+	 * Set whether the XML parser should be XML namespace aware.
 	 * Default is "false".
 	 * <p>This is typically not needed when schema validation is active.
 	 * However, without validation, this has to be switched to "true"
@@ -195,7 +195,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	}

 	/**
-	 * Return whether or not the XML parser should be XML namespace aware.
+	 * Return whether the XML parser should be XML namespace aware.
 	 */
 	public boolean isNamespaceAware() {
 		return this.namespaceAware;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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 org.springframework.util.StringUtils;
 * e.g. {@code UTF-8}, {@code ISO-8859-16}, etc.
 *
 * @author Arjen Poutsma
+ * @author Sam Brannen
 * @since 2.5.4
 * @see Charset
 */
@@ -37,7 +38,7 @@ public class CharsetEditor extends PropertyEditorSupport {
 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
 		if (StringUtils.hasText(text)) {
-			setValue(Charset.forName(text));
+			setValue(Charset.forName(text.trim()));
 		}
 		else {
 			setValue(null);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2022 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,11 +19,14 @@ package org.springframework.beans.propertyeditors;
 import java.beans.PropertyEditorSupport;
 import java.util.Currency;

+import org.springframework.util.StringUtils;
+
 /**
 * Editor for {@code java.util.Currency}, translating currency codes into Currency
 * objects. Exposes the currency code as text representation of a Currency object.
 *
 * @author Juergen Hoeller
+ * @author Sam Brannen
 * @since 3.0
 * @see java.util.Currency
 */
@@ -31,6 +34,9 @@ public class CurrencyEditor extends PropertyEditorSupport {

 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
+		if (StringUtils.hasText(text)) {
+			text = text.trim();
+		}
 		setValue(Currency.getInstance(text));
 	}

@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
 * Custom {@link java.beans.PropertyEditor} for String arrays.
 *
 * <p>Strings must be in CSV format, with a customizable separator.
- * By default values in the result are trimmed of whitespace.
+ * By default, values in the result are trimmed of whitespace.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -86,7 +86,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * @param emptyArrayAsNull {@code true} if an empty String array
 	 * is to be transformed into {@code null}
 	 * @param trimValues {@code true} if the values in the parsed arrays
-	 * are to be trimmed of whitespace (default is true)
+	 * are to be trimmed of whitespace (default is {@code true})
 	 */
 	public StringArrayPropertyEditor(String separator, boolean emptyArrayAsNull, boolean trimValues) {
 		this(separator, null, emptyArrayAsNull, trimValues);
@@ -114,7 +114,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * @param emptyArrayAsNull {@code true} if an empty String array
 	 * is to be transformed into {@code null}
 	 * @param trimValues {@code true} if the values in the parsed arrays
-	 * are to be trimmed of whitespace (default is true)
+	 * are to be trimmed of whitespace (default is {@code true})
 	 */
 	public StringArrayPropertyEditor(
 			String separator, @Nullable String charsToDelete, boolean emptyArrayAsNull, boolean trimValues) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2022 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,6 +28,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Juergen Hoeller
 * @author Nicholas Williams
+ * @author Sam Brannen
 * @since 3.0
 * @see java.util.TimeZone
 * @see ZoneIdEditor
@@ -36,6 +37,9 @@ public class TimeZoneEditor extends PropertyEditorSupport {

 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
+		if (StringUtils.hasText(text)) {
+			text = text.trim();
+		}
 		setValue(StringUtils.parseTimeZoneString(text));
 	}

@@ -130,7 +130,7 @@ public class URIEditor extends PropertyEditorSupport {

 	/**
 	 * Create a URI instance for the given user-specified String value.
-	 * <p>The default implementation encodes the value into a RFC-2396 compliant URI.
+	 * <p>The default implementation encodes the value into an RFC-2396 compliant URI.
 	 * @param value the value to convert into a URI instance
 	 * @return the URI instance
 	 * @throws java.net.URISyntaxException if URI conversion failed
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2022 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,11 +19,14 @@ package org.springframework.beans.propertyeditors;
 import java.beans.PropertyEditorSupport;
 import java.time.ZoneId;

+import org.springframework.util.StringUtils;
+
 /**
 * Editor for {@code java.time.ZoneId}, translating zone ID Strings into {@code ZoneId}
 * objects. Exposes the {@code TimeZone} ID as a text representation.
 *
 * @author Nicholas Williams
+ * @author Sam Brannen
 * @since 4.0
 * @see java.time.ZoneId
 * @see TimeZoneEditor
@@ -32,6 +35,9 @@ public class ZoneIdEditor extends PropertyEditorSupport {

 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
+		if (StringUtils.hasText(text)) {
+			text = text.trim();
+		}
 		setValue(ZoneId.of(text));
 	}

@@ -280,7 +280,7 @@ class BeanUtilsTests {
 	 * {@code Number} can NOT be copied to {@code Integer}.
 	 */
 	@Test
-	void copyPropertiesDoesNotCopyeFromSuperTypeToSubType() {
+	void copyPropertiesDoesNotCopyFromSuperTypeToSubType() {
 		NumberHolder numberHolder = new NumberHolder();
 		numberHolder.setNumber(Integer.valueOf(42));
 		IntegerHolder integerHolder = new IntegerHolder();
@@ -43,7 +43,7 @@ public class MethodInvokingFactoryBeanTests {
 	@Test
 	public void testParameterValidation() throws Exception {

-		// assert that only static OR non static are set, but not both or none
+		// assert that only static OR non-static are set, but not both or none
 		MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean();
 		assertThatIllegalArgumentException().isThrownBy(mcfb::afterPropertiesSet);

@@ -278,19 +278,19 @@ public class ServiceLocatorFactoryBeanTests {
 	}


-	public static interface TestServiceLocator {
+	public interface TestServiceLocator {

 		TestService getTestService();
 	}


-	public static interface TestServiceLocator2 {
+	public interface TestServiceLocator2 {

 		TestService getTestService(String id) throws CustomServiceLocatorException2;
 	}


-	public static interface TestServiceLocator3 {
+	public interface TestServiceLocator3 {

 		TestService getTestService();

@@ -302,13 +302,13 @@ public class ServiceLocatorFactoryBeanTests {
 	}


-	public static interface TestService2Locator {
+	public interface TestService2Locator {

 		TestService2 getTestService() throws CustomServiceLocatorException3;
 	}


-	public static interface ServiceLocatorInterfaceWithExtraNonCompliantMethod {
+	public interface ServiceLocatorInterfaceWithExtraNonCompliantMethod {

 		TestService2 getTestService();

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 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,19 +19,26 @@ package org.springframework.beans.propertyeditors;
 import java.time.ZoneId;

 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;

 import static org.assertj.core.api.Assertions.assertThat;

 /**
 * @author Nicholas Williams
+ * @author Sam Brannen
 */
-public class ZoneIdEditorTests {
+class ZoneIdEditorTests {

 	private final ZoneIdEditor editor = new ZoneIdEditor();

-	@Test
-	public void americaChicago() {
-		editor.setAsText("America/Chicago");
+	@ParameterizedTest(name = "[{index}] text = ''{0}''")
+	@ValueSource(strings = {
+		"America/Chicago",
+		"   America/Chicago   ",
+	})
+	void americaChicago(String text) {
+		editor.setAsText(text);

 		ZoneId zoneId = (ZoneId) editor.getValue();
 		assertThat(zoneId).as("The zone ID should not be null.").isNotNull();
@@ -41,7 +48,7 @@ public class ZoneIdEditorTests {
 	}

 	@Test
-	public void americaLosAngeles() {
+	void americaLosAngeles() {
 		editor.setAsText("America/Los_Angeles");

 		ZoneId zoneId = (ZoneId) editor.getValue();
@@ -52,12 +59,12 @@ public class ZoneIdEditorTests {
 	}

 	@Test
-	public void getNullAsText() {
+	void getNullAsText() {
 		assertThat(editor.getAsText()).as("The returned value is not correct.").isEqualTo("");
 	}

 	@Test
-	public void getValueAsText() {
+	void getValueAsText() {
 		editor.setValue(ZoneId.of("America/New_York"));
 		assertThat(editor.getAsText()).as("The text version is not correct.").isEqualTo("America/New_York");
 	}
@@ -22,7 +22,7 @@ import java.io.IOException;
 * Interface used for {@link org.springframework.beans.testfixture.beans.TestBean}.
 *
 * <p>Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
+ * extends person it breaks quite a few tests.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -19,7 +19,7 @@ package org.springframework.context.index.sample;
 import org.springframework.stereotype.Component;

 /**
- * Candidate with a inner class that isn't static (and should therefore not be added).
+ * Candidate with an inner class that isn't static (and should therefore not be added).
 *
 * @author Stephane Nicoll
 */
@@ -235,7 +235,7 @@ public class DefaultJCacheOperationSource extends AnnotationJCacheOperationSourc
 	 * {@code CacheResolver} from a custom {@code CacheResolver} implementation so we have to
 	 * fall back on the {@code CacheManager}.
 	 * <p>This gives this weird situation of a perfectly valid configuration that breaks all
-	 * the sudden because the JCache support is enabled. To avoid this we resolve the default
+	 * of a sudden because the JCache support is enabled. To avoid this we resolve the default
 	 * exception {@code CacheResolver} as late as possible to avoid such hard requirement
 	 * in other cases.
 	 */
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
 /**
 * Cache decorator which synchronizes its {@link #put}, {@link #evict} and
 * {@link #clear} operations with Spring-managed transactions (through Spring's
- * {@link TransactionSynchronizationManager}, performing the actual cache
+ * {@link TransactionSynchronizationManager}), performing the actual cache
 * put/evict/clear operation only in the after-commit phase of a successful
 * transaction. If no transaction is active, {@link #put}, {@link #evict} and
 * {@link #clear} operations will be performed immediately, as usual.
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
 /**
 * Proxy for a target {@link CacheManager}, exposing transaction-aware {@link Cache} objects
 * which synchronize their {@link Cache#put} operations with Spring-managed transactions
- * (through Spring's {@link org.springframework.transaction.support.TransactionSynchronizationManager},
+ * (through Spring's {@link org.springframework.transaction.support.TransactionSynchronizationManager}),
 * performing the actual cache put operation only in the after-commit phase of a successful transaction.
 * If no transaction is active, {@link Cache#put} operations will be performed immediately, as usual.
 *
@@ -132,10 +132,10 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	}

 	/**
-	 * Allow Map access to the JavaMail properties of this sender,
+	 * Allow {code Map} access to the JavaMail properties of this sender,
 	 * with the option to add or override specific entries.
 	 * <p>Useful for specifying entries directly, for example via
-	 * "javaMailProperties[mail.smtp.auth]".
+	 * {code javaMailProperties[mail.smtp.auth]}.
 	 */
 	public Properties getJavaMailProperties() {
 		return this.javaMailProperties;
@@ -156,7 +156,7 @@ public class JavaMailSenderImpl implements JavaMailSender {

 	/**
 	 * Return the JavaMail {@code Session},
-	 * lazily initializing it if hasn't been specified explicitly.
+	 * lazily initializing it if it hasn't been specified explicitly.
 	 */
 	public synchronized Session getSession() {
 		if (this.session == null) {
@@ -141,7 +141,7 @@ public class JobDetailFactoryBean
 	}

 	/**
-	 * Set the recovery flag for this job, i.e. whether or not the job should
+	 * Set the recovery flag for this job, i.e. whether the job should
 	 * get re-executed if a 'recovery' or 'fail-over' situation is encountered.
 	 */
 	public void setRequestsRecovery(boolean requestsRecovery) {
@@ -119,7 +119,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 	}

 	/**
-	 * Specify whether or not multiple jobs should be run in a concurrent fashion.
+	 * Specify whether multiple jobs should be run in a concurrent fashion.
 	 * The behavior when one does not want concurrent jobs to be executed is
 	 * realized through adding the {@code @PersistJobDataAfterExecution} and
 	 * {@code @DisallowConcurrentExecution} markers.
@@ -286,7 +286,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod

 	/**
 	 * Extension of the MethodInvokingJob, implementing the StatefulJob interface.
-	 * Quartz checks whether or not jobs are stateful and if so,
+	 * Quartz checks whether jobs are stateful and if so,
 	 * won't let jobs interfere with each other.
 	 */
 	@PersistJobDataAfterExecution
@@ -41,7 +41,7 @@ import org.springframework.beans.PropertyAccessorFactory;
 * <p><b>Note that the preferred way to apply dependency injection
 * to Job instances is via a JobFactory:</b> that is, to specify
 * {@link SpringBeanJobFactory} as Quartz JobFactory (typically via
- * {@link SchedulerFactoryBean#setJobFactory} SchedulerFactoryBean's "jobFactory" property}).
+ * {@link SchedulerFactoryBean#setJobFactory SchedulerFactoryBean's "jobFactory" property}).
 * This allows to implement dependency-injected Quartz Jobs without
 * a dependency on Spring base classes.
 *
@@ -354,7 +354,7 @@ public abstract class AbstractJCacheAnnotationTests {

 		assertThatNullPointerException().isThrownBy(() ->
 				service.earlyRemoveWithException(this.keyItem, false));
-		// This will be remove anyway as the earlyRemove has removed the cache before
+		// This will be removed anyway as the earlyRemove has removed the cache before
 		assertThat(cache.get(key)).isNull();
 	}

@@ -428,7 +428,7 @@ public abstract class AbstractJCacheAnnotationTests {

 		assertThatNullPointerException().isThrownBy(() ->
 				service.earlyRemoveAllWithException(false));
-		// This will be remove anyway as the earlyRemove has removed the cache before
+		// This will be removed anyway as the earlyRemove has removed the cache before
 		assertThat(isEmpty(cache)).isTrue();
 	}

@@ -24,7 +24,7 @@ import org.springframework.lang.Nullable;

 /**
 * An implementation of {@link CachingConfigurer} with empty methods allowing
- * sub-classes to override only the methods they're interested in.
+ * subclasses to override only the methods they're interested in.
 *
 * @author Stephane Nicoll
 * @since 4.1
@@ -200,7 +200,7 @@ public class SpringCacheAnnotationParser implements CacheAnnotationParser, Seria
 	/**
 	 * Validates the specified {@link CacheOperation}.
 	 * <p>Throws an {@link IllegalStateException} if the state of the operation is
-	 * invalid. As there might be multiple sources for default values, this ensure
+	 * invalid. As there might be multiple sources for default values, this ensures
 	 * that the operation is in a proper state before being returned.
 	 * @param ae the annotated element of the cache operation
 	 * @param operation the {@link CacheOperation} to validate
@@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
 * are present.
 *
 * <p>To limit the creation of objects, an ugly constructor is used
- * (rather then a dedicated 'closure'-like class for deferred execution).
+ * (rather than a dedicated 'closure'-like class for deferred execution).
 *
 * @author Costin Leau
 * @author Stephane Nicoll
@@ -16,6 +16,8 @@

 package org.springframework.cache.interceptor;

+import java.util.function.Supplier;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

@@ -24,82 +26,125 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
- * A {@link CacheErrorHandler} implementation that logs error message. Can be
- * used when underlying cache errors should be ignored.
+ * A {@link CacheErrorHandler} implementation that logs error messages.
+ *
+ * <p>Can be used when underlying cache errors should be ignored.
 *
 * @author Adam Ostrožlík
 * @author Stephane Nicoll
+ * @author Vedran Pavic
+ * @author Sam Brannen
 * @since 5.3.16
 */
 public class LoggingCacheErrorHandler implements CacheErrorHandler {

 	private final Log logger;

-	private final boolean logStacktrace;
+	private final boolean logStackTraces;


 	/**
-	 * Create an instance with the {@link Log logger} to use.
-	 * @param logger the logger to use
-	 * @param logStacktrace whether to log stack trace
+	 * Create a {@code LoggingCacheErrorHandler} that uses the default logging
+	 * category and does not log stack traces.
+	 * <p>The default logging category is
+	 * "{@code org.springframework.cache.interceptor.LoggingCacheErrorHandler}".
 	 */
-	public LoggingCacheErrorHandler(Log logger, boolean logStacktrace) {
-		Assert.notNull(logger, "Logger must not be null");
-		this.logger = logger;
-		this.logStacktrace = logStacktrace;
+	public LoggingCacheErrorHandler() {
+		this(false);
 	}

 	/**
-	 * Create an instance that does not log stack traces.
+	 * Create a {@code LoggingCacheErrorHandler} that uses the default logging
+	 * category and the supplied {@code logStackTraces} flag.
+	 * <p>The default logging category is
+	 * "{@code org.springframework.cache.interceptor.LoggingCacheErrorHandler}".
+	 * @param logStackTraces whether to log stack traces
+	 * @since 5.3.22
 	 */
-	public LoggingCacheErrorHandler() {
-		this(LogFactory.getLog(LoggingCacheErrorHandler.class), false);
+	public LoggingCacheErrorHandler(boolean logStackTraces) {
+		this(LogFactory.getLog(LoggingCacheErrorHandler.class), logStackTraces);
+	}
+
+	/**
+	 * Create a {@code LoggingCacheErrorHandler} that uses the supplied
+	 * {@link Log logger} and {@code logStackTraces} flag.
+	 * @param logger the logger to use
+	 * @param logStackTraces whether to log stack traces
+	 */
+	public LoggingCacheErrorHandler(Log logger, boolean logStackTraces) {
+		Assert.notNull(logger, "'logger' must not be null");
+		this.logger = logger;
+		this.logStackTraces = logStackTraces;
 	}


 	@Override
 	public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
-		logCacheError(logger,
-				createMessage(cache, "failed to get entry with key '" + key + "'"),
+		logCacheError(
+				() -> String.format("Cache '%s' failed to get entry with key '%s'", cache.getName(), key),
 				exception);
 	}

 	@Override
 	public void handleCachePutError(RuntimeException exception, Cache cache, Object key, @Nullable Object value) {
-		logCacheError(logger,
-				createMessage(cache, "failed to put entry with key '" + key + "'"),
+		logCacheError(
+				() -> String.format("Cache '%s' failed to put entry with key '%s'", cache.getName(), key),
 				exception);
 	}

 	@Override
 	public void handleCacheEvictError(RuntimeException exception, Cache cache, Object key) {
-		logCacheError(logger,
-				createMessage(cache, "failed to evict entry with key '" + key + "'"),
+		logCacheError(
+				() -> String.format("Cache '%s' failed to evict entry with key '%s'", cache.getName(), key),
 				exception);
 	}

 	@Override
 	public void handleCacheClearError(RuntimeException exception, Cache cache) {
-		logCacheError(logger, createMessage(cache, "failed to clear entries"), exception);
+		logCacheError(
+				() -> String.format("Cache '%s' failed to clear entries", cache.getName()),
+				exception);
+	}
+
+
+	/**
+	 * Get the logger for this {@code LoggingCacheErrorHandler}.
+	 * @return the logger
+	 * @since 5.3.22
+	 */
+	protected final Log getLogger() {
+		return logger;
 	}

 	/**
-	 * Log the specified message.
-	 * @param logger the logger
-	 * @param message the message
-	 * @param ex the exception
+	 * Get the {@code logStackTraces} flag for this {@code LoggingCacheErrorHandler}.
+	 * @return {@code true} if this {@code LoggingCacheErrorHandler} logs stack traces
+	 * @since 5.3.22
 	 */
-	protected void logCacheError(Log logger, String message, RuntimeException ex) {
-		if (this.logStacktrace) {
-			logger.warn(message, ex);
-		}
-		else {
-			logger.warn(message);
-		}
+	protected final boolean isLogStackTraces() {
+		return this.logStackTraces;
 	}

-	private String createMessage(Cache cache, String reason) {
-		return String.format("Cache '%s' %s", cache.getName(), reason);
+	/**
+	 * Log the cache error message in the given supplier.
+	 * <p>If {@link #isLogStackTraces()} is {@code true}, the given
+	 * {@code exception} will be logged as well.
+	 * <p>The default implementation logs the message as a warning.
+	 * @param messageSupplier the message supplier
+	 * @param exception the exception thrown by the cache provider
+	 * @since 5.3.22
+	 * @see #isLogStackTraces()
+	 * @see #getLogger()
+	 */
+	protected void logCacheError(Supplier<String> messageSupplier, RuntimeException exception) {
+		if (getLogger().isWarnEnabled()) {
+			if (isLogStackTraces()) {
+				getLogger().warn(messageSupplier.get(), exception);
+			}
+			else {
+				getLogger().warn(messageSupplier.get());
+			}
+		}
 	}

 }
@@ -26,7 +26,7 @@ import org.springframework.lang.Nullable;
 *
 * <p>Transparently replaces given {@code null} user values with an internal
 * {@link NullValue#INSTANCE}, if configured to support {@code null} values
- * (as indicated by {@link #isAllowNullValues()}.
+ * (as indicated by {@link #isAllowNullValues()}).
 *
 * @author Juergen Hoeller
 * @since 4.2.2
@@ -94,7 +94,7 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
 	/**
 	 * Expose AutowireCapableBeanFactory functionality for this context.
 	 * <p>This is not typically used by application code, except for the purpose of
-	 * initializing bean instances that live outside of the application context,
+	 * initializing bean instances that live outside the application context,
 	 * applying the Spring bean lifecycle (fully or partly) to them.
 	 * <p>Alternatively, the internal BeanFactory exposed by the
 	 * {@link ConfigurableApplicationContext} interface offers access to the
@@ -27,7 +27,7 @@ import org.springframework.jmx.support.RegistrationPolicy;

 /**
 * Enables default exporting of all standard {@code MBean}s from the Spring context, as
- * well as well all {@code @ManagedResource} annotated beans.
+ * well as all {@code @ManagedResource} annotated beans.
 *
 * <p>The resulting {@link org.springframework.jmx.export.MBeanExporter MBeanExporter}
 * bean is defined under the name "mbeanExporter". Alternatively, consider defining a
@@ -37,7 +37,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 * <p>If Role is present on a {@link Configuration @Configuration} class,
 * this indicates the role of the configuration class bean definition and
 * does not cascade to all @{@code Bean} methods defined within. This behavior
- * is different than that of the @{@link Lazy} annotation, for example.
+ * is different from the behavior of the @{@link Lazy} annotation, for example.
 *
 * @author Chris Beams
 * @since 3.1
@@ -295,7 +295,7 @@ public final class LocaleContextHolder {
 	 * <p>Note: This method has a fallback to the shared default TimeZone,
 	 * either at the framework level or at the JVM-wide system level.
 	 * If you'd like to check for the raw LocaleContext content
-	 * (which may indicate no specific time zone through {@code null}, use
+	 * (which may indicate no specific time zone through {@code null}), use
 	 * {@link #getLocaleContext()} and call {@link TimeZoneAwareLocaleContext#getTimeZone()}
 	 * after downcasting to {@link TimeZoneAwareLocaleContext}.
 	 * @return the current TimeZone, or the system default TimeZone if no
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.ProtocolResolver;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
@@ -86,6 +87,7 @@ import org.springframework.util.Assert;
 *
 * @author Juergen Hoeller
 * @author Chris Beams
+ * @author Sam Brannen
 * @since 1.1.2
 * @see #registerBeanDefinition
 * @see #refresh()
@@ -216,13 +218,23 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 	//---------------------------------------------------------------------

 	/**
-	 * This implementation delegates to this context's ResourceLoader if set,
-	 * falling back to the default superclass behavior else.
-	 * @see #setResourceLoader
+	 * This implementation delegates to this context's {@code ResourceLoader} if set,
+	 * falling back to the default superclass behavior otherwise.
+	 * <p>As of Spring Framework 5.3.22, this method also honors registered
+	 * {@linkplain #getProtocolResolvers() protocol resolvers} when a custom
+	 * {@code ResourceLoader} has been set.
+	 * @see #setResourceLoader(ResourceLoader)
+	 * @see #addProtocolResolver(ProtocolResolver)
 	 */
 	@Override
 	public Resource getResource(String location) {
 		if (this.resourceLoader != null) {
+			for (ProtocolResolver protocolResolver : getProtocolResolvers()) {
+				Resource resource = protocolResolver.resolve(location, this);
+				if (resource != null) {
+					return resource;
+				}
+			}
 			return this.resourceLoader.getResource(location);
 		}
 		return super.getResource(location);
@@ -231,7 +243,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 	/**
 	 * This implementation delegates to this context's ResourceLoader if it
 	 * implements the ResourcePatternResolver interface, falling back to the
-	 * default superclass behavior else.
+	 * default superclass behavior otherwise.
 	 * @see #setResourceLoader
 	 */
 	@Override
@@ -64,7 +64,7 @@ import org.springframework.util.StringUtils;
 * "WEB-INF/messages_en.xml" etc. Note that message definitions in a <i>previous</i>
 * resource bundle will override ones in a later bundle, due to sequential lookup.

- * <p>This MessageSource can easily be used outside of an
+ * <p>This MessageSource can easily be used outside an
 * {@link org.springframework.context.ApplicationContext}: it will use a
 * {@link org.springframework.core.io.DefaultResourceLoader} as default,
 * simply getting overridden with the ApplicationContext's resource loader
@@ -156,7 +156,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
 	 * <p>The default is a DefaultResourceLoader. Will get overridden by the
 	 * ApplicationContext if running in a context, as it implements the
 	 * ResourceLoaderAware interface. Can be manually overridden when
-	 * running outside of an ApplicationContext.
+	 * running outside an ApplicationContext.
 	 * @see org.springframework.core.io.DefaultResourceLoader
 	 * @see org.springframework.context.ResourceLoaderAware
 	 */
@@ -102,7 +102,7 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
 	}

 	/*
-	 * This method never fails, allowing to try other possible ways to use an
+	 * This method never fails, allowing to try other possible ways to use a
 	 * server-agnostic weaver. This non-failure logic is required since
 	 * determining a load-time weaver based on the ClassLoader name alone may
 	 * legitimately fail due to other mismatches.
@@ -181,7 +181,7 @@ public class DateFormatter implements Formatter<Date> {
 	}

 	/**
-	 * Specify whether or not parsing is to be lenient. Default is false.
+	 * Specify whether parsing is to be lenient. Default is {@code false}.
 	 * <p>With lenient parsing, the parser may allow inputs that do not precisely match the format.
 	 * With strict parsing, inputs must match the format exactly.
 	 */
@@ -37,7 +37,7 @@ public abstract class AbstractNumberFormatter implements Formatter<Number> {


 	/**
-	 * Specify whether or not parsing is to be lenient. Default is false.
+	 * Specify whether parsing is to be lenient. Default is {@code false}.
 	 * <p>With lenient parsing, the parser may allow inputs that do not precisely match the format.
 	 * With strict parsing, inputs must match the format exactly.
 	 */
@@ -165,10 +165,10 @@ public class MBeanClientInterceptor
 	}

 	/**
-	 * Allow Map access to the environment to be set for the connector,
+	 * Allow {@code Map} access to the environment to be set for the connector,
 	 * with the option to add or override specific entries.
 	 * <p>Useful for specifying entries directly, for example via
-	 * "environment[myKey]". This is particularly useful for
+	 * {@code environment[myKey]}. This is particularly useful for
 	 * adding or overriding entries in child bean definitions.
 	 */
 	@Nullable
@@ -189,9 +189,9 @@ public class MBeanClientInterceptor
 	}

 	/**
-	 * Set whether or not the proxy should connect to the {@code MBeanServer}
-	 * at creation time ("true") or the first time it is invoked ("false").
-	 * Default is "true".
+	 * Set whether the proxy should connect to the {@code MBeanServer}
+	 * at creation time ({@code true}) or the first time it is invoked
+	 * ({@code false}). Default is {@code true}.
 	 */
 	public void setConnectOnStartup(boolean connectOnStartup) {
 		this.connectOnStartup = connectOnStartup;
@@ -199,7 +199,7 @@ public class MBeanClientInterceptor

 	/**
 	 * Set whether to refresh the MBeanServer connection on connect failure.
-	 * Default is "false".
+	 * Default is {@code false}.
 	 * <p>Can be turned on to allow for hot restart of the JMX server,
 	 * automatically reconnecting and retrying in case of an IOException.
 	 */
@@ -88,10 +88,10 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	}

 	/**
-	 * Allow Map access to the environment to be set for the connector,
+	 * Allow {@code Map} access to the environment to be set for the connector,
 	 * with the option to add or override specific entries.
 	 * <p>Useful for specifying entries directly, for example via
-	 * "environment[myKey]". This is particularly useful for
+	 * {@code environment[myKey]}. This is particularly useful for
 	 * adding or overriding entries in child bean definitions.
 	 */
 	@Nullable
@@ -306,7 +306,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	}

 	/**
-	 * Indicates whether or not the managed resource should be exposed on the
+	 * Indicates whether the managed resource should be exposed on the
 	 * {@link Thread#getContextClassLoader() thread context ClassLoader} before
 	 * allowing any invocations on the MBean to occur.
 	 * <p>The default value is {@code true}, exposing a {@link SpringModelMBean}
@@ -513,7 +513,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	 * {@code ModelMBean}. The actual implementation of the
 	 * {@code ModelMBean} interface used depends on the implementation of
 	 * the {@code ModelMBeanProvider} interface that is configured. By
-	 * default the {@code RequiredModelMBean} class that is supplied with
+	 * default, the {@code RequiredModelMBean} class that is supplied with
 	 * all JMX implementations is used.
 	 * <p>The management interface produced for each bean is dependent on the
 	 * {@code MBeanInfoAssembler} implementation being used. The
@@ -914,7 +914,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo
 	}

 	/**
-	 * Indicates whether or not a particular bean name is present in the excluded beans list.
+	 * Indicates whether a particular bean name is present in the excluded beans list.
 	 */
 	private boolean isExcluded(String beanName) {
 		return (this.excludedBeans.contains(beanName) ||
@@ -1067,7 +1067,7 @@ public class MBeanExporter extends MBeanRegistrationSupport implements MBeanExpo

 		/**
 		 * Called during the autodetection process to decide whether
-		 * or not a bean should be included.
+		 * a bean should be included.
 		 * @param beanClass the class of the bean
 		 * @param beanName the name of the bean
 		 */
@@ -39,7 +39,7 @@ public class UnableToRegisterMBeanException extends MBeanExportException {
 	 * Create a new {@code UnableToRegisterMBeanException} with the
 	 * specified error message and root cause.
 	 * @param msg the detail message
-	 * @param cause the root caus
+	 * @param cause the root cause
 	 */
 	public UnableToRegisterMBeanException(String msg, Throwable cause) {
 		super(msg, cause);
@@ -43,7 +43,7 @@ import org.springframework.lang.Nullable;
 *
 * <p>The logic for creating MBean metadata from the reflective metadata
 * is contained in this class, but this class makes no decisions as to
- * which methods and properties are to be exposed. Instead it gives
+ * which methods and properties are to be exposed. Instead, it gives
 * subclasses a chance to 'vote' on each property or method through
 * the {@code includeXXX} methods.
 *
@@ -177,7 +177,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	private Integer defaultCurrencyTimeLimit;

 	/**
-	 * Indicates whether or not strict casing is being used for attributes.
+	 * Indicates whether strict casing is being used for attributes.
 	 */
 	private boolean useStrictCasing = true;

@@ -119,7 +119,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem

 	/**
 	 * Used for autodetection of beans. Checks to see if the bean's class has a
-	 * {@code ManagedResource} attribute. If so it will add it list of included beans.
+	 * {@code ManagedResource} attribute. If so, it will add it to the list of included beans.
 	 * @param beanClass the class of the bean
 	 * @param beanName the name of the bean in the bean factory
 	 */
@@ -410,7 +410,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	/**
 	 * Determines which of two {@code int} values should be used as the value
 	 * for an attribute descriptor. In general, only the getter or the setter will
-	 * be have a non-negative value so we use that value. In the event that both values
+	 * have a non-negative value, so we use that value. In the event that both values
 	 * are non-negative, we use the greater of the two. This method can be used to
 	 * resolve any {@code int} valued descriptor where there are two possible values.
 	 * @param getter the int value associated with the getter for this attribute
@@ -35,7 +35,7 @@ public interface JmxAttributeSource {
 	/**
 	 * Implementations should return an instance of {@code ManagedResource}
 	 * if the supplied {@code Class} has the appropriate metadata.
-	 * Otherwise should return {@code null}.
+	 * Otherwise, should return {@code null}.
 	 * @param clazz the class to read the attribute data from
 	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
@@ -46,7 +46,7 @@ public interface JmxAttributeSource {
 	/**
 	 * Implementations should return an instance of {@code ManagedAttribute}
 	 * if the supplied {@code Method} has the corresponding metadata.
-	 * Otherwise should return {@code null}.
+	 * Otherwise, should return {@code null}.
 	 * @param method the method to read the attribute data from
 	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
@@ -57,7 +57,7 @@ public interface JmxAttributeSource {
 	/**
 	 * Implementations should return an instance of {@code ManagedMetric}
 	 * if the supplied {@code Method} has the corresponding metadata.
-	 * Otherwise should return {@code null}.
+	 * Otherwise, should return {@code null}.
 	 * @param method the method to read the attribute data from
 	 * @return the metric, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
@@ -68,7 +68,7 @@ public interface JmxAttributeSource {
 	/**
 	 * Implementations should return an instance of {@code ManagedOperation}
 	 * if the supplied {@code Method} has the corresponding metadata.
-	 * Otherwise should return {@code null}.
+	 * Otherwise, should return {@code null}.
 	 * @param method the method to read the attribute data from
 	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
@@ -78,7 +78,7 @@ public interface JmxAttributeSource {

 	/**
 	 * Implementations should return an array of {@code ManagedOperationParameter}
-	 * if the supplied {@code Method} has the corresponding metadata. Otherwise
+	 * if the supplied {@code Method} has the corresponding metadata. Otherwise,
 	 * should return an empty array if no metadata is found.
 	 * @param method the {@code Method} to read the metadata from
 	 * @return the parameter information.
@@ -88,7 +88,7 @@ public interface JmxAttributeSource {

 	/**
 	 * Implementations should return an array of {@link ManagedNotification ManagedNotifications}
-	 * if the supplied the {@code Class} has the corresponding metadata. Otherwise
+	 * if the supplied {@code Class} has the corresponding metadata. Otherwise,
 	 * should return an empty array.
 	 * @param clazz the {@code Class} to read the metadata from
 	 * @return the notification information
@@ -32,7 +32,7 @@ import javax.management.Notification;
 * <p>Each managed resource instance will have a distinct instance of a
 * {@code NotificationPublisher} implementation. This instance will keep
 * track of all the {@link javax.management.NotificationListener NotificationListeners}
- * registered for a particular mananaged resource.
+ * registered for a particular managed resource.
 *
 * <p>Any existing, user-defined MBeans should use standard JMX APIs for notification
 * publication; this interface is intended for use only by Spring-created MBeans.
@@ -74,7 +74,7 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial


 	/**
-	 * Set whether or not the {@code MBeanServerFactoryBean} should attempt
+	 * Set whether the {@code MBeanServerFactoryBean} should attempt
 	 * to locate a running {@code MBeanServer} before creating one.
 	 * <p>Default is {@code false}.
 	 */
@@ -54,7 +54,7 @@ import org.springframework.util.ClassUtils;
 * a "proxyInterface" in such a scenario, since the actual JNDI object type is not
 * known in advance.
 *
- * <p>Of course, bean classes in a Spring environment may lookup e.g. a DataSource
+ * <p>Of course, bean classes in a Spring environment may look up e.g. a DataSource
 * from JNDI themselves. This class simply enables central configuration of the
 * JNDI name, and easy switching to non-JNDI alternatives. The latter is
 * particularly convenient for test setups, reuse in standalone clients, etc.
@@ -47,7 +47,7 @@ import org.springframework.lang.Nullable;
 * Java EE application's "java:comp/env/" namespace. It caches the resolved
 * types for all obtained objects, and optionally also caches shareable
 * objects (if they are explicitly marked as
- * {@link #addShareableResource shareable resource}.
+ * {@link #addShareableResource shareable resource}).
 *
 * <p>The main intent of this factory is usage in combination with Spring's
 * {@link org.springframework.context.annotation.CommonAnnotationBeanPostProcessor},
@@ -40,7 +40,7 @@ public class SchedulingException extends NestedRuntimeException {
 	/**
 	 * Constructor for SchedulingException.
 	 * @param msg the detail message
-	 * @param cause the root cause (usually from using a underlying
+	 * @param cause the root cause (usually from using an underlying
 	 * scheduling API such as Quartz)
 	 */
 	public SchedulingException(String msg, Throwable cause) {
@@ -49,7 +49,7 @@ public interface SchedulingTaskExecutor extends AsyncTaskExecutor {
 	 * individual subtasks which submit a follow-up task afterwards (if feasible).
 	 * <p>This should be considered a hint. Of course {@code TaskExecutor} clients
 	 * are free to ignore this flag and hence the {@code SchedulingTaskExecutor}
-	 * interface overall. However, thread pools will usually indicated a preference
+	 * interface overall. However, thread pools will usually indicate a preference
 	 * for short-lived tasks, allowing for more fine-grained scheduling.
 	 * @return {@code true} if this executor prefers short-lived tasks (the default),
 	 * {@code false} otherwise (for treatment like a regular {@code TaskExecutor})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Spring Builds	508cc346e0	Release v5.3.22	2022-07-14 08:39:33 +00:00
rstoyanchev	e50131d454	Add Consumer methods to configure Jackson modules Closes gh-28633	2022-07-13 19:10:51 +01:00
rstoyanchev	cdd4e8cd7f	Improve regex support for URL path matching Closes gh-28815	2022-07-13 18:43:51 +01:00
Juergen Hoeller	02b7ddbc70	Upgrade to Log4J 2.18, H2 2.1.214, OpenPDF 1.3.29, XStream 1.4.19, HtmlUnit 2.63, Jetty Reactive HttpClient 1.1.12	2022-07-13 16:48:02 +02:00
Juergen Hoeller	8e5c4903d4	Avoid synchronization in AbstractAspectJAdvice#calculateArgumentBindings Aligned with the early calculateArgumentBindings call in ReflectiveAspectJAdvisorFactory. Closes gh-26377	2022-07-13 16:47:35 +02:00
Marc Wrobel	bd3499671c	Fix typos in test code This commit fixes typos in test class names, test method names, and test variable names. Closes gh-28807	2022-07-13 16:24:11 +02:00
Sam Brannen	2e4d7e4ef9	Polishing	2022-07-13 16:13:09 +02:00
Marc Wrobel	c6be3b33c9	Fix and improve Javadoc in spring-aop Closes gh-28803	2022-07-13 16:13:02 +02:00
Marc Wrobel	c112bb0ae1	Fix and improve Javadoc in spring-beans See gh-28803	2022-07-13 16:12:51 +02:00
Marc Wrobel	165fba868c	Fix typos in reference docs Closes gh-28805	2022-07-13 15:12:31 +02:00
Marc Wrobel	2ca64ad88a	Fix minor typos in project README See gh-28805	2022-07-13 15:12:21 +02:00
Sam Brannen	ea27206a32	Polishing	2022-07-13 14:45:31 +02:00
Marc Wrobel	c48c5e7691	Fix and improve Javadoc in spring-context Closes gh-28802	2022-07-13 14:45:23 +02:00
Marc Wrobel	bc15f839cd	Fix and improve Javadoc in spring-core See gh-28802	2022-07-13 14:45:13 +02:00
Sam Brannen	46db372951	Polishing	2022-07-13 14:01:47 +02:00
Marc Wrobel	91258271e4	Fix and improve Javadoc in spring-expression Closes gh-28800	2022-07-13 14:01:41 +02:00
Marc Wrobel	e76fbcb290	Fix and improve Javadoc in spring-jms See gh-28800	2022-07-13 14:01:37 +02:00
Marc Wrobel	82ca27e46f	Fix and improve Javadoc in spring-messaging See gh-28800	2022-07-13 14:01:29 +02:00
Marc Wrobel	bca104798b	Fix and improve Javadoc in spring-jdbc Closes gh-28796	2022-07-13 13:42:48 +02:00
Marc Wrobel	b30eb6837c	Fix and improve Javadoc in spring-oxm See gh-28796	2022-07-13 13:42:42 +02:00
Marc Wrobel	ac06d1dfa9	Fix and improve Javadoc in spring-orm See gh-28796	2022-07-13 13:42:33 +02:00
Marc Wrobel	cfb39acc97	Fix and improve Javadoc in spring-r2dbc See gh-28796	2022-07-13 13:42:16 +02:00
Sam Brannen	222dbf8377	Update copyright date	2022-07-13 13:22:40 +02:00
kacperkrzyzak	10838a636f	Correctly identify MaxUploadSizeExceededException in StandardMultipartHttpServletRequest This commit correctly identifies MaxUploadSizeExceededException in StandardMultipartHttpServletRequest by converting keywords in the exception message to lowercase before checking for their presence, for compatibility with Jetty 9.4.x. Closes gh-28759	2022-07-13 13:17:53 +02:00
Juergen Hoeller	3c3ae32f07	Upgrade to Netty 4.1.79, Jetty 9.4.48, Undertow 2.2.18, Checkstyle 10.3.1	2022-07-13 11:11:17 +02:00
Juergen Hoeller	a3e46a2db7	ResolvableType.forInstance returns NONE for null instance Closes gh-28776	2022-07-13 11:10:35 +02:00
Juergen Hoeller	de1b938e2e	Improve diagnostics for CGLIB ClassLoader mismatch with --add-opens hint Closes gh-28747	2022-07-13 11:10:00 +02:00
Juergen Hoeller	d72aeac319	Create well-known non-interface types without using reflection Closes gh-28718	2022-07-13 11:09:43 +02:00
Juergen Hoeller	5247eeba84	Support LocalDate/Time for SQL type mappings Closes gh-28778	2022-07-13 11:09:30 +02:00
Juergen Hoeller	ae70e3c81c	Apply read-only enforcement after R2DBC transaction begin Includes prepareTransactionalConnection variant aligned with JDBC DataSourceTransactionManager. Closes gh-28610	2022-07-13 11:09:17 +02:00
Sébastien Deleuze	c942c8d2cf	Fix expectations in MockMvc Kotlin documentation Closes gh-28301	2022-07-13 10:06:41 +02:00
Sébastien Deleuze	1201af20e4	Improve consistency of Kotlin injection code samples Closes gh-28596	2022-07-13 09:42:47 +02:00
Sébastien Deleuze	d1df4d3739	Fix Kotlin code snippets language Closes gh-28810	2022-07-13 09:21:02 +02:00
Sébastien Deleuze	1ef8800c6c	Fix Kotlin example for custom @Production Closes gh-28680	2022-07-13 09:13:47 +02:00
Sébastien Deleuze	4d7e4e0c58	Fix a typo See gh-28630	2022-07-12 18:54:01 +02:00
Stephane Nicoll	c7067269b3	Upgrade to Reactor 2020.0.21 Closes gh-28765	2022-07-12 14:31:43 +02:00
Sam Brannen	3af6a22b9f	Temporarily disable Javadoc links to Apache HttpClient 5.1 APIs	2022-07-12 13:26:07 +02:00
Sam Brannen	31a9694fc8	Improve Javadoc for ContextCache#clearStatistics() See gh-28795	2022-07-12 13:04:34 +02:00
Marc Wrobel	92b8e99cbc	Fix and improve Javadoc in spring-test Closes gh-28795	2022-07-12 12:55:59 +02:00
Marc Wrobel	3b68e97710	Fix and improve Javadoc in spring-tx Closes gh-28794	2022-07-12 12:36:49 +02:00
Marc Wrobel	6f494ef438	Fix and improve Javadoc in spring-web Closes gh-28791	2022-07-12 12:08:12 +02:00
Sam Brannen	19704805fd	Polish contribution See gh-28790	2022-07-12 11:56:01 +02:00
Marc Wrobel	31c6965c7f	Fix and improve Javadoc in spring-webflux Closes gh-28790	2022-07-12 11:48:58 +02:00
Sam Brannen	5b1a84e395	Polish contribution See gh-28789	2022-07-12 10:39:11 +02:00
Marc Wrobel	6985fa8057	Fix and improve Javadoc in spring-webmvc Closes gh-28789	2022-07-12 10:39:03 +02:00
Marc Wrobel	03f0c57704	Fix and improve Javadoc in spring-websocket Closes gh-28788	2022-07-11 21:30:32 +02:00
Sam Brannen	d274e893a6	Remove superfluous static declaration for enum, annotation, & interface	2022-07-09 16:16:13 +02:00
Arjen Poutsma	aa8b06b622	Delete file on multipart cancel This commit makes sure that the temporary file used for multipart storage is deleted when the source stream is malformed or cancelled. Closes gh-28740	2022-07-08 16:36:01 +02:00
Sam Brannen	323dbb912e	Move convention-based attribute override tests to @Nested class	2022-07-06 13:19:41 +02:00
rstoyanchev	63d7e81a48	Switch to Reactor 2020-0.21 snapshots See gh-28765	2022-07-06 11:30:44 +01:00
Sam Brannen	07960d4918	Polishing	2022-07-06 11:44:15 +02:00
Sam Brannen	07cfcbc3a9	Move convention-based attribute override tests to @Nested class	2022-07-06 11:42:39 +02:00
Sam Brannen	2af27d899f	Trim string input in Converters where whitespace is irrelevant Closes gh-28756	2022-07-05 13:53:00 +02:00
Sam Brannen	0621a8eff1	Fix concurrency issues in FreeMarkerMacroTests Prior to this commit, tests in these two classes intermittently failed with errors similar to the following, due to concurrent modification of shared files. expected: "<input type="text" id="name" name="name" value="Darren" >" but was: "<input type="text" id="name" name="name" value="Darren" > "hidden"/>" This commit fixes this by creating a new temporary folder for each test method invocation.	2022-07-05 13:17:50 +02:00
Sam Brannen	7ac646bc96	Upgrade to TestNG Engine 1.0.4	2022-07-05 12:43:05 +02:00
Sam Brannen	2c3243c93c	Trim string input in PropertyEditors where whitespace is irrelevant Closes gh-28755	2022-07-04 19:24:58 +02:00
Sam Brannen	2bf5f7a6b3	Introduce lenient parsing in DataSize regarding whitespace Prior to this commit, a DataSize input string could not be parsed if it contained any whitespace. With this commit, a DataSize input string can contain leading, trailing, or 'in between' whitespace. For example, the following will be parsed to the same DataSize value. - "1024B" - "1024 B" - " 1024B " - " 1024 B " Closes gh-28643	2022-07-04 19:24:58 +02:00
Sam Brannen	bf39492c34	Introduce StringUtils.trimAllWhitespace(CharSequence) Closes gh-28757	2022-07-04 19:24:45 +02:00
rstoyanchev	007bdede46	Add missing check to avoid re-initialization Noticed during review of #28736 that a check protecting against re-initialization was accidentally removed in commit `3d6e38bb43`.	2022-07-04 16:17:57 +01:00
rstoyanchev	22cc6c5918	Polishing contribution Closes gh-28736	2022-07-04 16:12:57 +01:00
CodeInDreams	461ba53b39	Qualify channelExecutor and taskScheduler in WebSocket config See gh-28736	2022-07-04 15:51:40 +01:00
Sam Brannen	d1d6eb095e	Fix GenericApplicationContextTests on Microsoft Windows (round 2) The previous change to the tests resulted in a failure on Windows when using the DefaultResourceLoader by expecting an exception when no exception is thrown. This commit narrows the scope of the if-clause to expect an exception only when using the FileSystemResourceLoader on Windows. See gh-28703, gh-28746	2022-07-03 17:59:37 +02:00
Sam Brannen	f732fab820	Delete unused imports and dead code in CGLIB fork	2022-07-03 17:30:30 +02:00
Sam Brannen	fda3f8201a	Switch warning level for forbidden reference to INFO in Eclipse IDE	2022-07-03 17:23:55 +02:00
Sam Brannen	e608b36713	Improve GenericApplicationContextTests.getResource*() tests This commit updates the tests so that they test something meaningful on MS Windows as well as on Linux/Mac. See gh-28703, gh-28746	2022-07-03 14:36:41 +02:00
jason	59180e76a7	Fix GenericApplicationContextTests on Microsoft Windows The tests introduced in commit `9868c28c73` pass on Mac OS and Linux but fail on Microsoft Windows. This commit updates the tests so that they pass on MS Windows as well. See gh-28703 Closes gh-28746	2022-07-03 14:35:07 +02:00
Sam Brannen	c5987d7c37	Fix typo in test	2022-07-02 17:09:07 +02:00
Sam Brannen	5650e20edd	Polishing	2022-07-01 10:42:23 +02:00
Johnny Lim	2885177f5b	Add @since tag for new CannotGetJdbcConnectionException constructor See gh-28669 Closes gh-28738	2022-07-01 10:39:35 +02:00
rstoyanchev	058ce36402	Improve ExtendedWebExchangeDataBinder implementation Close gh-28646	2022-07-01 03:23:32 +01:00
Vikey Chen	2afe560e41	Replace forEach with putAll See gh-28646	2022-07-01 03:01:12 +01:00
rstoyanchev	b95362a3fd	Avoid request params access for form data in logRequest Close gh-28587	2022-07-01 02:55:16 +01:00
Sam Brannen	9ea45697ac	Support cookie comments in MockHttpServletResponse and MockCookie Prior to this commit, if a cookie was added to MockHttpServletResponse, the comment attribute was not included in the generated Set-Cookie header. In addition, MockCookie.parse(String) did not support the Comment attribute. This commit addresses both of these issues. Closes gh-28730	2022-06-30 16:51:43 +02:00
Johnny Lim	fe2b8580a0	Upgrade to Gradle Enterprise Conventions 0.0.10	2022-06-30 14:59:55 +02:00
Sam Brannen	622fc3edf7	Fix merged annotation attributes regression Commit `d6768ccc18` introduced a regression in the support for merging annotation attributes in a multi-level annotation hierarchy. This commit addresses that issue by ensuring that a merged annotation is once again synthesized if a meta-annotation in the annotation hierarchy declares attributes that override attributes in the target annotation. Closes gh-28716	2022-06-28 14:22:53 +02:00
Sam Brannen	9868c28c73	Honor ProtocolResolvers in GenericApplicationContext When the ProtocolResolver SPI was introduced in Spring Framework 4.3, support for protocol resolvers was added in DefaultResourceLoader's getResource() implementation; however, GenericApplicationContext's overridden getResource() implementation was not updated accordingly. Prior to this commit, if a GenericApplicationContext was configured with a custom ResourceLoader, registered protocol resolvers were ignored. This commit ensures that protocol resolvers are honored in GenericApplicationContext even if a custom ResourceLoader is used. Closes gh-28703	2022-06-27 18:00:29 +02:00
Sam Brannen	a970516080	Polish GenericApplicationContextTests	2022-06-27 17:05:02 +02:00
Sam Brannen	0c9def89de	Ignore build artifacts from the main branch for nohttp	2022-06-27 15:05:05 +02:00
Sam Brannen	8892a05868	Ignore /spring-core/graalvm/build artifacts from the main branch This commit eases switching between the `main` and `5.3.x` branches.	2022-06-27 14:43:06 +02:00
Sam Brannen	d6768ccc18	Ensure meta-annotations are not unnecessarily synthesized Prior to this commit, meta-annotations were unnecessarily synthesized when attempting to synthesize a MergedAnnotation retrieved via the MergedAnnotations.from(AnnotatedElement, ...).get(<annotationType>) API. This is a regression in our merged annotation support that was introduced when the MergedAnnotations API replaced our previous support. This commit fixes this by revising the logic in TypeMappedAnnotation's createSynthesizedAnnotation() method so that a meta-annotation is returned unmodified if it is not synthesizable. This commit also updates BootstrapUtilsTests, since @BootstrapWith should never have been synthesized, and Class#getCanonicalName() is only used in the toString() implementation of an annotation synthesized by Spring or normal annotations on Java 19+ (see https://bugs.openjdk.org/browse/JDK-8281462). Closes gh-28704	2022-06-25 20:02:04 +02:00
Sam Brannen	faf20b7a5a	Polish MergedAnnotations Javadoc and internals	2022-06-25 19:50:03 +02:00
Sam Brannen	661996471e	Polishing	2022-06-25 19:24:51 +02:00
Stephane Nicoll	5639ff0939	Merge pull request #28669 from kevin0x90 * pr/28669: Polish "Fix DataSourceUtils inconsistent exception handling" Fix DataSourceUtils inconsistent exception handling Closes gh-28669	2022-06-23 09:04:40 +02:00
Stephane Nicoll	e98b602d4f	Polish "Fix DataSourceUtils inconsistent exception handling" See gh-28669	2022-06-23 09:01:39 +02:00
Kevin Schönfeld	edfe5d2f18	Fix DataSourceUtils inconsistent exception handling Align IllegalStateException with SQLException handling and propagate the original exception. See gh-28669 Co-authored-by: Christoph Mies <chr.mi@web.de>	2022-06-23 09:01:39 +02:00
Sam Brannen	26df4580b3	Revise internals of LoggingCacheErrorHandler Since LoggingCacheErrorHandler was only recently introduced in 5.3.16, we have decided to completely revise its internals (protected API) in 5.3.x while retaining the current public API. Specifically, this commit: - introduces protected getLogger() and isLogStackTraces() methods to improve extensibility - revises logCacheError() to accept a Supplier<String> for lazy resolution of error messages Closes gh-28672 See gh-28670, gh-28648	2022-06-21 16:13:55 +02:00
Vedran Pavic	57208bf47a	Simplify LoggingCacheErrorHandlerTests See gh-28648	2022-06-21 14:40:09 +02:00
Sam Brannen	8b34558284	Polish LoggingCacheErrorHandler	2022-06-21 14:07:39 +02:00
Vedran Pavic	dbe8f200a9	Simplify creation of LoggingCacheErrorHandler with logged stacktrace At present, creating a LoggingCacheErrorHandler that logs stack traces also requires supplying the logger to be used. This might be inconvenient for some users, as it requires usage of the Commons Logging API. This commit simplifies creation of such as LoggingCacheErrorHandler instance by adding a constructor that only accepts a boolean flag indicating whether to log stack traces. Closes gh-28670	2022-06-21 13:50:10 +02:00
Sam Brannen	ea4d9a20ac	Upgrade to Hamcrest 2.2	2022-06-21 13:48:02 +02:00
Sam Brannen	e19e9757d4	Polishing	2022-06-20 15:19:02 +02:00
Jerome Prinet	2473e956ff	Update Gradle Enterprise plugin Closes gh-28661	2022-06-20 11:40:43 +02:00
Sébastien Deleuze	854307d8d8	Document that Kotlin inline classes are not supported Closes gh-28642	2022-06-17 12:34:58 +02:00
Sébastien Deleuze	3401359bdf	Refine @Required Kotlin documentation Refine @Required Kotlin documentation to use annotation use site targets. Closes gh-28630	2022-06-17 12:25:52 +02:00
Sébastien Deleuze	f1c00dd8a6	Fix a typo in ResponseEntity documentation Closes gh-28647	2022-06-17 12:15:22 +02:00
Sam Brannen	bdf91ac435	Set default encoding for Eclipse projects to UTF-8 This change aligns with Java 18 support in recent versions of Eclipse.	2022-06-16 16:13:35 +02:00
Lars Grefer	181023c0c3	Update to Bouncycastle 1.71 Closes gh-28636	2022-06-16 16:03:11 +02:00
Sam Brannen	fb1fa073a6	Polishing	2022-06-15 15:07:58 +02:00
Sam Brannen	e9806a96dc	Polish contribution and introduce test See gh-28631	2022-06-15 15:07:58 +02:00
Johnny Lim	9b93508374	Add MockMvcRequestBuilders.multipart(HttpMethod, String, Object...) See gh-28545 Closes gh-28631	2022-06-15 14:09:59 +02:00
Sam Brannen	8b4750e705	Fix Kotlin example for @ComponentScan basePackages attribute Closes gh-28628	2022-06-15 11:27:39 +02:00
Spring Builds	2e033339d1	Next development version (v5.3.22-SNAPSHOT)	2022-06-15 08:17:52 +00:00