Release v5.3.31

Includes RxJava 3.1.8, SmallRye Mutiny 1.9.0, BlockHound 1.0.8, OpenPDF 1.3.33, Checkstyle 10.12.5

Closes gh-31584

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.372-librca
+java=8.0.382-librca

build.gradle

@@ -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.95.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.34"
+			mavenBom "io.netty:netty-bom:4.1.101.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.38"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
 			mavenBom "io.rsocket:rsocket-bom:1.1.3"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.51.v20230217"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.53.v20231009"
 			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.20.0') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.21.1') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -67,9 +67,9 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.5"
-			dependency "io.smallrye.reactive:mutiny:1.8.0"
-			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.8"
+			dependency "io.smallrye.reactive:mutiny:1.9.0"
+			dependency "io.projectreactor.tools:blockhound:1.0.8.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.1"
@@ -96,7 +96,7 @@ configure(allprojects) { project ->
 
 			dependency "com.h2database:h2:2.1.214"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
-			dependency "com.github.librepdf:openpdf:1.3.30"
+			dependency "com.github.librepdf:openpdf:1.3.33"
 			dependency "com.rometools:rome:1.18.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.4"
@@ -128,18 +128,18 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.78') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.82') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.78') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.82') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.25.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.28.Final') {
 				entry 'undertow-core'
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "10.12.1"
+		toolVersion = "10.12.5"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 

gradle.properties

@@ -1,4 +1,4 @@
-version=5.3.30-SNAPSHOT
+version=5.3.31
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.parallel=true

spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -1004,18 +1004,20 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 	 */
 	protected abstract static class PropertyHandler {
 
+		@Nullable
 		private final Class<?> propertyType;
 
 		private final boolean readable;
 
 		private final boolean writable;
 
-		public PropertyHandler(Class<?> propertyType, boolean readable, boolean writable) {
+		public PropertyHandler(@Nullable Class<?> propertyType, boolean readable, boolean writable) {
 			this.propertyType = propertyType;
 			this.readable = readable;
 			this.writable = writable;
 		}
 
+		@Nullable
 		public Class<?> getPropertyType() {
 			return this.propertyType;
 		}

spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

@@ -23,6 +23,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
 import java.net.URI;
 import java.net.URL;
 import java.time.temporal.Temporal;
@@ -30,6 +31,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -787,38 +789,28 @@ public abstract class BeanUtils {
 		if (editable != null) {
 			if (!editable.isInstance(target)) {
 				throw new IllegalArgumentException("Target class [" + target.getClass().getName() +
-						"] not assignable to Editable class [" + editable.getName() + "]");
+						"] not assignable to editable class [" + editable.getName() + "]");
 			}
 			actualEditable = editable;
 		}
 		PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable);
-		List<String> ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : null);
+		Set<String> ignoredProps = (ignoreProperties != null ? new HashSet<>(Arrays.asList(ignoreProperties)) : null);
+		CachedIntrospectionResults sourceResults = (actualEditable != source.getClass() ?
+				CachedIntrospectionResults.forClass(source.getClass()) : null);
 
 		for (PropertyDescriptor targetPd : targetPds) {
 			Method writeMethod = targetPd.getWriteMethod();
-			if (writeMethod != null && (ignoreList == null || !ignoreList.contains(targetPd.getName()))) {
-				PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), targetPd.getName());
+			if (writeMethod != null && (ignoredProps == null || !ignoredProps.contains(targetPd.getName()))) {
+				PropertyDescriptor sourcePd = (sourceResults != null ?
+						sourceResults.getPropertyDescriptor(targetPd.getName()) : targetPd);
 				if (sourcePd != null) {
 					Method readMethod = sourcePd.getReadMethod();
 					if (readMethod != null) {
-						ResolvableType sourceResolvableType = ResolvableType.forMethodReturnType(readMethod);
-						ResolvableType targetResolvableType = ResolvableType.forMethodParameter(writeMethod, 0);
-
-						// Ignore generic types in assignable check if either ResolvableType has unresolvable generics.
-						boolean isAssignable =
-								(sourceResolvableType.hasUnresolvableGenerics() || targetResolvableType.hasUnresolvableGenerics() ?
-										ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType()) :
-										targetResolvableType.isAssignableFrom(sourceResolvableType));
-
-						if (isAssignable) {
+						if (isAssignable(writeMethod, readMethod)) {
 							try {
-								if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) {
-									readMethod.setAccessible(true);
-								}
+								ReflectionUtils.makeAccessible(readMethod);
 								Object value = readMethod.invoke(source);
-								if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) {
-									writeMethod.setAccessible(true);
-								}
+								ReflectionUtils.makeAccessible(writeMethod);
 								writeMethod.invoke(target, value);
 							}
 							catch (Throwable ex) {
@@ -832,6 +824,24 @@ public abstract class BeanUtils {
 		}
 	}
 
+	private static boolean isAssignable(Method writeMethod, Method readMethod) {
+		Type paramType = writeMethod.getGenericParameterTypes()[0];
+		if (paramType instanceof Class) {
+			return ClassUtils.isAssignable((Class<?>) paramType, readMethod.getReturnType());
+		}
+		else if (paramType.equals(readMethod.getGenericReturnType())) {
+			return true;
+		}
+		else {
+			ResolvableType sourceType = ResolvableType.forMethodReturnType(readMethod);
+			ResolvableType targetType = ResolvableType.forMethodParameter(writeMethod, 0);
+			// Ignore generic types in assignable check if either ResolvableType has unresolvable generics.
+			return (sourceType.hasUnresolvableGenerics() || targetType.hasUnresolvableGenerics() ?
+					ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType()) :
+					targetType.isAssignableFrom(sourceType));
+		}
+	}
+
 
 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
@@ -892,7 +902,6 @@ public abstract class BeanUtils {
 			}
 			return kotlinConstructor.callBy(argParameters);
 		}
-
 	}
 
 }

spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -129,7 +129,6 @@ public class DirectFieldAccessor extends AbstractNestablePropertyAccessor {
 				ReflectionUtils.makeAccessible(this.field);
 				return this.field.get(getWrappedInstance());
 			}
-
 			catch (IllegalAccessException ex) {
 				throw new InvalidPropertyException(getWrappedClass(),
 						this.field.getName(), "Field is not accessible", ex);

spring-context/src/main/java/org/springframework/context/annotation/Configuration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -104,8 +104,8 @@ import org.springframework.stereotype.Component;
  *
  * }</pre>
  *
- * <p>{@code @Configuration} classes may not only be bootstrapped using
- * component scanning, but may also themselves <em>configure</em> component scanning using
+ * <p>{@code @Configuration} classes may not only be bootstrapped using component
+ * scanning, but may also themselves <em>configure</em> component scanning using
  * the {@link ComponentScan @ComponentScan} annotation:
  *
  * <pre class="code">

spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java

@@ -137,31 +137,39 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		implements ConfigurableApplicationContext {
 
 	/**
-	 * Name of the MessageSource bean in the factory.
-	 * If none is supplied, message resolution is delegated to the parent.
-	 * @see MessageSource
-	 */
-	public static final String MESSAGE_SOURCE_BEAN_NAME = "messageSource";
-
-	/**
-	 * Name of the LifecycleProcessor bean in the factory.
-	 * If none is supplied, a DefaultLifecycleProcessor is used.
+	 * The name of the {@link LifecycleProcessor} bean in the context.
+	 * If none is supplied, a {@link DefaultLifecycleProcessor} is used.
+	 * @since 3.0
 	 * @see org.springframework.context.LifecycleProcessor
 	 * @see org.springframework.context.support.DefaultLifecycleProcessor
+	 * @see #start()
+	 * @see #stop()
 	 */
 	public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor";
 
 	/**
-	 * Name of the ApplicationEventMulticaster bean in the factory.
-	 * If none is supplied, a default SimpleApplicationEventMulticaster is used.
+	 * The name of the {@link MessageSource} bean in the context.
+	 * If none is supplied, message resolution is delegated to the parent.
+	 * @see org.springframework.context.MessageSource
+	 * @see org.springframework.context.support.ResourceBundleMessageSource
+	 * @see org.springframework.context.support.ReloadableResourceBundleMessageSource
+	 * @see #getMessage(MessageSourceResolvable, Locale)
+	 */
+	public static final String MESSAGE_SOURCE_BEAN_NAME = "messageSource";
+
+	/**
+	 * The name of the {@link ApplicationEventMulticaster} bean in the context.
+	 * If none is supplied, a {@link SimpleApplicationEventMulticaster} is used.
 	 * @see org.springframework.context.event.ApplicationEventMulticaster
 	 * @see org.springframework.context.event.SimpleApplicationEventMulticaster
+	 * @see #publishEvent(ApplicationEvent)
+	 * @see #addApplicationListener(ApplicationListener)
 	 */
 	public static final String APPLICATION_EVENT_MULTICASTER_BEAN_NAME = "applicationEventMulticaster";
 
 	/**
-	 * Boolean flag controlled by a {@code spring.spel.ignore} system property that instructs Spring to
-	 * ignore SpEL, i.e. to not initialize the SpEL infrastructure.
+	 * Boolean flag controlled by a {@code spring.spel.ignore} system property that
+	 * instructs Spring to ignore SpEL, i.e. to not initialize the SpEL infrastructure.
 	 * <p>The default is "false".
 	 */
 	private static final boolean shouldIgnoreSpel = SpringProperties.getFlag("spring.spel.ignore");
@@ -211,7 +219,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	private Thread shutdownHook;
 
 	/** ResourcePatternResolver used by this context. */
-	private ResourcePatternResolver resourcePatternResolver;
+	private final ResourcePatternResolver resourcePatternResolver;
 
 	/** LifecycleProcessor for managing the lifecycle of beans within this context. */
 	@Nullable

spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java

@@ -55,7 +55,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart
 		// override classes that have not been loaded yet. If not accessible, we will
 		// always override requested classes, even when the classes have been loaded
 		// by the parent ClassLoader already and cannot be transformed anymore anyway.
-		Method method = null;
+		Method method;
 		try {
 			method = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
 			ReflectionUtils.makeAccessible(method);
@@ -63,6 +63,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart
 		catch (Throwable ex) {
 			// Typically a JDK 9+ InaccessibleObjectException...
 			// Avoid through JVM startup with --add-opens=java.base/java.lang=ALL-UNNAMED
+			method = null;
 			LogFactory.getLog(ContextTypeMatchClassLoader.class).debug(
 					"ClassLoader.findLoadedClass not accessible -> will always override requested class", ex);
 		}

spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public class ProxyFactoryBeanTests {
 
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	public void setup() throws Exception {
 		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
 		parent.registerBeanDefinition("target2", new RootBeanDefinition(TestApplicationListener.class));
 		this.factory = new DefaultListableBeanFactory(parent);
@@ -139,22 +139,24 @@ public class ProxyFactoryBeanTests {
 	private void testDoubleTargetSourceIsRejected(String name) {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(DBL_TARGETSOURCE_CONTEXT, CLASS));
+
 		assertThatExceptionOfType(BeanCreationException.class).as("Should not allow TargetSource to be specified in interceptorNames as well as targetSource property")
-			.isThrownBy(() -> bf.getBean(name))
-			.havingCause()
-			.isInstanceOf(AopConfigException.class)
-			.withMessageContaining("TargetSource");
+				.isThrownBy(() -> bf.getBean(name))
+				.havingCause()
+				.isInstanceOf(AopConfigException.class)
+				.withMessageContaining("TargetSource");
 	}
 
 	@Test
 	public void testTargetSourceNotAtEndOfInterceptorNamesIsRejected() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(NOTLAST_TARGETSOURCE_CONTEXT, CLASS));
+
 		assertThatExceptionOfType(BeanCreationException.class).as("TargetSource or non-advised object must be last in interceptorNames")
-			.isThrownBy(() -> bf.getBean("targetSourceNotLast"))
-			.havingCause()
-			.isInstanceOf(AopConfigException.class)
-			.withMessageContaining("interceptorNames");
+				.isThrownBy(() -> bf.getBean("targetSourceNotLast"))
+				.havingCause()
+				.isInstanceOf(AopConfigException.class)
+				.withMessageContaining("interceptorNames");
 	}
 
 	@Test
@@ -167,11 +169,11 @@ public class ProxyFactoryBeanTests {
 		assertThat(cba.getCalls()).isEqualTo(0);
 
 		ITestBean tb = (ITestBean) bf.getBean("directTarget");
-		assertThat(tb.getName().equals("Adam")).isTrue();
+		assertThat(tb.getName()).isEqualTo("Adam");
 		assertThat(cba.getCalls()).isEqualTo(1);
 
 		ProxyFactoryBean pfb = (ProxyFactoryBean) bf.getBean("&directTarget");
-		assertThat(TestBean.class.isAssignableFrom(pfb.getObjectType())).as("Has correct object type").isTrue();
+		assertThat(pfb.getObjectType()).isAssignableTo(TestBean.class);
 	}
 
 	@Test
@@ -179,9 +181,9 @@ public class ProxyFactoryBeanTests {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
 		ITestBean tb = (ITestBean) bf.getBean("viaTargetSource");
-		assertThat(tb.getName().equals("Adam")).isTrue();
+		assertThat(tb.getName()).isEqualTo("Adam");
 		ProxyFactoryBean pfb = (ProxyFactoryBean) bf.getBean("&viaTargetSource");
-		assertThat(TestBean.class.isAssignableFrom(pfb.getObjectType())).as("Has correct object type").isTrue();
+		assertThat(pfb.getObjectType()).isAssignableTo(TestBean.class);
 	}
 
 	@Test
@@ -190,11 +192,15 @@ public class ProxyFactoryBeanTests {
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
 
 		ITestBean tb = (ITestBean) bf.getBean("noTarget");
-		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
-				tb.getName())
-			.withMessage("getName");
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(tb::getName).withMessage("getName");
 		FactoryBean<?> pfb = (ProxyFactoryBean) bf.getBean("&noTarget");
-		assertThat(ITestBean.class.isAssignableFrom(pfb.getObjectType())).as("Has correct object type").isTrue();
+		assertThat(pfb.getObjectType()).isAssignableTo(ITestBean.class);
+	}
+
+	@Test
+	public void testGetObjectTypeOnUninitializedFactoryBean() {
+		ProxyFactoryBean pfb = new ProxyFactoryBean();
+		assertThat(pfb.getObjectType()).isNull();
 	}
 
 	/**
@@ -219,20 +225,20 @@ public class ProxyFactoryBeanTests {
 		pc1.addAdvice(1, di);
 		assertThat(pc2.getAdvisors()).isEqualTo(pc1.getAdvisors());
 		assertThat(pc2.getAdvisors().length).as("Now have one more advisor").isEqualTo((oldLength + 1));
-		assertThat(0).isEqualTo(di.getCount());
+		assertThat(di.getCount()).isEqualTo(0);
 		test1.setAge(5);
 		assertThat(test1.getAge()).isEqualTo(test1_1.getAge());
-		assertThat(3).isEqualTo(di.getCount());
+		assertThat(di.getCount()).isEqualTo(3);
 	}
 
 	@Test
 	public void testPrototypeInstancesAreNotEqual() {
-		assertThat(ITestBean.class.isAssignableFrom(factory.getType("prototype"))).as("Has correct object type").isTrue();
+		assertThat(factory.getType("prototype")).isAssignableTo(ITestBean.class);
 		ITestBean test2 = (ITestBean) factory.getBean("prototype");
 		ITestBean test2_1 = (ITestBean) factory.getBean("prototype");
-		assertThat(test2 != test2_1).as("Prototype instances !=").isTrue();
-		assertThat(test2.equals(test2_1)).as("Prototype instances equal").isTrue();
-		assertThat(ITestBean.class.isAssignableFrom(factory.getType("prototype"))).as("Has correct object type").isTrue();
+		assertThat(test2).as("Prototype instances !=").isNotSameAs(test2_1);
+		assertThat(test2).as("Prototype instances equal").isEqualTo(test2_1);
+		assertThat(factory.getType("prototype")).isAssignableTo(ITestBean.class);
 	}
 
 	/**
@@ -262,7 +268,7 @@ public class ProxyFactoryBeanTests {
 		assertThat(prototype2FirstInstance.getCount()).isEqualTo(INITIAL_COUNT + 1);
 
 		SideEffectBean prototype2SecondInstance = (SideEffectBean) bf.getBean(beanName);
-		assertThat(prototype2FirstInstance == prototype2SecondInstance).as("Prototypes are not ==").isFalse();
+		assertThat(prototype2FirstInstance).as("Prototypes are not ==").isNotSameAs(prototype2SecondInstance);
 		assertThat(prototype2SecondInstance.getCount()).isEqualTo(INITIAL_COUNT);
 		assertThat(prototype2FirstInstance.getCount()).isEqualTo(INITIAL_COUNT + 1);
 
@@ -285,19 +291,19 @@ public class ProxyFactoryBeanTests {
 		TestBean target = (TestBean) factory.getBean("test");
 		target.setName(name);
 		ITestBean autoInvoker = (ITestBean) factory.getBean("autoInvoker");
-		assertThat(autoInvoker.getName().equals(name)).isTrue();
+		assertThat(autoInvoker.getName()).isEqualTo(name);
 	}
 
 	@Test
 	public void testCanGetFactoryReferenceAndManipulate() {
 		ProxyFactoryBean config = (ProxyFactoryBean) factory.getBean("&test1");
-		assertThat(ITestBean.class.isAssignableFrom(config.getObjectType())).as("Has correct object type").isTrue();
-		assertThat(ITestBean.class.isAssignableFrom(factory.getType("test1"))).as("Has correct object type").isTrue();
+		assertThat(config.getObjectType()).isAssignableTo(ITestBean.class);
+		assertThat(factory.getType("test1")).isAssignableTo(ITestBean.class);
 		// Trigger lazy initialization.
 		config.getObject();
 		assertThat(config.getAdvisors().length).as("Have one advisors").isEqualTo(1);
-		assertThat(ITestBean.class.isAssignableFrom(config.getObjectType())).as("Has correct object type").isTrue();
-		assertThat(ITestBean.class.isAssignableFrom(factory.getType("test1"))).as("Has correct object type").isTrue();
+		assertThat(config.getObjectType()).isAssignableTo(ITestBean.class);
+		assertThat(factory.getType("test1")).isAssignableTo(ITestBean.class);
 
 		ITestBean tb = (ITestBean) factory.getBean("test1");
 		// no exception
@@ -308,7 +314,7 @@ public class ProxyFactoryBeanTests {
 		config.addAdvice(0, (MethodInterceptor) invocation -> {
 			throw ex;
 		});
-		assertThat(config.getAdvisors().length).as("Have correct advisor count").isEqualTo(2);
+		assertThat(config.getAdvisors()).as("Have correct advisor count").hasSize(2);
 
 		ITestBean tb1 = (ITestBean) factory.getBean("test1");
 		assertThatException()
@@ -348,31 +354,31 @@ public class ProxyFactoryBeanTests {
 		// Add to head of interceptor chain
 		int oldCount = config.getAdvisors().length;
 		config.addAdvisor(0, new DefaultIntroductionAdvisor(ti, TimeStamped.class));
-		assertThat(config.getAdvisors().length == oldCount + 1).isTrue();
+		assertThat(config.getAdvisors()).hasSize(oldCount + 1);
 
 		TimeStamped ts = (TimeStamped) factory.getBean("test2");
 		assertThat(ts.getTimeStamp()).isEqualTo(time);
 
 		// Can remove
 		config.removeAdvice(ti);
-		assertThat(config.getAdvisors().length == oldCount).isTrue();
+		assertThat(config.getAdvisors()).hasSize(oldCount);
 
 		// Check no change on existing object reference
-		assertThat(ts.getTimeStamp() == time).isTrue();
+		assertThat(ts.getTimeStamp()).isEqualTo(time);
 
 		assertThat(factory.getBean("test2")).as("Should no longer implement TimeStamped")
 				.isNotInstanceOf(TimeStamped.class);
 
 		// Now check non-effect of removing interceptor that isn't there
 		config.removeAdvice(new DebugInterceptor());
-		assertThat(config.getAdvisors().length == oldCount).isTrue();
+		assertThat(config.getAdvisors()).hasSize(oldCount);
 
 		ITestBean it = (ITestBean) ts;
 		DebugInterceptor debugInterceptor = new DebugInterceptor();
 		config.addAdvice(0, debugInterceptor);
 		it.getSpouse();
 		// Won't affect existing reference
-		assertThat(debugInterceptor.getCount() == 0).isTrue();
+		assertThat(debugInterceptor.getCount()).isEqualTo(0);
 		it = (ITestBean) factory.getBean("test2");
 		it.getSpouse();
 		assertThat(debugInterceptor.getCount()).isEqualTo(1);
@@ -412,16 +418,16 @@ public class ProxyFactoryBeanTests {
 	public void testMethodPointcuts() {
 		ITestBean tb = (ITestBean) factory.getBean("pointcuts");
 		PointcutForVoid.reset();
-		assertThat(PointcutForVoid.methodNames.isEmpty()).as("No methods intercepted").isTrue();
+		assertThat(PointcutForVoid.methodNames).as("No methods intercepted").isEmpty();
 		tb.getAge();
-		assertThat(PointcutForVoid.methodNames.isEmpty()).as("Not void: shouldn't have intercepted").isTrue();
+		assertThat(PointcutForVoid.methodNames).as("Not void: shouldn't have intercepted").isEmpty();
 		tb.setAge(1);
 		tb.getAge();
 		tb.setName("Tristan");
 		tb.toString();
-		assertThat(PointcutForVoid.methodNames.size()).as("Recorded wrong number of invocations").isEqualTo(2);
-		assertThat(PointcutForVoid.methodNames.get(0).equals("setAge")).isTrue();
-		assertThat(PointcutForVoid.methodNames.get(1).equals("setName")).isTrue();
+		assertThat(PointcutForVoid.methodNames).as("Recorded wrong number of invocations").hasSize(2);
+		assertThat(PointcutForVoid.methodNames.get(0)).isEqualTo("setAge");
+		assertThat(PointcutForVoid.methodNames.get(1)).isEqualTo("setName");
 	}
 
 	@Test
@@ -498,17 +504,17 @@ public class ProxyFactoryBeanTests {
 	@Test
 	public void testGlobalsCanAddAspectInterfaces() {
 		AddedGlobalInterface agi = (AddedGlobalInterface) factory.getBean("autoInvoker");
-		assertThat(agi.globalsAdded() == -1).isTrue();
+		assertThat(agi.globalsAdded()).isEqualTo(-1);
 
 		ProxyFactoryBean pfb = (ProxyFactoryBean) factory.getBean("&validGlobals");
 		// Trigger lazy initialization.
 		pfb.getObject();
 		// 2 globals + 2 explicit
-		assertThat(pfb.getAdvisors().length).as("Have 2 globals and 2 explicit advisors").isEqualTo(3);
+		assertThat(pfb.getAdvisors()).as("Have 2 globals and 2 explicit advisors").hasSize(3);
 
 		ApplicationListener<?> l = (ApplicationListener<?>) factory.getBean("validGlobals");
 		agi = (AddedGlobalInterface) l;
-		assertThat(agi.globalsAdded() == -1).isTrue();
+		assertThat(agi.globalsAdded()).isEqualTo(-1);
 
 		assertThat(factory.getBean("test1")).as("Aspect interface shouldn't be implemented without globals")
 				.isNotInstanceOf(AddedGlobalInterface.class);
@@ -709,6 +715,7 @@ public class ProxyFactoryBeanTests {
 		}
 	}
 
+
 	/**
 	 * Aspect interface
 	 */

spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -215,7 +215,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 		bf.registerBeanDefinition("testBean4", tbd);
 
 		bf.registerResolvableDependency(BeanFactory.class, bf);
-		bf.registerResolvableDependency(INestedTestBean.class, (ObjectFactory<Object>) () -> new NestedTestBean());
+		bf.registerResolvableDependency(INestedTestBean.class, (ObjectFactory<Object>) NestedTestBean::new);
 
 		@SuppressWarnings("deprecation")
 		org.springframework.beans.factory.config.PropertyPlaceholderConfigurer ppc = new org.springframework.beans.factory.config.PropertyPlaceholderConfigurer();
@@ -233,7 +233,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 		assertThat(tb).isNotSameAs(anotherBean.getTestBean6());
 
 		String[] depBeans = bf.getDependenciesForBean("annotatedBean");
-		assertThat(depBeans.length).isEqualTo(1);
+		assertThat(depBeans).hasSize(1);
 		assertThat(depBeans[0]).isEqualTo("testBean4");
 	}
 
@@ -508,6 +508,25 @@ public class CommonAnnotationBeanPostProcessorTests {
 		assertThat(tb.getName()).isEqualTo("notLazyAnymore");
 	}
 
+	@Test
+	public void testLazyResolutionWithFallbackTypeMatch() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		bf.setAutowireCandidateResolver(new ContextAnnotationAutowireCandidateResolver());
+		CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
+		bpp.setBeanFactory(bf);
+		bf.addBeanPostProcessor(bpp);
+
+		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(LazyResourceCglibInjectionBean.class));
+		bf.registerBeanDefinition("tb", new RootBeanDefinition(TestBean.class));
+
+		LazyResourceCglibInjectionBean bean = (LazyResourceCglibInjectionBean) bf.getBean("annotatedBean");
+		assertThat(bf.containsSingleton("tb")).isFalse();
+		bean.testBean.setName("notLazyAnymore");
+		assertThat(bf.containsSingleton("tb")).isTrue();
+		TestBean tb = (TestBean) bf.getBean("tb");
+		assertThat(tb.getName()).isEqualTo("notLazyAnymore");
+	}
+
 
 	public static class AnnotatedInitDestroyBean {
 

spring-context/src/test/java/org/springframework/context/event/AbstractApplicationEventListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,10 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+	protected <T> GenericTestEvent<T> createGenericTestEvent(T payload) {
+		return new GenericTestEvent<>(this, payload);
+	}
+
 
 	protected static class GenericTestEvent<T> extends ApplicationEvent {
 
@@ -51,6 +55,7 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+
 	protected static class SmartGenericTestEvent<T> extends GenericTestEvent<T> implements ResolvableTypeProvider {
 
 		private final ResolvableType resolvableType;
@@ -67,6 +72,7 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+
 	protected static class StringEvent extends GenericTestEvent<String> {
 
 		public StringEvent(Object source, String payload) {
@@ -74,6 +80,7 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+
 	protected static class LongEvent extends GenericTestEvent<Long> {
 
 		public LongEvent(Object source, Long payload) {
@@ -81,31 +88,31 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
-	protected <T> GenericTestEvent<T> createGenericTestEvent(T payload) {
-		return new GenericTestEvent<>(this, payload);
-	}
-
 
 	static class GenericEventListener implements ApplicationListener<GenericTestEvent<?>> {
+
 		@Override
 		public void onApplicationEvent(GenericTestEvent<?> event) {
 		}
 	}
 
+
 	static class ObjectEventListener implements ApplicationListener<GenericTestEvent<Object>> {
+
 		@Override
 		public void onApplicationEvent(GenericTestEvent<Object> event) {
 		}
 	}
 
-	static class UpperBoundEventListener
-			implements ApplicationListener<GenericTestEvent<? extends RuntimeException>> {
+
+	static class UpperBoundEventListener implements ApplicationListener<GenericTestEvent<? extends RuntimeException>> {
 
 		@Override
 		public void onApplicationEvent(GenericTestEvent<? extends RuntimeException> event) {
 		}
 	}
 
+
 	static class StringEventListener implements ApplicationListener<GenericTestEvent<String>> {
 
 		@Override
@@ -113,6 +120,7 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+
 	@SuppressWarnings("rawtypes")
 	static class RawApplicationListener implements ApplicationListener {
 
@@ -121,10 +129,10 @@ public abstract class AbstractApplicationEventListenerTests {
 		}
 	}
 
+
 	static class TestEvents {
 
 		public GenericTestEvent<?> wildcardEvent;
-
 	}
 
 }

spring-context/src/test/java/org/springframework/context/event/GenericApplicationListenerAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -104,7 +104,8 @@ public class GenericApplicationListenerAdapterTests extends AbstractApplicationE
 
 	@Test
 	public void genericListenerStrictTypeSubClass() {
-		supportsEventType(false, ObjectEventListener.class, ResolvableType.forClassWithGenerics(GenericTestEvent.class, Long.class));
+		supportsEventType(false, ObjectEventListener.class,
+				ResolvableType.forClassWithGenerics(GenericTestEvent.class, Long.class));
 	}
 
 	@Test

spring-core/src/main/java/org/springframework/cglib/beans/BeanCopier.java

@@ -16,12 +16,24 @@
 package org.springframework.cglib.beans;
 
 import java.beans.PropertyDescriptor;
-import java.lang.reflect.*;
 import java.security.ProtectionDomain;
-import org.springframework.cglib.core.*;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
-import java.util.*;
+import org.springframework.cglib.core.AbstractClassGenerator;
+import org.springframework.cglib.core.ClassEmitter;
+import org.springframework.cglib.core.CodeEmitter;
+import org.springframework.cglib.core.Constants;
+import org.springframework.cglib.core.Converter;
+import org.springframework.cglib.core.EmitUtils;
+import org.springframework.cglib.core.KeyFactory;
+import org.springframework.cglib.core.Local;
+import org.springframework.cglib.core.MethodInfo;
+import org.springframework.cglib.core.ReflectUtils;
+import org.springframework.cglib.core.Signature;
+import org.springframework.cglib.core.TypeUtils;
 
 /**
  * @author Chris Nokleberg
@@ -29,151 +41,154 @@ import java.util.*;
 @SuppressWarnings({"rawtypes", "unchecked"})
 abstract public class BeanCopier
 {
-    private static final BeanCopierKey KEY_FACTORY =
-      (BeanCopierKey)KeyFactory.create(BeanCopierKey.class);
-    private static final Type CONVERTER =
-      TypeUtils.parseType("org.springframework.cglib.core.Converter");
-    private static final Type BEAN_COPIER =
-      TypeUtils.parseType("org.springframework.cglib.beans.BeanCopier");
-    private static final Signature COPY =
-      new Signature("copy", Type.VOID_TYPE, new Type[]{ Constants.TYPE_OBJECT, Constants.TYPE_OBJECT, CONVERTER });
-    private static final Signature CONVERT =
-      TypeUtils.parseSignature("Object convert(Object, Class, Object)");
-    
-    interface BeanCopierKey {
-        public Object newInstance(String source, String target, boolean useConverter);
-    }
+	private static final BeanCopierKey KEY_FACTORY =
+	  (BeanCopierKey)KeyFactory.create(BeanCopierKey.class);
+	private static final Type CONVERTER =
+	  TypeUtils.parseType("org.springframework.cglib.core.Converter");
+	private static final Type BEAN_COPIER =
+	  TypeUtils.parseType("org.springframework.cglib.beans.BeanCopier");
+	private static final Signature COPY =
+	  new Signature("copy", Type.VOID_TYPE, new Type[]{ Constants.TYPE_OBJECT, Constants.TYPE_OBJECT, CONVERTER });
+	private static final Signature CONVERT =
+	  TypeUtils.parseSignature("Object convert(Object, Class, Object)");
 
-    public static BeanCopier create(Class source, Class target, boolean useConverter) {
-        Generator gen = new Generator();
-        gen.setSource(source);
-        gen.setTarget(target);
-        gen.setUseConverter(useConverter);
-        return gen.create();
-    }
+	interface BeanCopierKey {
+		public Object newInstance(String source, String target, boolean useConverter);
+	}
 
-    abstract public void copy(Object from, Object to, Converter converter);
+	public static BeanCopier create(Class source, Class target, boolean useConverter) {
+		Generator gen = new Generator();
+		gen.setSource(source);
+		gen.setTarget(target);
+		gen.setUseConverter(useConverter);
+		return gen.create();
+	}
 
-    public static class Generator extends AbstractClassGenerator {
-        private static final Source SOURCE = new Source(BeanCopier.class.getName());
-        private Class source;
-        private Class target;
-        private boolean useConverter;
+	abstract public void copy(Object from, Object to, Converter converter);
 
-        public Generator() {
-            super(SOURCE);
-        }
+	public static class Generator extends AbstractClassGenerator {
+		private static final Source SOURCE = new Source(BeanCopier.class.getName());
+		private Class source;
+		private Class target;
+		private boolean useConverter;
 
-        public void setSource(Class source) {
-            if(!Modifier.isPublic(source.getModifiers())){ 
-               setNamePrefix(source.getName());
-            }
-            this.source = source;
-        }
-        
-        public void setTarget(Class target) {
-            if(!Modifier.isPublic(target.getModifiers())){ 
-               setNamePrefix(target.getName());
-            }
-            this.target = target;
+		public Generator() {
+			super(SOURCE);
+		}
+
+		public void setSource(Class source) {
+			this.source = source;
+			// SPRING PATCH BEGIN
+			setContextClass(source);
+			setNamePrefix(source.getName());
+			// SPRING PATCH END
+		}
+
+		public void setTarget(Class target) {
+			this.target = target;
 			// SPRING PATCH BEGIN
 			setContextClass(target);
+			setNamePrefix(target.getName());
 			// SPRING PATCH END
-        }
+		}
 
-        public void setUseConverter(boolean useConverter) {
-            this.useConverter = useConverter;
-        }
+		public void setUseConverter(boolean useConverter) {
+			this.useConverter = useConverter;
+		}
 
-        protected ClassLoader getDefaultClassLoader() {
-            return source.getClassLoader();
-        }
+		@Override
+		protected ClassLoader getDefaultClassLoader() {
+			return source.getClassLoader();
+		}
 
-        protected ProtectionDomain getProtectionDomain() {
-        	return ReflectUtils.getProtectionDomain(source);
-        }
+		@Override
+		protected ProtectionDomain getProtectionDomain() {
+			return ReflectUtils.getProtectionDomain(source);
+		}
 
-        public BeanCopier create() {
-            Object key = KEY_FACTORY.newInstance(source.getName(), target.getName(), useConverter);
-            return (BeanCopier)super.create(key);
-        }
+		public BeanCopier create() {
+			Object key = KEY_FACTORY.newInstance(source.getName(), target.getName(), useConverter);
+			return (BeanCopier)super.create(key);
+		}
 
-        public void generateClass(ClassVisitor v) {
-            Type sourceType = Type.getType(source);
-            Type targetType = Type.getType(target);
-            ClassEmitter ce = new ClassEmitter(v);
-            ce.begin_class(Constants.V1_8,
-                           Constants.ACC_PUBLIC,
-                           getClassName(),
-                           BEAN_COPIER,
-                           null,
-                           Constants.SOURCE_FILE);
+		@Override
+		public void generateClass(ClassVisitor v) {
+			Type sourceType = Type.getType(source);
+			Type targetType = Type.getType(target);
+			ClassEmitter ce = new ClassEmitter(v);
+			ce.begin_class(Constants.V1_8,
+						   Constants.ACC_PUBLIC,
+						   getClassName(),
+						   BEAN_COPIER,
+						   null,
+						   Constants.SOURCE_FILE);
 
-            EmitUtils.null_constructor(ce);
-            CodeEmitter e = ce.begin_method(Constants.ACC_PUBLIC, COPY, null);
-            PropertyDescriptor[] getters = ReflectUtils.getBeanGetters(source);
-            PropertyDescriptor[] setters = ReflectUtils.getBeanSetters(target);
+			EmitUtils.null_constructor(ce);
+			CodeEmitter e = ce.begin_method(Constants.ACC_PUBLIC, COPY, null);
+			PropertyDescriptor[] getters = ReflectUtils.getBeanGetters(source);
+			PropertyDescriptor[] setters = ReflectUtils.getBeanSetters(target);
 
-            Map names = new HashMap();
-            for (int i = 0; i < getters.length; i++) {
-                names.put(getters[i].getName(), getters[i]);
-            }
-            Local targetLocal = e.make_local();
-            Local sourceLocal = e.make_local();
-            if (useConverter) {
-                e.load_arg(1);
-                e.checkcast(targetType);
-                e.store_local(targetLocal);
-                e.load_arg(0);                
-                e.checkcast(sourceType);
-                e.store_local(sourceLocal);
-            } else {
-                e.load_arg(1);
-                e.checkcast(targetType);
-                e.load_arg(0);
-                e.checkcast(sourceType);
-            }
-            for (int i = 0; i < setters.length; i++) {
-                PropertyDescriptor setter = setters[i];
-                PropertyDescriptor getter = (PropertyDescriptor)names.get(setter.getName());
-                if (getter != null) {
-                    MethodInfo read = ReflectUtils.getMethodInfo(getter.getReadMethod());
-                    MethodInfo write = ReflectUtils.getMethodInfo(setter.getWriteMethod());
-                    if (useConverter) {
-                        Type setterType = write.getSignature().getArgumentTypes()[0];
-                        e.load_local(targetLocal);
-                        e.load_arg(2);
-                        e.load_local(sourceLocal);
-                        e.invoke(read);
-                        e.box(read.getSignature().getReturnType());
-                        EmitUtils.load_class(e, setterType);
-                        e.push(write.getSignature().getName());
-                        e.invoke_interface(CONVERTER, CONVERT);
-                        e.unbox_or_zero(setterType);
-                        e.invoke(write);
-                    } else if (compatible(getter, setter)) {
-                        e.dup2();
-                        e.invoke(read);
-                        e.invoke(write);
-                    }
-                }
-            }
-            e.return_value();
-            e.end_method();
-            ce.end_class();
-        }
+			Map names = new HashMap();
+			for (PropertyDescriptor getter : getters) {
+				names.put(getter.getName(), getter);
+			}
+			Local targetLocal = e.make_local();
+			Local sourceLocal = e.make_local();
+			if (useConverter) {
+				e.load_arg(1);
+				e.checkcast(targetType);
+				e.store_local(targetLocal);
+				e.load_arg(0);
+				e.checkcast(sourceType);
+				e.store_local(sourceLocal);
+			} else {
+				e.load_arg(1);
+				e.checkcast(targetType);
+				e.load_arg(0);
+				e.checkcast(sourceType);
+			}
+			for (PropertyDescriptor setter : setters) {
+				PropertyDescriptor getter = (PropertyDescriptor)names.get(setter.getName());
+				if (getter != null) {
+					MethodInfo read = ReflectUtils.getMethodInfo(getter.getReadMethod());
+					MethodInfo write = ReflectUtils.getMethodInfo(setter.getWriteMethod());
+					if (useConverter) {
+						Type setterType = write.getSignature().getArgumentTypes()[0];
+						e.load_local(targetLocal);
+						e.load_arg(2);
+						e.load_local(sourceLocal);
+						e.invoke(read);
+						e.box(read.getSignature().getReturnType());
+						EmitUtils.load_class(e, setterType);
+						e.push(write.getSignature().getName());
+						e.invoke_interface(CONVERTER, CONVERT);
+						e.unbox_or_zero(setterType);
+						e.invoke(write);
+					} else if (compatible(getter, setter)) {
+						e.dup2();
+						e.invoke(read);
+						e.invoke(write);
+					}
+				}
+			}
+			e.return_value();
+			e.end_method();
+			ce.end_class();
+		}
 
-        private static boolean compatible(PropertyDescriptor getter, PropertyDescriptor setter) {
-            // TODO: allow automatic widening conversions?
-            return setter.getPropertyType().isAssignableFrom(getter.getPropertyType());
-        }
+		private static boolean compatible(PropertyDescriptor getter, PropertyDescriptor setter) {
+			// TODO: allow automatic widening conversions?
+			return setter.getPropertyType().isAssignableFrom(getter.getPropertyType());
+		}
 
-        protected Object firstInstance(Class type) {
-            return ReflectUtils.newInstance(type);
-        }
+		@Override
+		protected Object firstInstance(Class type) {
+			return ReflectUtils.newInstance(type);
+		}
 
-        protected Object nextInstance(Object instance) {
-            return instance;
-        }
-    }
+		@Override
+		protected Object nextInstance(Object instance) {
+			return instance;
+		}
+	}
 }

spring-core/src/main/java/org/springframework/cglib/beans/BeanGenerator.java

@@ -17,10 +17,18 @@ package org.springframework.cglib.beans;
 
 import java.beans.PropertyDescriptor;
 import java.security.ProtectionDomain;
-import java.util.*;
-import org.springframework.cglib.core.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
+import org.springframework.cglib.core.AbstractClassGenerator;
+import org.springframework.cglib.core.ClassEmitter;
+import org.springframework.cglib.core.Constants;
+import org.springframework.cglib.core.EmitUtils;
+import org.springframework.cglib.core.KeyFactory;
+import org.springframework.cglib.core.ReflectUtils;
 
 /**
  * @author Juozas Baliuka, Chris Nokleberg
@@ -28,126 +36,131 @@ import org.springframework.asm.Type;
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class BeanGenerator extends AbstractClassGenerator
 {
-    private static final Source SOURCE = new Source(BeanGenerator.class.getName());
-    private static final BeanGeneratorKey KEY_FACTORY =
-      (BeanGeneratorKey)KeyFactory.create(BeanGeneratorKey.class);
-    
-    interface BeanGeneratorKey {
-        public Object newInstance(String superclass, Map props);
-    }
+	private static final Source SOURCE = new Source(BeanGenerator.class.getName());
+	private static final BeanGeneratorKey KEY_FACTORY =
+	  (BeanGeneratorKey)KeyFactory.create(BeanGeneratorKey.class);
 
-    private Class superclass;
-    private Map props = new HashMap();
-    private boolean classOnly;
+	interface BeanGeneratorKey {
+		public Object newInstance(String superclass, Map props);
+	}
 
-    public BeanGenerator() {
-        super(SOURCE);
-    }
+	private Class superclass;
+	private Map props = new HashMap();
+	private boolean classOnly;
 
-    /**
-     * Set the class which the generated class will extend. The class
-     * must not be declared as final, and must have a non-private
-     * no-argument constructor.
-     * @param superclass class to extend, or null to extend Object
-     */
-    public void setSuperclass(Class superclass) {
-        if (superclass != null && superclass.equals(Object.class)) {
-            superclass = null;
-        }
-        this.superclass = superclass;
+	public BeanGenerator() {
+		super(SOURCE);
+	}
+
+	/**
+	 * Set the class which the generated class will extend. The class
+	 * must not be declared as final, and must have a non-private
+	 * no-argument constructor.
+	 * @param superclass class to extend, or null to extend Object
+	 */
+	public void setSuperclass(Class superclass) {
+		if (superclass != null && superclass.equals(Object.class)) {
+			superclass = null;
+		}
+		this.superclass = superclass;
 		// SPRING PATCH BEGIN
 		setContextClass(superclass);
 		// SPRING PATCH END
-    }
+	}
 
-    public void addProperty(String name, Class type) {
-        if (props.containsKey(name)) {
-            throw new IllegalArgumentException("Duplicate property name \"" + name + "\"");
-        }
-        props.put(name, Type.getType(type));
-    }
+	public void addProperty(String name, Class type) {
+		if (props.containsKey(name)) {
+			throw new IllegalArgumentException("Duplicate property name \"" + name + "\"");
+		}
+		props.put(name, Type.getType(type));
+	}
 
-    protected ClassLoader getDefaultClassLoader() {
-        if (superclass != null) {
-            return superclass.getClassLoader();
-        } else {
-            return null;
-        }
-    }
+	@Override
+	protected ClassLoader getDefaultClassLoader() {
+		if (superclass != null) {
+			return superclass.getClassLoader();
+		} else {
+			return null;
+		}
+	}
 
-    protected ProtectionDomain getProtectionDomain() {
-        return ReflectUtils.getProtectionDomain(superclass);
-    }
+	@Override
+	protected ProtectionDomain getProtectionDomain() {
+		return ReflectUtils.getProtectionDomain(superclass);
+	}
 
-    public Object create() {
-        classOnly = false;
-        return createHelper();
-    }
+	public Object create() {
+		classOnly = false;
+		return createHelper();
+	}
 
-    public Object createClass() {
-        classOnly = true;
-        return createHelper();
-    }
+	public Object createClass() {
+		classOnly = true;
+		return createHelper();
+	}
 
-    private Object createHelper() {
-        if (superclass != null) {
-            setNamePrefix(superclass.getName());
-        }
-        String superName = (superclass != null) ? superclass.getName() : "java.lang.Object";
-        Object key = KEY_FACTORY.newInstance(superName, props);
-        return super.create(key);
-    }
+	private Object createHelper() {
+		if (superclass != null) {
+			setNamePrefix(superclass.getName());
+		}
+		String superName = (superclass != null) ? superclass.getName() : "java.lang.Object";
+		Object key = KEY_FACTORY.newInstance(superName, props);
+		return super.create(key);
+	}
 
-    public void generateClass(ClassVisitor v) throws Exception {
-        int size = props.size();
-        String[] names = (String[])props.keySet().toArray(new String[size]);
-        Type[] types = new Type[size];
-        for (int i = 0; i < size; i++) {
-            types[i] = (Type)props.get(names[i]);
-        }
-        ClassEmitter ce = new ClassEmitter(v);
-        ce.begin_class(Constants.V1_8,
-                       Constants.ACC_PUBLIC,
-                       getClassName(),
-                       superclass != null ? Type.getType(superclass) : Constants.TYPE_OBJECT,
-                       null,
-                       null);
-        EmitUtils.null_constructor(ce);
-        EmitUtils.add_properties(ce, names, types);
-        ce.end_class();
-    }
+	@Override
+	public void generateClass(ClassVisitor v) throws Exception {
+		int size = props.size();
+		String[] names = (String[])props.keySet().toArray(new String[size]);
+		Type[] types = new Type[size];
+		for (int i = 0; i < size; i++) {
+			types[i] = (Type)props.get(names[i]);
+		}
+		ClassEmitter ce = new ClassEmitter(v);
+		ce.begin_class(Constants.V1_8,
+					   Constants.ACC_PUBLIC,
+					   getClassName(),
+					   superclass != null ? Type.getType(superclass) : Constants.TYPE_OBJECT,
+					   null,
+					   null);
+		EmitUtils.null_constructor(ce);
+		EmitUtils.add_properties(ce, names, types);
+		ce.end_class();
+	}
 
-    protected Object firstInstance(Class type) {
-        if (classOnly) {
-            return type;
-        } else {
-            return ReflectUtils.newInstance(type);
-        }
-    }
+	@Override
+	protected Object firstInstance(Class type) {
+		if (classOnly) {
+			return type;
+		} else {
+			return ReflectUtils.newInstance(type);
+		}
+	}
 
-    protected Object nextInstance(Object instance) {
-        Class protoclass = (instance instanceof Class) ? (Class)instance : instance.getClass();
-        if (classOnly) {
-            return protoclass;
-        } else {
-            return ReflectUtils.newInstance(protoclass);
-        }
-    }
+	@Override
+	protected Object nextInstance(Object instance) {
+		Class protoclass = (instance instanceof Class) ? (Class)instance : instance.getClass();
+		if (classOnly) {
+			return protoclass;
+		} else {
+			return ReflectUtils.newInstance(protoclass);
+		}
+	}
 
-    public static void addProperties(BeanGenerator gen, Map props) {
-        for (Iterator it = props.keySet().iterator(); it.hasNext();) {
-            String name = (String)it.next();
-            gen.addProperty(name, (Class)props.get(name));
-        }
-    }
+	public static void addProperties(BeanGenerator gen, Map props) {
+		for (Iterator it = props.keySet().iterator(); it.hasNext();) {
+			String name = (String)it.next();
+			gen.addProperty(name, (Class)props.get(name));
+		}
+	}
 
-    public static void addProperties(BeanGenerator gen, Class type) {
-        addProperties(gen, ReflectUtils.getBeanProperties(type));
-    }
+	public static void addProperties(BeanGenerator gen, Class type) {
+		addProperties(gen, ReflectUtils.getBeanProperties(type));
+	}
 
-    public static void addProperties(BeanGenerator gen, PropertyDescriptor[] descriptors) {
-        for (int i = 0; i < descriptors.length; i++) {
-            gen.addProperty(descriptors[i].getName(), descriptors[i].getPropertyType());
-        }
-    }
+	public static void addProperties(BeanGenerator gen, PropertyDescriptor[] descriptors) {
+		for (PropertyDescriptor descriptor : descriptors) {
+			gen.addProperty(descriptor.getName(), descriptor.getPropertyType());
+		}
+	}
 }

spring-core/src/main/java/org/springframework/cglib/beans/BeanMap.java

@@ -41,293 +41,310 @@ import org.springframework.cglib.core.ReflectUtils;
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 abstract public class BeanMap implements Map {
-    /**
-     * Limit the properties reflected in the key set of the map
-     * to readable properties.
-     * @see BeanMap.Generator#setRequire
-     */
-    public static final int REQUIRE_GETTER = 1;
+	/**
+	 * Limit the properties reflected in the key set of the map
+	 * to readable properties.
+	 * @see BeanMap.Generator#setRequire
+	 */
+	public static final int REQUIRE_GETTER = 1;
 
-    /**
-     * Limit the properties reflected in the key set of the map
-     * to writable properties.
-     * @see BeanMap.Generator#setRequire
-     */
-    public static final int REQUIRE_SETTER = 2;
-    
-    /**
-     * Helper method to create a new <code>BeanMap</code>.  For finer
-     * control over the generated instance, use a new instance of
-     * <code>BeanMap.Generator</code> instead of this static method.
-     * @param bean the JavaBean underlying the map
-     * @return a new <code>BeanMap</code> instance
-     */
-    public static BeanMap create(Object bean) {
-        Generator gen = new Generator();
-        gen.setBean(bean);
-        return gen.create();
-    }
+	/**
+	 * Limit the properties reflected in the key set of the map
+	 * to writable properties.
+	 * @see BeanMap.Generator#setRequire
+	 */
+	public static final int REQUIRE_SETTER = 2;
 
-    public static class Generator extends AbstractClassGenerator {
-        private static final Source SOURCE = new Source(BeanMap.class.getName());
+	/**
+	 * Helper method to create a new <code>BeanMap</code>.  For finer
+	 * control over the generated instance, use a new instance of
+	 * <code>BeanMap.Generator</code> instead of this static method.
+	 * @param bean the JavaBean underlying the map
+	 * @return a new <code>BeanMap</code> instance
+	 */
+	public static BeanMap create(Object bean) {
+		Generator gen = new Generator();
+		gen.setBean(bean);
+		return gen.create();
+	}
 
-        private static final BeanMapKey KEY_FACTORY =
-          (BeanMapKey)KeyFactory.create(BeanMapKey.class, KeyFactory.CLASS_BY_NAME);
+	public static class Generator extends AbstractClassGenerator {
+		private static final Source SOURCE = new Source(BeanMap.class.getName());
 
-        interface BeanMapKey {
-            public Object newInstance(Class type, int require);
-        }
-        
-        private Object bean;
-        private Class beanClass;
-        private int require;
-        
-        public Generator() {
-            super(SOURCE);
-        }
+		private static final BeanMapKey KEY_FACTORY =
+		  (BeanMapKey)KeyFactory.create(BeanMapKey.class, KeyFactory.CLASS_BY_NAME);
 
-        /**
-         * Set the bean that the generated map should reflect. The bean may be swapped
-         * out for another bean of the same type using {@link #setBean}.
-         * Calling this method overrides any value previously set using {@link #setBeanClass}.
-         * You must call either this method or {@link #setBeanClass} before {@link #create}.
-         * @param bean the initial bean
-         */
-        public void setBean(Object bean) {
-            this.bean = bean;
-            if (bean != null) {
+		interface BeanMapKey {
+			public Object newInstance(Class type, int require);
+		}
+
+		private Object bean;
+		private Class beanClass;
+		private int require;
+
+		public Generator() {
+			super(SOURCE);
+		}
+
+		/**
+		 * Set the bean that the generated map should reflect. The bean may be swapped
+		 * out for another bean of the same type using {@link #setBean}.
+		 * Calling this method overrides any value previously set using {@link #setBeanClass}.
+		 * You must call either this method or {@link #setBeanClass} before {@link #create}.
+		 * @param bean the initial bean
+		 */
+		public void setBean(Object bean) {
+			this.bean = bean;
+			if (bean != null) {
 				beanClass = bean.getClass();
 				// SPRING PATCH BEGIN
 				setContextClass(beanClass);
 				// SPRING PATCH END
 			}
-        }
+		}
 
-        /**
-         * Set the class of the bean that the generated map should support.
-         * You must call either this method or {@link #setBeanClass} before {@link #create}.
-         * @param beanClass the class of the bean
-         */
-        public void setBeanClass(Class beanClass) {
-            this.beanClass = beanClass;
-        }
+		/**
+		 * Set the class of the bean that the generated map should support.
+		 * You must call either this method or {@link #setBeanClass} before {@link #create}.
+		 * @param beanClass the class of the bean
+		 */
+		public void setBeanClass(Class beanClass) {
+			this.beanClass = beanClass;
+		}
 
-        /**
-         * Limit the properties reflected by the generated map.
-         * @param require any combination of {@link #REQUIRE_GETTER} and
-         * {@link #REQUIRE_SETTER}; default is zero (any property allowed)
-         */
-        public void setRequire(int require) {
-            this.require = require;
-        }
+		/**
+		 * Limit the properties reflected by the generated map.
+		 * @param require any combination of {@link #REQUIRE_GETTER} and
+		 * {@link #REQUIRE_SETTER}; default is zero (any property allowed)
+		 */
+		public void setRequire(int require) {
+			this.require = require;
+		}
 
-        protected ClassLoader getDefaultClassLoader() {
-            return beanClass.getClassLoader();
-        }
+		@Override
+		protected ClassLoader getDefaultClassLoader() {
+			return beanClass.getClassLoader();
+		}
 
-        protected ProtectionDomain getProtectionDomain() {
-        	return ReflectUtils.getProtectionDomain(beanClass);
-        }
+		@Override
+		protected ProtectionDomain getProtectionDomain() {
+			return ReflectUtils.getProtectionDomain(beanClass);
+		}
 
-        /**
-         * Create a new instance of the <code>BeanMap</code>. An existing
-         * generated class will be reused if possible.
-         */
-        public BeanMap create() {
-            if (beanClass == null)
-                throw new IllegalArgumentException("Class of bean unknown");
-            setNamePrefix(beanClass.getName());
-            return (BeanMap)super.create(KEY_FACTORY.newInstance(beanClass, require));
-        }
+		/**
+		 * Create a new instance of the <code>BeanMap</code>. An existing
+		 * generated class will be reused if possible.
+		 */
+		public BeanMap create() {
+			if (beanClass == null) {
+				throw new IllegalArgumentException("Class of bean unknown");
+			}
+			setNamePrefix(beanClass.getName());
+			return (BeanMap)super.create(KEY_FACTORY.newInstance(beanClass, require));
+		}
 
-        public void generateClass(ClassVisitor v) throws Exception {
-            new BeanMapEmitter(v, getClassName(), beanClass, require);
-        }
+		@Override
+		public void generateClass(ClassVisitor v) throws Exception {
+			new BeanMapEmitter(v, getClassName(), beanClass, require);
+		}
 
-        protected Object firstInstance(Class type) {
-            return ((BeanMap)ReflectUtils.newInstance(type)).newInstance(bean);
-        }
+		@Override
+		protected Object firstInstance(Class type) {
+			return ((BeanMap)ReflectUtils.newInstance(type)).newInstance(bean);
+		}
 
-        protected Object nextInstance(Object instance) {
-            return ((BeanMap)instance).newInstance(bean);
-        }
-    }
+		@Override
+		protected Object nextInstance(Object instance) {
+			return ((BeanMap)instance).newInstance(bean);
+		}
+	}
 
-    /**
-     * Create a new <code>BeanMap</code> instance using the specified bean.
-     * This is faster than using the {@link #create} static method.
-     * @param bean the JavaBean underlying the map
-     * @return a new <code>BeanMap</code> instance
-     */
-    abstract public BeanMap newInstance(Object bean);
+	/**
+	 * Create a new <code>BeanMap</code> instance using the specified bean.
+	 * This is faster than using the {@link #create} static method.
+	 * @param bean the JavaBean underlying the map
+	 * @return a new <code>BeanMap</code> instance
+	 */
+	abstract public BeanMap newInstance(Object bean);
 
-    /**
-     * Get the type of a property.
-     * @param name the name of the JavaBean property
-     * @return the type of the property, or null if the property does not exist
-     */
-    abstract public Class getPropertyType(String name);
+	/**
+	 * Get the type of a property.
+	 * @param name the name of the JavaBean property
+	 * @return the type of the property, or null if the property does not exist
+	 */
+	abstract public Class getPropertyType(String name);
 
-    protected Object bean;
+	protected Object bean;
 
-    protected BeanMap() {
-    }
+	protected BeanMap() {
+	}
 
-    protected BeanMap(Object bean) {
-        setBean(bean);
-    }
+	protected BeanMap(Object bean) {
+		setBean(bean);
+	}
 
-    public Object get(Object key) {
-        return get(bean, key);
-    }
+	@Override
+	public Object get(Object key) {
+		return get(bean, key);
+	}
 
-    public Object put(Object key, Object value) {
-        return put(bean, key, value);
-    }
+	@Override
+	public Object put(Object key, Object value) {
+		return put(bean, key, value);
+	}
 
-    /**
-     * Get the property of a bean. This allows a <code>BeanMap</code>
-     * to be used statically for multiple beans--the bean instance tied to the
-     * map is ignored and the bean passed to this method is used instead.
-     * @param bean the bean to query; must be compatible with the type of
-     * this <code>BeanMap</code>
-     * @param key must be a String
-     * @return the current value, or null if there is no matching property
-     */
-    abstract public Object get(Object bean, Object key);
+	/**
+	 * Get the property of a bean. This allows a <code>BeanMap</code>
+	 * to be used statically for multiple beans--the bean instance tied to the
+	 * map is ignored and the bean passed to this method is used instead.
+	 * @param bean the bean to query; must be compatible with the type of
+	 * this <code>BeanMap</code>
+	 * @param key must be a String
+	 * @return the current value, or null if there is no matching property
+	 */
+	abstract public Object get(Object bean, Object key);
 
-    /**
-     * Set the property of a bean. This allows a <code>BeanMap</code>
-     * to be used statically for multiple beans--the bean instance tied to the
-     * map is ignored and the bean passed to this method is used instead.
-     * @param key must be a String
-     * @return the old value, if there was one, or null
-     */
-    abstract public Object put(Object bean, Object key, Object value);
+	/**
+	 * Set the property of a bean. This allows a <code>BeanMap</code>
+	 * to be used statically for multiple beans--the bean instance tied to the
+	 * map is ignored and the bean passed to this method is used instead.
+	 * @param key must be a String
+	 * @return the old value, if there was one, or null
+	 */
+	abstract public Object put(Object bean, Object key, Object value);
 
-    /**
-     * Change the underlying bean this map should use.
-     * @param bean the new JavaBean
-     * @see #getBean
-     */
-    public void setBean(Object bean) {
-        this.bean = bean;
-    }
+	/**
+	 * Change the underlying bean this map should use.
+	 * @param bean the new JavaBean
+	 * @see #getBean
+	 */
+	public void setBean(Object bean) {
+		this.bean = bean;
+	}
 
-    /**
-     * Return the bean currently in use by this map.
-     * @return the current JavaBean
-     * @see #setBean
-     */
-    public Object getBean() {
-        return bean;
-    }
+	/**
+	 * Return the bean currently in use by this map.
+	 * @return the current JavaBean
+	 * @see #setBean
+	 */
+	public Object getBean() {
+		return bean;
+	}
 
-    public void clear() {
-        throw new UnsupportedOperationException();
-    }
+	@Override
+	public void clear() {
+		throw new UnsupportedOperationException();
+	}
 
-    public boolean containsKey(Object key) {
-        return keySet().contains(key);
-    }
+	@Override
+	public boolean containsKey(Object key) {
+		return keySet().contains(key);
+	}
 
-    public boolean containsValue(Object value) {
-        for (Iterator it = keySet().iterator(); it.hasNext();) {
-            Object v = get(it.next());
-            if (((value == null) && (v == null)) || (value != null && value.equals(v)))
-                return true;
-        }
-        return false;
-    }
+	@Override
+	public boolean containsValue(Object value) {
+		for (Iterator it = keySet().iterator(); it.hasNext();) {
+			Object v = get(it.next());
+			if (((value == null) && (v == null)) || (value != null && value.equals(v))) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    public int size() {
-        return keySet().size();
-    }
+	@Override
+	public int size() {
+		return keySet().size();
+	}
 
-    public boolean isEmpty() {
-        return size() == 0;
-    }
+	@Override
+	public boolean isEmpty() {
+		return size() == 0;
+	}
 
-    public Object remove(Object key) {
-        throw new UnsupportedOperationException();
-    }
+	@Override
+	public Object remove(Object key) {
+		throw new UnsupportedOperationException();
+	}
 
-    public void putAll(Map t) {
-        for (Iterator it = t.keySet().iterator(); it.hasNext();) {
-            Object key = it.next();
-            put(key, t.get(key));
-        }
-    }
+	@Override
+	public void putAll(Map t) {
+		for (Object key : t.keySet()) {
+			put(key, t.get(key));
+		}
+	}
 
-    public boolean equals(Object o) {
-        if (o == null || !(o instanceof Map)) {
-            return false;
-        }
-        Map other = (Map)o;
-        if (size() != other.size()) {
-            return false;
-        }
-        for (Iterator it = keySet().iterator(); it.hasNext();) {
-            Object key = it.next();
-            if (!other.containsKey(key)) {
-                return false;
-            }
-            Object v1 = get(key);
-            Object v2 = other.get(key);
-            if (!((v1 == null) ? v2 == null : v1.equals(v2))) {
-                return false;
-            }
-        }
-        return true;
-    }
+	@Override
+	public boolean equals(Object o) {
+		if (o == null || !(o instanceof Map)) {
+			return false;
+		}
+		Map other = (Map)o;
+		if (size() != other.size()) {
+			return false;
+		}
+		for (Object key : keySet()) {
+			if (!other.containsKey(key)) {
+				return false;
+			}
+			Object v1 = get(key);
+			Object v2 = other.get(key);
+			if (!((v1 == null) ? v2 == null : v1.equals(v2))) {
+				return false;
+			}
+		}
+		return true;
+	}
 
-    public int hashCode() {
-        int code = 0;
-        for (Iterator it = keySet().iterator(); it.hasNext();) {
-            Object key = it.next();
-            Object value = get(key);
-            code += ((key == null) ? 0 : key.hashCode()) ^
-                ((value == null) ? 0 : value.hashCode());
-        }
-        return code;
-    }
+	@Override
+	public int hashCode() {
+		int code = 0;
+		for (Object key : keySet()) {
+			Object value = get(key);
+			code += ((key == null) ? 0 : key.hashCode()) ^
+				((value == null) ? 0 : value.hashCode());
+		}
+		return code;
+	}
 
-    // TODO: optimize
-    public Set entrySet() {
-        HashMap copy = new HashMap();
-        for (Iterator it = keySet().iterator(); it.hasNext();) {
-            Object key = it.next();
-            copy.put(key, get(key));
-        }
-        return Collections.unmodifiableMap(copy).entrySet();
-    }
+	// TODO: optimize
+	@Override
+	public Set entrySet() {
+		HashMap copy = new HashMap();
+		for (Object key : keySet()) {
+			copy.put(key, get(key));
+		}
+		return Collections.unmodifiableMap(copy).entrySet();
+	}
 
-    public Collection values() {
-        Set keys = keySet();
-        List values = new ArrayList(keys.size());
-        for (Iterator it = keys.iterator(); it.hasNext();) {
-            values.add(get(it.next()));
-        }
-        return Collections.unmodifiableCollection(values);
-    }
+	@Override
+	public Collection values() {
+		Set keys = keySet();
+		List values = new ArrayList(keys.size());
+		for (Iterator it = keys.iterator(); it.hasNext();) {
+			values.add(get(it.next()));
+		}
+		return Collections.unmodifiableCollection(values);
+	}
 
-    /*
-     * @see java.util.AbstractMap#toString
-     */
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-        sb.append('{');
-        for (Iterator it = keySet().iterator(); it.hasNext();) {
-            Object key = it.next();
-            sb.append(key);
-            sb.append('=');
-            sb.append(get(key));
-            if (it.hasNext()) {
-                sb.append(", ");
-            }
-        }
-        sb.append('}');
-        return sb.toString();
-    }
+	/*
+	 * @see java.util.AbstractMap#toString
+	 */
+	@Override
+	public String toString()
+	{
+		StringBuilder sb = new StringBuilder();
+		sb.append('{');
+		for (Iterator it = keySet().iterator(); it.hasNext();) {
+			Object key = it.next();
+			sb.append(key);
+			sb.append('=');
+			sb.append(get(key));
+			if (it.hasNext()) {
+				sb.append(", ");
+			}
+		}
+		sb.append('}');
+		return sb.toString();
+	}
 }

spring-core/src/main/java/org/springframework/cglib/beans/BeanMapEmitter.java

@@ -15,12 +15,23 @@
  */
 package org.springframework.cglib.beans;
 
-import java.beans.*;
-import java.util.*;
-import org.springframework.cglib.core.*;
+import java.beans.PropertyDescriptor;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Label;
 import org.springframework.asm.Type;
+import org.springframework.cglib.core.ClassEmitter;
+import org.springframework.cglib.core.CodeEmitter;
+import org.springframework.cglib.core.Constants;
+import org.springframework.cglib.core.EmitUtils;
+import org.springframework.cglib.core.MethodInfo;
+import org.springframework.cglib.core.ObjectSwitchCallback;
+import org.springframework.cglib.core.ReflectUtils;
+import org.springframework.cglib.core.Signature;
+import org.springframework.cglib.core.TypeUtils;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 class BeanMapEmitter extends ClassEmitter {
@@ -50,7 +61,7 @@ class BeanMapEmitter extends ClassEmitter {
         EmitUtils.null_constructor(this);
         EmitUtils.factory_method(this, NEW_INSTANCE);
         generateConstructor();
-            
+
         Map getters = makePropertyMap(ReflectUtils.getBeanGetters(type));
         Map setters = makePropertyMap(ReflectUtils.getBeanSetters(type));
         Map allProps = new HashMap();
@@ -79,8 +90,8 @@ class BeanMapEmitter extends ClassEmitter {
 
     private Map makePropertyMap(PropertyDescriptor[] props) {
         Map names = new HashMap();
-        for (int i = 0; i < props.length; i++) {
-            names.put(props[i].getName(), props[i]);
+        for (PropertyDescriptor prop : props) {
+            names.put(prop.getName(), prop);
         }
         return names;
     }
@@ -97,7 +108,7 @@ class BeanMapEmitter extends ClassEmitter {
         e.return_value();
         e.end_method();
     }
-        
+
     private void generateGet(Class type, final Map getters) {
         final CodeEmitter e = begin_method(Constants.ACC_PUBLIC, BEAN_MAP_GET, null);
         e.load_arg(0);
@@ -105,14 +116,16 @@ class BeanMapEmitter extends ClassEmitter {
         e.load_arg(1);
         e.checkcast(Constants.TYPE_STRING);
         EmitUtils.string_switch(e, getNames(getters), Constants.SWITCH_STYLE_HASH, new ObjectSwitchCallback() {
-            public void processCase(Object key, Label end) {
+            @Override
+			public void processCase(Object key, Label end) {
                 PropertyDescriptor pd = (PropertyDescriptor)getters.get(key);
                 MethodInfo method = ReflectUtils.getMethodInfo(pd.getReadMethod());
                 e.invoke(method);
                 e.box(method.getSignature().getReturnType());
                 e.return_value();
             }
-            public void processDefault() {
+            @Override
+			public void processDefault() {
                 e.aconst_null();
                 e.return_value();
             }
@@ -127,7 +140,8 @@ class BeanMapEmitter extends ClassEmitter {
         e.load_arg(1);
         e.checkcast(Constants.TYPE_STRING);
         EmitUtils.string_switch(e, getNames(setters), Constants.SWITCH_STYLE_HASH, new ObjectSwitchCallback() {
-            public void processCase(Object key, Label end) {
+            @Override
+			public void processCase(Object key, Label end) {
                 PropertyDescriptor pd = (PropertyDescriptor)setters.get(key);
                 if (pd.getReadMethod() == null) {
                     e.aconst_null();
@@ -144,7 +158,8 @@ class BeanMapEmitter extends ClassEmitter {
                 e.invoke(write);
                 e.return_value();
             }
-            public void processDefault() {
+            @Override
+			public void processDefault() {
                 // fall-through
             }
         });
@@ -152,7 +167,7 @@ class BeanMapEmitter extends ClassEmitter {
         e.return_value();
         e.end_method();
     }
-            
+
     private void generateKeySet(String[] allNames) {
         // static initializer
         declare_field(Constants.ACC_STATIC | Constants.ACC_PRIVATE, "keys", FIXED_KEY_SET, null);
@@ -178,12 +193,14 @@ class BeanMapEmitter extends ClassEmitter {
         final CodeEmitter e = begin_method(Constants.ACC_PUBLIC, GET_PROPERTY_TYPE, null);
         e.load_arg(0);
         EmitUtils.string_switch(e, allNames, Constants.SWITCH_STYLE_HASH, new ObjectSwitchCallback() {
-            public void processCase(Object key, Label end) {
+            @Override
+			public void processCase(Object key, Label end) {
                 PropertyDescriptor pd = (PropertyDescriptor)allProps.get(key);
                 EmitUtils.load_class(e, Type.getType(pd.getPropertyType()));
                 e.return_value();
             }
-            public void processDefault() {
+            @Override
+			public void processDefault() {
                 e.aconst_null();
                 e.return_value();
             }

spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java

@@ -16,8 +16,11 @@
 package org.springframework.cglib.beans;
 
 import java.security.ProtectionDomain;
-import org.springframework.cglib.core.*;
+
 import org.springframework.asm.ClassVisitor;
+import org.springframework.cglib.core.AbstractClassGenerator;
+import org.springframework.cglib.core.KeyFactory;
+import org.springframework.cglib.core.ReflectUtils;
 
 /**
  * @author Juozas Baliuka
@@ -25,118 +28,123 @@ import org.springframework.asm.ClassVisitor;
 @SuppressWarnings({"rawtypes", "unchecked"})
 abstract public class BulkBean
 {
-    private static final BulkBeanKey KEY_FACTORY =
-      (BulkBeanKey)KeyFactory.create(BulkBeanKey.class);
-    
-    interface BulkBeanKey {
-        public Object newInstance(String target, String[] getters, String[] setters, String[] types);
-    }
-    
-    protected Class target;
-    protected String[] getters, setters;
-    protected Class[] types;
-    
-    protected BulkBean() { }
-    
-    abstract public void getPropertyValues(Object bean, Object[] values);
-    abstract public void setPropertyValues(Object bean, Object[] values);
+	private static final BulkBeanKey KEY_FACTORY =
+	  (BulkBeanKey)KeyFactory.create(BulkBeanKey.class);
 
-    public Object[] getPropertyValues(Object bean) {
-        Object[] values = new Object[getters.length];
-        getPropertyValues(bean, values);
-        return values;
-    }
-    
-    public Class[] getPropertyTypes() {
-        return types.clone();
-    }
-    
-    public String[] getGetters() {
-        return getters.clone();
-    }
-    
-    public String[] getSetters() {
-        return setters.clone();
-    }
+	interface BulkBeanKey {
+		public Object newInstance(String target, String[] getters, String[] setters, String[] types);
+	}
 
-    public static BulkBean create(Class target, String[] getters, String[] setters, Class[] types) {
-        Generator gen = new Generator();
-        gen.setTarget(target);
-        gen.setGetters(getters);
-        gen.setSetters(setters);
-        gen.setTypes(types);
-        return gen.create();
-    }
+	protected Class target;
+	protected String[] getters, setters;
+	protected Class[] types;
 
-    public static class Generator extends AbstractClassGenerator {
-        private static final Source SOURCE = new Source(BulkBean.class.getName());
-        private Class target;
-        private String[] getters;
-        private String[] setters;
-        private Class[] types;
+	protected BulkBean() { }
 
-        public Generator() {
-            super(SOURCE);
-        }
+	abstract public void getPropertyValues(Object bean, Object[] values);
+	abstract public void setPropertyValues(Object bean, Object[] values);
 
-        public void setTarget(Class target) {
-            this.target = target;
+	public Object[] getPropertyValues(Object bean) {
+		Object[] values = new Object[getters.length];
+		getPropertyValues(bean, values);
+		return values;
+	}
+
+	public Class[] getPropertyTypes() {
+		return types.clone();
+	}
+
+	public String[] getGetters() {
+		return getters.clone();
+	}
+
+	public String[] getSetters() {
+		return setters.clone();
+	}
+
+	public static BulkBean create(Class target, String[] getters, String[] setters, Class[] types) {
+		Generator gen = new Generator();
+		gen.setTarget(target);
+		gen.setGetters(getters);
+		gen.setSetters(setters);
+		gen.setTypes(types);
+		return gen.create();
+	}
+
+	public static class Generator extends AbstractClassGenerator {
+		private static final Source SOURCE = new Source(BulkBean.class.getName());
+		private Class target;
+		private String[] getters;
+		private String[] setters;
+		private Class[] types;
+
+		public Generator() {
+			super(SOURCE);
+		}
+
+		public void setTarget(Class target) {
+			this.target = target;
 			// SPRING PATCH BEGIN
 			setContextClass(target);
 			// SPRING PATCH END
-        }
+		}
 
-        public void setGetters(String[] getters) {
-            this.getters = getters;
-        }
+		public void setGetters(String[] getters) {
+			this.getters = getters;
+		}
 
-        public void setSetters(String[] setters) {
-            this.setters = setters;
-        }
+		public void setSetters(String[] setters) {
+			this.setters = setters;
+		}
 
-        public void setTypes(Class[] types) {
-            this.types = types;
-        }
+		public void setTypes(Class[] types) {
+			this.types = types;
+		}
 
-        protected ClassLoader getDefaultClassLoader() {
-            return target.getClassLoader();
-        }
+		@Override
+		protected ClassLoader getDefaultClassLoader() {
+			return target.getClassLoader();
+		}
 
-        protected ProtectionDomain getProtectionDomain() {
-        	return ReflectUtils.getProtectionDomain(target);
-        }
+		@Override
+		protected ProtectionDomain getProtectionDomain() {
+			return ReflectUtils.getProtectionDomain(target);
+		}
 
-        public BulkBean create() {
-            setNamePrefix(target.getName());
-            String targetClassName = target.getName();
-            String[] typeClassNames = ReflectUtils.getNames(types);
-            Object key = KEY_FACTORY.newInstance(targetClassName, getters, setters, typeClassNames);
-            return (BulkBean)super.create(key);
-        }
+		public BulkBean create() {
+			setNamePrefix(target.getName());
+			String targetClassName = target.getName();
+			String[] typeClassNames = ReflectUtils.getNames(types);
+			Object key = KEY_FACTORY.newInstance(targetClassName, getters, setters, typeClassNames);
+			return (BulkBean)super.create(key);
+		}
 
-        public void generateClass(ClassVisitor v) throws Exception {
-            new BulkBeanEmitter(v, getClassName(), target, getters, setters, types);
-        }
+		@Override
+		public void generateClass(ClassVisitor v) throws Exception {
+			new BulkBeanEmitter(v, getClassName(), target, getters, setters, types);
+		}
 
-        protected Object firstInstance(Class type) {
-            BulkBean instance = (BulkBean)ReflectUtils.newInstance(type);
-            instance.target = target;
-                    
-            int length = getters.length;
-            instance.getters = new String[length];
-            System.arraycopy(getters, 0, instance.getters, 0, length);
-                    
-            instance.setters = new String[length];
-            System.arraycopy(setters, 0, instance.setters, 0, length);
-                    
-            instance.types = new Class[types.length];
-            System.arraycopy(types, 0, instance.types, 0, types.length);
+		@Override
+		protected Object firstInstance(Class type) {
+			BulkBean instance = (BulkBean)ReflectUtils.newInstance(type);
+			instance.target = target;
 
-            return instance;
-        }
+			int length = getters.length;
+			instance.getters = new String[length];
+			System.arraycopy(getters, 0, instance.getters, 0, length);
 
-        protected Object nextInstance(Object instance) {
-            return instance;
-        }
-    }
+			instance.setters = new String[length];
+			System.arraycopy(setters, 0, instance.setters, 0, length);
+
+			instance.types = new Class[types.length];
+			System.arraycopy(types, 0, instance.types, 0, types.length);
+
+			return instance;
+		}
+
+		@Override
+		protected Object nextInstance(Object instance) {
+			return instance;
+		}
+	}
 }

spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java

@@ -17,9 +17,19 @@ package org.springframework.cglib.beans;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import org.springframework.cglib.core.*;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
+import org.springframework.cglib.core.Block;
+import org.springframework.cglib.core.ClassEmitter;
+import org.springframework.cglib.core.CodeEmitter;
+import org.springframework.cglib.core.Constants;
+import org.springframework.cglib.core.EmitUtils;
+import org.springframework.cglib.core.Local;
+import org.springframework.cglib.core.MethodInfo;
+import org.springframework.cglib.core.ReflectUtils;
+import org.springframework.cglib.core.Signature;
+import org.springframework.cglib.core.TypeUtils;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 class BulkBeanEmitter extends ClassEmitter {
@@ -33,7 +43,7 @@ class BulkBeanEmitter extends ClassEmitter {
       TypeUtils.parseType("org.springframework.cglib.beans.BulkBean");
     private static final Type BULK_BEAN_EXCEPTION =
       TypeUtils.parseType("org.springframework.cglib.beans.BulkBeanException");
-        
+
     public BulkBeanEmitter(ClassVisitor v,
                            String className,
                            Class target,
@@ -116,7 +126,7 @@ class BulkBeanEmitter extends ClassEmitter {
         }
         e.end_method();
     }
-    
+
     private static void validate(Class target,
                                  String[] getters,
                                  String[] setters,

spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java

@@ -20,7 +20,7 @@ public class BulkBeanException extends RuntimeException
 {
     private int index;
     private Throwable cause;
-    
+
     public BulkBeanException(String message, int index) {
         super(message);
         this.index = index;
@@ -35,8 +35,9 @@ public class BulkBeanException extends RuntimeException
     public int getIndex() {
         return index;
     }
-    
-    public Throwable getCause() {
+
+    @Override
+	public Throwable getCause() {
         return cause;
     }
 }

spring-core/src/main/java/org/springframework/cglib/beans/FixedKeySet.java

@@ -15,7 +15,12 @@
  */
 package org.springframework.cglib.beans;
 
-import java.util.*;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public /* need it for class loading  */ class FixedKeySet extends AbstractSet {
@@ -27,11 +32,13 @@ public /* need it for class loading  */ class FixedKeySet extends AbstractSet {
         set = Collections.unmodifiableSet(new HashSet(Arrays.asList(keys)));
     }
 
-    public Iterator iterator() {
+    @Override
+	public Iterator iterator() {
         return set.iterator();
     }
 
-    public int size() {
+    @Override
+	public int size() {
         return size;
     }
 }

spring-core/src/main/java/org/springframework/cglib/beans/ImmutableBean.java

@@ -18,115 +18,129 @@ package org.springframework.cglib.beans;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.security.ProtectionDomain;
-import org.springframework.cglib.core.*;
+
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;
+import org.springframework.cglib.core.AbstractClassGenerator;
+import org.springframework.cglib.core.ClassEmitter;
+import org.springframework.cglib.core.CodeEmitter;
+import org.springframework.cglib.core.Constants;
+import org.springframework.cglib.core.EmitUtils;
+import org.springframework.cglib.core.MethodInfo;
+import org.springframework.cglib.core.ReflectUtils;
+import org.springframework.cglib.core.Signature;
+import org.springframework.cglib.core.TypeUtils;
 /**
  * @author Chris Nokleberg
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class ImmutableBean
 {
-    private static final Type ILLEGAL_STATE_EXCEPTION =
-      TypeUtils.parseType("IllegalStateException");
-    private static final Signature CSTRUCT_OBJECT =
-      TypeUtils.parseConstructor("Object");
-    private static final Class[] OBJECT_CLASSES = { Object.class };
-    private static final String FIELD_NAME = "CGLIB$RWBean";
+	private static final Type ILLEGAL_STATE_EXCEPTION =
+	  TypeUtils.parseType("IllegalStateException");
+	private static final Signature CSTRUCT_OBJECT =
+	  TypeUtils.parseConstructor("Object");
+	private static final Class[] OBJECT_CLASSES = { Object.class };
+	private static final String FIELD_NAME = "CGLIB$RWBean";
 
-    private ImmutableBean() {
-    }
+	private ImmutableBean() {
+	}
 
-    public static Object create(Object bean) {
-        Generator gen = new Generator();
-        gen.setBean(bean);
-        return gen.create();
-    }
+	public static Object create(Object bean) {
+		Generator gen = new Generator();
+		gen.setBean(bean);
+		return gen.create();
+	}
 
-    public static class Generator extends AbstractClassGenerator {
-        private static final Source SOURCE = new Source(ImmutableBean.class.getName());
-        private Object bean;
-        private Class target;
+	public static class Generator extends AbstractClassGenerator {
+		private static final Source SOURCE = new Source(ImmutableBean.class.getName());
+		private Object bean;
+		private Class target;
 
-        public Generator() {
-            super(SOURCE);
-        }
+		public Generator() {
+			super(SOURCE);
+		}
 
-        public void setBean(Object bean) {
-            this.bean = bean;
-            target = bean.getClass();
+		public void setBean(Object bean) {
+			this.bean = bean;
+			target = bean.getClass();
 			// SPRING PATCH BEGIN
 			setContextClass(target);
 			// SPRING PATCH END
-        }
+		}
 
-        protected ClassLoader getDefaultClassLoader() {
-            return target.getClassLoader();
-        }
+		@Override
+		protected ClassLoader getDefaultClassLoader() {
+			return target.getClassLoader();
+		}
 
-        protected ProtectionDomain getProtectionDomain() {
-        	return ReflectUtils.getProtectionDomain(target);
-        }
+		@Override
+		protected ProtectionDomain getProtectionDomain() {
+			return ReflectUtils.getProtectionDomain(target);
+		}
 
-        public Object create() {
-            String name = target.getName();
-            setNamePrefix(name);
-            return super.create(name);
-        }
+		public Object create() {
+			String name = target.getName();
+			setNamePrefix(name);
+			return super.create(name);
+		}
 
-        public void generateClass(ClassVisitor v) {
-            Type targetType = Type.getType(target);
-            ClassEmitter ce = new ClassEmitter(v);
-            ce.begin_class(Constants.V1_8,
-                           Constants.ACC_PUBLIC,
-                           getClassName(),
-                           targetType,
-                           null,
-                           Constants.SOURCE_FILE);
+		@Override
+		public void generateClass(ClassVisitor v) {
+			Type targetType = Type.getType(target);
+			ClassEmitter ce = new ClassEmitter(v);
+			ce.begin_class(Constants.V1_8,
+						   Constants.ACC_PUBLIC,
+						   getClassName(),
+						   targetType,
+						   null,
+						   Constants.SOURCE_FILE);
 
-            ce.declare_field(Constants.ACC_FINAL | Constants.ACC_PRIVATE, FIELD_NAME, targetType, null);
+			ce.declare_field(Constants.ACC_FINAL | Constants.ACC_PRIVATE, FIELD_NAME, targetType, null);
 
-            CodeEmitter e = ce.begin_method(Constants.ACC_PUBLIC, CSTRUCT_OBJECT, null);
-            e.load_this();
-            e.super_invoke_constructor();
-            e.load_this();
-            e.load_arg(0);
-            e.checkcast(targetType);
-            e.putfield(FIELD_NAME);
-            e.return_value();
-            e.end_method();
+			CodeEmitter e = ce.begin_method(Constants.ACC_PUBLIC, CSTRUCT_OBJECT, null);
+			e.load_this();
+			e.super_invoke_constructor();
+			e.load_this();
+			e.load_arg(0);
+			e.checkcast(targetType);
+			e.putfield(FIELD_NAME);
+			e.return_value();
+			e.end_method();
 
-            PropertyDescriptor[] descriptors = ReflectUtils.getBeanProperties(target);
-            Method[] getters = ReflectUtils.getPropertyMethods(descriptors, true, false);
-            Method[] setters = ReflectUtils.getPropertyMethods(descriptors, false, true);
+			PropertyDescriptor[] descriptors = ReflectUtils.getBeanProperties(target);
+			Method[] getters = ReflectUtils.getPropertyMethods(descriptors, true, false);
+			Method[] setters = ReflectUtils.getPropertyMethods(descriptors, false, true);
 
-            for (int i = 0; i < getters.length; i++) {
-                MethodInfo getter = ReflectUtils.getMethodInfo(getters[i]);
-                e = EmitUtils.begin_method(ce, getter, Constants.ACC_PUBLIC);
-                e.load_this();
-                e.getfield(FIELD_NAME);
-                e.invoke(getter);
-                e.return_value();
-                e.end_method();
-            }
+			for (Method getter2 : getters) {
+				MethodInfo getter = ReflectUtils.getMethodInfo(getter2);
+				e = EmitUtils.begin_method(ce, getter, Constants.ACC_PUBLIC);
+				e.load_this();
+				e.getfield(FIELD_NAME);
+				e.invoke(getter);
+				e.return_value();
+				e.end_method();
+			}
 
-            for (int i = 0; i < setters.length; i++) {
-                MethodInfo setter = ReflectUtils.getMethodInfo(setters[i]);
-                e = EmitUtils.begin_method(ce, setter, Constants.ACC_PUBLIC);
-                e.throw_exception(ILLEGAL_STATE_EXCEPTION, "Bean is immutable");
-                e.end_method();
-            }
+			for (Method setter2 : setters) {
+				MethodInfo setter = ReflectUtils.getMethodInfo(setter2);
+				e = EmitUtils.begin_method(ce, setter, Constants.ACC_PUBLIC);
+				e.throw_exception(ILLEGAL_STATE_EXCEPTION, "Bean is immutable");
+				e.end_method();
+			}
 
-            ce.end_class();
-        }
+			ce.end_class();
+		}
 
-        protected Object firstInstance(Class type) {
-            return ReflectUtils.newInstance(type, OBJECT_CLASSES, new Object[]{ bean });
-        }
+		@Override
+		protected Object firstInstance(Class type) {
+			return ReflectUtils.newInstance(type, OBJECT_CLASSES, new Object[]{ bean });
+		}
 
-        // TODO: optimize
-        protected Object nextInstance(Object instance) {
-            return firstInstance(instance.getClass());
-        }
-    }
+		// TODO: optimize
+		@Override
+		protected Object nextInstance(Object instance) {
+			return firstInstance(instance.getClass());
+		}
+	}
 }

spring-core/src/main/java/org/springframework/core/ResolvableType.java

@@ -138,7 +138,7 @@ public class ResolvableType implements Serializable {
 
 
 	/**
-	 * Private constructor used to create a new {@link ResolvableType} for cache key purposes,
+	 * Private constructor used to create a new {@code ResolvableType} for cache key purposes,
 	 * with no upfront resolution.
 	 */
 	private ResolvableType(
@@ -153,7 +153,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Private constructor used to create a new {@link ResolvableType} for cache value purposes,
+	 * Private constructor used to create a new {@code ResolvableType} for cache value purposes,
 	 * with upfront resolution and a pre-calculated hash.
 	 * @since 4.2
 	 */
@@ -169,7 +169,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Private constructor used to create a new {@link ResolvableType} for uncached purposes,
+	 * Private constructor used to create a new {@code ResolvableType} for uncached purposes,
 	 * with upfront resolution but lazily calculated hash.
 	 */
 	private ResolvableType(Type type, @Nullable TypeProvider typeProvider,
@@ -184,7 +184,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Private constructor used to create a new {@link ResolvableType} on a {@link Class} basis.
+	 * Private constructor used to create a new {@code ResolvableType} on a {@link Class} basis.
 	 * <p>Avoids all {@code instanceof} checks in order to create a straight {@link Class} wrapper.
 	 * @since 4.2
 	 */
@@ -223,7 +223,7 @@ public class ResolvableType implements Serializable {
 
 	/**
 	 * Return the underlying source of the resolvable type. Will return a {@link Field},
-	 * {@link MethodParameter} or {@link Type} depending on how the {@link ResolvableType}
+	 * {@link MethodParameter} or {@link Type} depending on how the {@code ResolvableType}
 	 * was constructed. This method is primarily to provide access to additional type
 	 * information or meta-data that alternative JVM languages may provide.
 	 */
@@ -341,13 +341,14 @@ public class ResolvableType implements Serializable {
 			}
 		}
 		if (ourResolved == null) {
-			ourResolved = resolve(Object.class);
+			ourResolved = toClass();
 		}
 		Class<?> otherResolved = other.toClass();
 
 		// We need an exact type match for generics
 		// List<CharSequence> is not assignable from List<String>
-		if (exactMatch ? !ourResolved.equals(otherResolved) : !ClassUtils.isAssignable(ourResolved, otherResolved)) {
+		if (exactMatch ? !ourResolved.equals(otherResolved) :
+				!ClassUtils.isAssignable(ourResolved, otherResolved)) {
 			return false;
 		}
 
@@ -358,13 +359,15 @@ public class ResolvableType implements Serializable {
 			if (ourGenerics.length != typeGenerics.length) {
 				return false;
 			}
-			if (matchedBefore == null) {
-				matchedBefore = new IdentityHashMap<>(1);
-			}
-			matchedBefore.put(this.type, other.type);
-			for (int i = 0; i < ourGenerics.length; i++) {
-				if (!ourGenerics[i].isAssignableFrom(typeGenerics[i], matchedBefore)) {
-					return false;
+			if (ourGenerics.length > 0) {
+				if (matchedBefore == null) {
+					matchedBefore = new IdentityHashMap<>(1);
+				}
+				matchedBefore.put(this.type, other.type);
+				for (int i = 0; i < ourGenerics.length; i++) {
+					if (!ourGenerics[i].isAssignableFrom(typeGenerics[i], matchedBefore)) {
+						return false;
+					}
 				}
 			}
 		}
@@ -429,12 +432,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return this type as a {@link ResolvableType} of the specified class. Searches
+	 * Return this type as a {@code ResolvableType} of the specified class. Searches
 	 * {@link #getSuperType() supertype} and {@link #getInterfaces() interface}
 	 * hierarchies to find a match, returning {@link #NONE} if this type does not
 	 * implement or extend the specified class.
 	 * @param type the required type (typically narrowed)
-	 * @return a {@link ResolvableType} representing this object as the specified
+	 * @return a {@code ResolvableType} representing this object as the specified
 	 * type, or {@link #NONE} if not resolvable as that type
 	 * @see #asCollection()
 	 * @see #asMap()
@@ -459,9 +462,9 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} representing the direct supertype of this type.
+	 * Return a {@code ResolvableType} representing the direct supertype of this type.
 	 * <p>If no supertype is available this method returns {@link #NONE}.
-	 * <p>Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}.
+	 * <p>Note: The resulting {@code ResolvableType} instance may not be {@link Serializable}.
 	 * @see #getInterfaces()
 	 */
 	public ResolvableType getSuperType() {
@@ -488,10 +491,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} array representing the direct interfaces
+	 * Return a {@code ResolvableType} array representing the direct interfaces
 	 * implemented by this type. If this type does not implement any interfaces an
 	 * empty array is returned.
-	 * <p>Note: The resulting {@link ResolvableType} instances may not be {@link Serializable}.
+	 * <p>Note: The resulting {@code ResolvableType} instances may not be {@link Serializable}.
 	 * @see #getSuperType()
 	 */
 	public ResolvableType[] getInterfaces() {
@@ -621,17 +624,17 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified nesting level.
+	 * Return a {@code ResolvableType} for the specified nesting level.
 	 * <p>See {@link #getNested(int, Map)} for details.
 	 * @param nestingLevel the nesting level
-	 * @return the {@link ResolvableType} type, or {@code #NONE}
+	 * @return the {@code ResolvableType} type, or {@code #NONE}
 	 */
 	public ResolvableType getNested(int nestingLevel) {
 		return getNested(nestingLevel, null);
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified nesting level.
+	 * Return a {@code ResolvableType} for the specified nesting level.
 	 * <p>The nesting level refers to the specific generic parameter that should be returned.
 	 * A nesting level of 1 indicates this type; 2 indicates the first nested generic;
 	 * 3 the second; and so on. For example, given {@code List<Set<Integer>>} level 1 refers
@@ -648,7 +651,7 @@ public class ResolvableType implements Serializable {
 	 * current type, 2 for the first nested generic, 3 for the second and so on
 	 * @param typeIndexesPerLevel a map containing the generic index for a given
 	 * nesting level (may be {@code null})
-	 * @return a {@link ResolvableType} for the nested level, or {@link #NONE}
+	 * @return a {@code ResolvableType} for the nested level, or {@link #NONE}
 	 */
 	public ResolvableType getNested(int nestingLevel, @Nullable Map<Integer, Integer> typeIndexesPerLevel) {
 		ResolvableType result = this;
@@ -670,7 +673,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} representing the generic parameter for the
+	 * Return a {@code ResolvableType} representing the generic parameter for the
 	 * given indexes. Indexes are zero based; for example given the type
 	 * {@code Map<Integer, List<String>>}, {@code getGeneric(0)} will access the
 	 * {@code Integer}. Nested generics can be accessed by specifying multiple indexes;
@@ -680,7 +683,7 @@ public class ResolvableType implements Serializable {
 	 * <p>If no generic is available at the specified indexes {@link #NONE} is returned.
 	 * @param indexes the indexes that refer to the generic parameter
 	 * (may be omitted to return the first generic)
-	 * @return a {@link ResolvableType} for the specified generic, or {@link #NONE}
+	 * @return a {@code ResolvableType} for the specified generic, or {@link #NONE}
 	 * @see #hasGenerics()
 	 * @see #getGenerics()
 	 * @see #resolveGeneric(int...)
@@ -703,12 +706,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return an array of {@link ResolvableType ResolvableTypes} representing the generic parameters of
+	 * Return an array of {@code ResolvableType ResolvableTypes} representing the generic parameters of
 	 * this type. If no generics are available an empty array is returned. If you need to
 	 * access a specific generic consider using the {@link #getGeneric(int...)} method as
 	 * it allows access to nested generics and protects against
 	 * {@code IndexOutOfBoundsExceptions}.
-	 * @return an array of {@link ResolvableType ResolvableTypes} representing the generic parameters
+	 * @return an array of {@code ResolvableType ResolvableTypes} representing the generic parameters
 	 * (never {@code null})
 	 * @see #hasGenerics()
 	 * @see #getGeneric(int...)
@@ -780,7 +783,7 @@ public class ResolvableType implements Serializable {
 
 	/**
 	 * Convenience method that will {@link #getGeneric(int...) get} and
-	 * {@link #resolve() resolve} a specific generic parameters.
+	 * {@link #resolve() resolve} a specific generic parameter.
 	 * @param indexes the indexes that refer to the generic parameter
 	 * (may be omitted to return the first generic)
 	 * @return a resolved {@link Class} or {@code null}
@@ -842,7 +845,7 @@ public class ResolvableType implements Serializable {
 
 	/**
 	 * Resolve this type by a single level, returning the resolved value or {@link #NONE}.
-	 * <p>Note: The returned {@link ResolvableType} should only be used as an intermediary
+	 * <p>Note: The returned {@code ResolvableType} should only be used as an intermediary
 	 * as it cannot be serialized.
 	 */
 	ResolvableType resolveType() {
@@ -964,7 +967,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Adapts this {@link ResolvableType} to a {@link VariableResolver}.
+	 * Adapts this {@code ResolvableType} to a {@link VariableResolver}.
 	 */
 	@Nullable
 	VariableResolver asVariableResolver() {
@@ -1011,12 +1014,12 @@ public class ResolvableType implements Serializable {
 	// Factory methods
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Class},
+	 * Return a {@code ResolvableType} for the specified {@link Class},
 	 * using the full generic type information for assignability checks.
 	 * <p>For example: {@code ResolvableType.forClass(MyArrayList.class)}.
 	 * @param clazz the class to introspect ({@code null} is semantically
 	 * equivalent to {@code Object.class} for typical use cases here)
-	 * @return a {@link ResolvableType} for the specified class
+	 * @return a {@code ResolvableType} for the specified class
 	 * @see #forClass(Class, Class)
 	 * @see #forClassWithGenerics(Class, Class...)
 	 */
@@ -1025,13 +1028,13 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Class},
+	 * Return a {@code ResolvableType} for the specified {@link Class},
 	 * doing assignability checks against the raw class only (analogous to
 	 * {@link Class#isAssignableFrom}, which this serves as a wrapper for).
 	 * <p>For example: {@code ResolvableType.forRawClass(List.class)}.
 	 * @param clazz the class to introspect ({@code null} is semantically
 	 * equivalent to {@code Object.class} for typical use cases here)
-	 * @return a {@link ResolvableType} for the specified class
+	 * @return a {@code ResolvableType} for the specified class
 	 * @since 4.2
 	 * @see #forClass(Class)
 	 * @see #getRawClass()
@@ -1055,12 +1058,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified base type
+	 * Return a {@code ResolvableType} for the specified base type
 	 * (interface or base class) with a given implementation class.
 	 * <p>For example: {@code ResolvableType.forClass(List.class, MyArrayList.class)}.
 	 * @param baseType the base type (must not be {@code null})
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified base type backed by the
+	 * @return a {@code ResolvableType} for the specified base type backed by the
 	 * given implementation class
 	 * @see #forClass(Class)
 	 * @see #forClassWithGenerics(Class, Class...)
@@ -1072,10 +1075,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
+	 * Return a {@code ResolvableType} for the specified {@link Class} with pre-declared generics.
 	 * @param clazz the class (or interface) to introspect
 	 * @param generics the generics of the class
-	 * @return a {@link ResolvableType} for the specific class and generics
+	 * @return a {@code ResolvableType} for the specific class and generics
 	 * @see #forClassWithGenerics(Class, ResolvableType...)
 	 */
 	public static ResolvableType forClassWithGenerics(Class<?> clazz, Class<?>... generics) {
@@ -1089,10 +1092,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Class} with pre-declared generics.
+	 * Return a {@code ResolvableType} for the specified {@link Class} with pre-declared generics.
 	 * @param clazz the class (or interface) to introspect
 	 * @param generics the generics of the class
-	 * @return a {@link ResolvableType} for the specific class and generics
+	 * @return a {@code ResolvableType} for the specific class and generics
 	 * @see #forClassWithGenerics(Class, Class...)
 	 */
 	public static ResolvableType forClassWithGenerics(Class<?> clazz, ResolvableType... generics) {
@@ -1113,12 +1116,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified instance. The instance does not
+	 * Return a {@code ResolvableType} for the specified instance. The instance does not
 	 * convey generic information but if it implements {@link ResolvableTypeProvider} a
-	 * more precise {@link ResolvableType} can be used than the simple one based on
+	 * more precise {@code ResolvableType} can be used than the simple one based on
 	 * the {@link #forClass(Class) Class instance}.
 	 * @param instance the instance (possibly {@code null})
-	 * @return a {@link ResolvableType} for the specified instance,
+	 * @return a {@code ResolvableType} for the specified instance,
 	 * or {@code NONE} for {@code null}
 	 * @since 4.2
 	 * @see ResolvableTypeProvider
@@ -1134,9 +1137,9 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Field}.
+	 * Return a {@code ResolvableType} for the specified {@link Field}.
 	 * @param field the source field
-	 * @return a {@link ResolvableType} for the specified field
+	 * @return a {@code ResolvableType} for the specified field
 	 * @see #forField(Field, Class)
 	 */
 	public static ResolvableType forField(Field field) {
@@ -1145,13 +1148,13 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Field} with a given
+	 * Return a {@code ResolvableType} for the specified {@link Field} with a given
 	 * implementation.
 	 * <p>Use this variant when the class that declares the field includes generic
 	 * parameter variables that are satisfied by the implementation class.
 	 * @param field the source field
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified field
+	 * @return a {@code ResolvableType} for the specified field
 	 * @see #forField(Field)
 	 */
 	public static ResolvableType forField(Field field, Class<?> implementationClass) {
@@ -1161,13 +1164,13 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Field} with a given
+	 * Return a {@code ResolvableType} for the specified {@link Field} with a given
 	 * implementation.
 	 * <p>Use this variant when the class that declares the field includes generic
 	 * parameter variables that are satisfied by the implementation type.
 	 * @param field the source field
 	 * @param implementationType the implementation type
-	 * @return a {@link ResolvableType} for the specified field
+	 * @return a {@code ResolvableType} for the specified field
 	 * @see #forField(Field)
 	 */
 	public static ResolvableType forField(Field field, @Nullable ResolvableType implementationType) {
@@ -1178,7 +1181,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Field} with the
+	 * Return a {@code ResolvableType} for the specified {@link Field} with the
 	 * given nesting level.
 	 * @param field the source field
 	 * @param nestingLevel the nesting level (1 for the outer level; 2 for a nested
@@ -1191,7 +1194,7 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Field} with a given
+	 * Return a {@code ResolvableType} for the specified {@link Field} with a given
 	 * implementation and the given nesting level.
 	 * <p>Use this variant when the class that declares the field includes generic
 	 * parameter variables that are satisfied by the implementation class.
@@ -1199,7 +1202,7 @@ public class ResolvableType implements Serializable {
 	 * @param nestingLevel the nesting level (1 for the outer level; 2 for a nested
 	 * generic type; etc)
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified field
+	 * @return a {@code ResolvableType} for the specified field
 	 * @see #forField(Field)
 	 */
 	public static ResolvableType forField(Field field, int nestingLevel, @Nullable Class<?> implementationClass) {
@@ -1209,10 +1212,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Constructor} parameter.
+	 * Return a {@code ResolvableType} for the specified {@link Constructor} parameter.
 	 * @param constructor the source constructor (must not be {@code null})
 	 * @param parameterIndex the parameter index
-	 * @return a {@link ResolvableType} for the specified constructor parameter
+	 * @return a {@code ResolvableType} for the specified constructor parameter
 	 * @see #forConstructorParameter(Constructor, int, Class)
 	 */
 	public static ResolvableType forConstructorParameter(Constructor<?> constructor, int parameterIndex) {
@@ -1221,14 +1224,14 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Constructor} parameter
+	 * Return a {@code ResolvableType} for the specified {@link Constructor} parameter
 	 * with a given implementation. Use this variant when the class that declares the
 	 * constructor includes generic parameter variables that are satisfied by the
 	 * implementation class.
 	 * @param constructor the source constructor (must not be {@code null})
 	 * @param parameterIndex the parameter index
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified constructor parameter
+	 * @return a {@code ResolvableType} for the specified constructor parameter
 	 * @see #forConstructorParameter(Constructor, int)
 	 */
 	public static ResolvableType forConstructorParameter(Constructor<?> constructor, int parameterIndex,
@@ -1240,9 +1243,9 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Method} return type.
+	 * Return a {@code ResolvableType} for the specified {@link Method} return type.
 	 * @param method the source for the method return type
-	 * @return a {@link ResolvableType} for the specified method return
+	 * @return a {@code ResolvableType} for the specified method return
 	 * @see #forMethodReturnType(Method, Class)
 	 */
 	public static ResolvableType forMethodReturnType(Method method) {
@@ -1251,12 +1254,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Method} return type.
+	 * Return a {@code ResolvableType} for the specified {@link Method} return type.
 	 * <p>Use this variant when the class that declares the method includes generic
 	 * parameter variables that are satisfied by the implementation class.
 	 * @param method the source for the method return type
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified method return
+	 * @return a {@code ResolvableType} for the specified method return
 	 * @see #forMethodReturnType(Method)
 	 */
 	public static ResolvableType forMethodReturnType(Method method, Class<?> implementationClass) {
@@ -1266,10 +1269,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Method} parameter.
+	 * Return a {@code ResolvableType} for the specified {@link Method} parameter.
 	 * @param method the source method (must not be {@code null})
 	 * @param parameterIndex the parameter index
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @see #forMethodParameter(Method, int, Class)
 	 * @see #forMethodParameter(MethodParameter)
 	 */
@@ -1279,13 +1282,13 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Method} parameter with a
+	 * Return a {@code ResolvableType} for the specified {@link Method} parameter with a
 	 * given implementation. Use this variant when the class that declares the method
 	 * includes generic parameter variables that are satisfied by the implementation class.
 	 * @param method the source method (must not be {@code null})
 	 * @param parameterIndex the parameter index
 	 * @param implementationClass the implementation class
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @see #forMethodParameter(Method, int, Class)
 	 * @see #forMethodParameter(MethodParameter)
 	 */
@@ -1296,9 +1299,9 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link MethodParameter}.
+	 * Return a {@code ResolvableType} for the specified {@link MethodParameter}.
 	 * @param methodParameter the source method parameter (must not be {@code null})
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @see #forMethodParameter(Method, int)
 	 */
 	public static ResolvableType forMethodParameter(MethodParameter methodParameter) {
@@ -1306,12 +1309,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link MethodParameter} with a
+	 * Return a {@code ResolvableType} for the specified {@link MethodParameter} with a
 	 * given implementation type. Use this variant when the class that declares the method
 	 * includes generic parameter variables that are satisfied by the implementation type.
 	 * @param methodParameter the source method parameter (must not be {@code null})
 	 * @param implementationType the implementation type
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @see #forMethodParameter(MethodParameter)
 	 */
 	public static ResolvableType forMethodParameter(MethodParameter methodParameter,
@@ -1326,11 +1329,11 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link MethodParameter},
+	 * Return a {@code ResolvableType} for the specified {@link MethodParameter},
 	 * overriding the target type to resolve with a specific given type.
 	 * @param methodParameter the source method parameter (must not be {@code null})
 	 * @param targetType the type to resolve (a part of the method parameter's type)
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @see #forMethodParameter(Method, int)
 	 */
 	public static ResolvableType forMethodParameter(MethodParameter methodParameter, @Nullable Type targetType) {
@@ -1339,13 +1342,13 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link MethodParameter} at
+	 * Return a {@code ResolvableType} for the specified {@link MethodParameter} at
 	 * a specific nesting level, overriding the target type to resolve with a specific
 	 * given type.
 	 * @param methodParameter the source method parameter (must not be {@code null})
 	 * @param targetType the type to resolve (a part of the method parameter's type)
 	 * @param nestingLevel the nesting level to use
-	 * @return a {@link ResolvableType} for the specified method parameter
+	 * @return a {@code ResolvableType} for the specified method parameter
 	 * @since 5.2
 	 * @see #forMethodParameter(Method, int)
 	 */
@@ -1358,9 +1361,9 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} as an array of the specified {@code componentType}.
+	 * Return a {@code ResolvableType} as an array of the specified {@code componentType}.
 	 * @param componentType the component type
-	 * @return a {@link ResolvableType} as an array of the specified component type
+	 * @return a {@code ResolvableType} as an array of the specified component type
 	 */
 	public static ResolvableType forArrayComponent(ResolvableType componentType) {
 		Assert.notNull(componentType, "Component type must not be null");
@@ -1369,10 +1372,10 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Type}.
-	 * <p>Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}.
+	 * Return a {@code ResolvableType} for the specified {@link Type}.
+	 * <p>Note: The resulting {@code ResolvableType} instance may not be {@link Serializable}.
 	 * @param type the source type (potentially {@code null})
-	 * @return a {@link ResolvableType} for the specified {@link Type}
+	 * @return a {@code ResolvableType} for the specified {@link Type}
 	 * @see #forType(Type, ResolvableType)
 	 */
 	public static ResolvableType forType(@Nullable Type type) {
@@ -1380,12 +1383,12 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Type} backed by the given
+	 * Return a {@code ResolvableType} for the specified {@link Type} backed by the given
 	 * owner type.
-	 * <p>Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}.
+	 * <p>Note: The resulting {@code ResolvableType} instance may not be {@link Serializable}.
 	 * @param type the source type or {@code null}
 	 * @param owner the owner type used to resolve variables
-	 * @return a {@link ResolvableType} for the specified {@link Type} and owner
+	 * @return a {@code ResolvableType} for the specified {@link Type} and owner
 	 * @see #forType(Type)
 	 */
 	public static ResolvableType forType(@Nullable Type type, @Nullable ResolvableType owner) {
@@ -1398,10 +1401,10 @@ public class ResolvableType implements Serializable {
 
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link ParameterizedTypeReference}.
-	 * <p>Note: The resulting {@link ResolvableType} instance may not be {@link Serializable}.
+	 * Return a {@code ResolvableType} for the specified {@link ParameterizedTypeReference}.
+	 * <p>Note: The resulting {@code ResolvableType} instance may not be {@link Serializable}.
 	 * @param typeReference the reference to obtain the source type from
-	 * @return a {@link ResolvableType} for the specified {@link ParameterizedTypeReference}
+	 * @return a {@code ResolvableType} for the specified {@link ParameterizedTypeReference}
 	 * @since 4.3.12
 	 * @see #forType(Type)
 	 */
@@ -1410,23 +1413,23 @@ public class ResolvableType implements Serializable {
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Type} backed by a given
+	 * Return a {@code ResolvableType} for the specified {@link Type} backed by a given
 	 * {@link VariableResolver}.
 	 * @param type the source type or {@code null}
 	 * @param variableResolver the variable resolver or {@code null}
-	 * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
+	 * @return a {@code ResolvableType} for the specified {@link Type} and {@link VariableResolver}
 	 */
 	static ResolvableType forType(@Nullable Type type, @Nullable VariableResolver variableResolver) {
 		return forType(type, null, variableResolver);
 	}
 
 	/**
-	 * Return a {@link ResolvableType} for the specified {@link Type} backed by a given
+	 * Return a {@code ResolvableType} for the specified {@link Type} backed by a given
 	 * {@link VariableResolver}.
 	 * @param type the source type or {@code null}
 	 * @param typeProvider the type provider or {@code null}
 	 * @param variableResolver the variable resolver or {@code null}
-	 * @return a {@link ResolvableType} for the specified {@link Type} and {@link VariableResolver}
+	 * @return a {@code ResolvableType} for the specified {@link Type} and {@link VariableResolver}
 	 */
 	static ResolvableType forType(
 			@Nullable Type type, @Nullable TypeProvider typeProvider, @Nullable VariableResolver variableResolver) {

spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -429,8 +429,9 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 					String filePath = new File(path).getAbsolutePath();
 					int prefixIndex = filePath.indexOf(':');
 					if (prefixIndex == 1) {
-						// Possibly "c:" drive prefix on Windows, to be upper-cased for proper duplicate detection
-						filePath = StringUtils.capitalize(filePath);
+						// Possibly a drive prefix on Windows (for example, "c:"), so we prepend a slash
+						// and convert the drive letter to uppercase for consistent duplicate detection.
+						filePath = "/" + StringUtils.capitalize(filePath);
 					}
 					// # can appear in directories/filenames, java.net.URL should not treat it as a fragment
 					filePath = StringUtils.replace(filePath, "#", "%23");

spring-core/src/main/java/org/springframework/util/backoff/ExponentialBackOff.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@ import org.springframework.util.Assert;
 
 /**
  * Implementation of {@link BackOff} that increases the back off period for each
- * retry attempt. When the interval has reached the {@link #setMaxInterval(long)
+ * retry attempt. When the interval has reached the {@linkplain #setMaxInterval
  * max interval}, it is no longer increased. Stops retrying once the
- * {@link #setMaxElapsedTime(long) max elapsed time} has been reached.
+ * {@linkplain #setMaxElapsedTime max elapsed time} has been reached.
  *
- * <p>Example: The default interval is {@value #DEFAULT_INITIAL_INTERVAL} ms,
- * the default multiplier is {@value #DEFAULT_MULTIPLIER}, and the default max
+ * <p>Example: The default interval is {@value #DEFAULT_INITIAL_INTERVAL} ms;
+ * the default multiplier is {@value #DEFAULT_MULTIPLIER}; and the default max
  * interval is {@value #DEFAULT_MAX_INTERVAL}. For 10 attempts the sequence will be
  * as follows:
  *
@@ -44,10 +44,9 @@ import org.springframework.util.Assert;
  * 10             30000
  * </pre>
  *
- * <p>Note that the default max elapsed time is {@link Long#MAX_VALUE}. Use
- * {@link #setMaxElapsedTime(long)} to limit the maximum length of time
- * that an instance should accumulate before returning
- * {@link BackOffExecution#STOP}.
+ * <p>Note that the default max elapsed time is {@link Long#MAX_VALUE}.
+ * Use {@link #setMaxElapsedTime} to limit the maximum length of time that an
+ * instance should accumulate before returning {@link BackOffExecution#STOP}.
  *
  * @author Stephane Nicoll
  * @since 4.1
@@ -107,7 +106,7 @@ public class ExponentialBackOff implements BackOff {
 
 
 	/**
-	 * The initial interval in milliseconds.
+	 * Set the initial interval in milliseconds.
 	 */
 	public void setInitialInterval(long initialInterval) {
 		this.initialInterval = initialInterval;
@@ -121,7 +120,7 @@ public class ExponentialBackOff implements BackOff {
 	}
 
 	/**
-	 * The value to multiply the current interval by for each retry attempt.
+	 * Set the value to multiply the current interval by for each retry attempt.
 	 */
 	public void setMultiplier(double multiplier) {
 		checkMultiplier(multiplier);
@@ -136,21 +135,21 @@ public class ExponentialBackOff implements BackOff {
 	}
 
 	/**
-	 * The maximum back off time.
+	 * Set the maximum back off time in milliseconds.
 	 */
 	public void setMaxInterval(long maxInterval) {
 		this.maxInterval = maxInterval;
 	}
 
 	/**
-	 * Return the maximum back off time.
+	 * Return the maximum back off time in milliseconds.
 	 */
 	public long getMaxInterval() {
 		return this.maxInterval;
 	}
 
 	/**
-	 * The maximum elapsed time in milliseconds after which a call to
+	 * Set the maximum elapsed time in milliseconds after which a call to
 	 * {@link BackOffExecution#nextBackOff()} returns {@link BackOffExecution#STOP}.
 	 */
 	public void setMaxElapsedTime(long maxElapsedTime) {
@@ -184,10 +183,9 @@ public class ExponentialBackOff implements BackOff {
 
 		@Override
 		public long nextBackOff() {
-			if (this.currentElapsedTime >= maxElapsedTime) {
+			if (this.currentElapsedTime >= getMaxElapsedTime()) {
 				return STOP;
 			}
-
 			long nextInterval = computeNextInterval();
 			this.currentElapsedTime += nextInterval;
 			return nextInterval;
@@ -214,7 +212,6 @@ public class ExponentialBackOff implements BackOff {
 			return Math.min(i, maxInterval);
 		}
 
-
 		@Override
 		public String toString() {
 			StringBuilder sb = new StringBuilder("ExponentialBackOff{");

spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -200,8 +200,8 @@ class ResolvableTypeTests {
 	@Test
 	void forFieldMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forField(null))
-			.withMessage("Field must not be null");
+				.isThrownBy(() -> ResolvableType.forField(null))
+				.withMessage("Field must not be null");
 	}
 
 	@Test
@@ -214,8 +214,8 @@ class ResolvableTypeTests {
 	@Test
 	void forConstructorParameterMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forConstructorParameter(null, 0))
-			.withMessage("Constructor must not be null");
+				.isThrownBy(() -> ResolvableType.forConstructorParameter(null, 0))
+				.withMessage("Constructor must not be null");
 	}
 
 	@Test
@@ -228,8 +228,8 @@ class ResolvableTypeTests {
 	@Test
 	void forMethodParameterByIndexMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forMethodParameter(null, 0))
-			.withMessage("Method must not be null");
+				.isThrownBy(() -> ResolvableType.forMethodParameter(null, 0))
+				.withMessage("Method must not be null");
 	}
 
 	@Test
@@ -268,8 +268,8 @@ class ResolvableTypeTests {
 	@Test
 	void forMethodParameterMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forMethodParameter(null))
-			.withMessage("MethodParameter must not be null");
+				.isThrownBy(() -> ResolvableType.forMethodParameter(null))
+				.withMessage("MethodParameter must not be null");
 	}
 
 	@Test  // SPR-16210
@@ -295,8 +295,8 @@ class ResolvableTypeTests {
 	@Test
 	void forMethodReturnMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forMethodReturnType(null))
-			.withMessage("Method must not be null");
+				.isThrownBy(() -> ResolvableType.forMethodReturnType(null))
+				.withMessage("Method must not be null");
 	}
 
 	@Test
@@ -343,7 +343,7 @@ class ResolvableTypeTests {
 		ResolvableType type = ResolvableType.forField(field);
 		assertThat(type.isArray()).isTrue();
 		assertThat(type.getComponentType().getType())
-			.isEqualTo(((Class) field.getGenericType()).getComponentType());
+				.isEqualTo(((Class) field.getGenericType()).getComponentType());
 	}
 
 	@Test
@@ -535,7 +535,7 @@ class ResolvableTypeTests {
 	void getGenericsFromParameterizedType() throws Exception {
 		ResolvableType type = ResolvableType.forClass(List.class, ExtendsList.class);
 		ResolvableType[] generics = type.getGenerics();
-		assertThat(generics.length).isEqualTo(1);
+		assertThat(generics).hasSize(1);
 		assertThat(generics[0].resolve()).isEqualTo(CharSequence.class);
 	}
 
@@ -543,7 +543,7 @@ class ResolvableTypeTests {
 	void getGenericsFromClass() throws Exception {
 		ResolvableType type = ResolvableType.forClass(List.class);
 		ResolvableType[] generics = type.getGenerics();
-		assertThat(generics.length).isEqualTo(1);
+		assertThat(generics).hasSize(1);
 		assertThat(generics[0].getType().toString()).isEqualTo("E");
 	}
 
@@ -558,7 +558,7 @@ class ResolvableTypeTests {
 	void getResolvedGenerics() throws Exception {
 		ResolvableType type = ResolvableType.forClass(List.class, ExtendsList.class);
 		Class<?>[] generics = type.resolveGenerics();
-		assertThat(generics.length).isEqualTo(1);
+		assertThat(generics).hasSize(1);
 		assertThat(generics[0]).isEqualTo(CharSequence.class);
 	}
 
@@ -686,7 +686,6 @@ class ResolvableTypeTests {
 		assertThat(type.resolve()).isEqualTo(CharSequence.class);
 	}
 
-
 	@Test
 	void resolveBoundedTypeVariableWildcardResult() throws Exception {
 		ResolvableType type = ResolvableType.forMethodReturnType(Methods.class.getMethod("boundedTypeVariableWildcardResult"));
@@ -701,30 +700,26 @@ class ResolvableTypeTests {
 
 	@Test
 	void resolveTypeVariableFromSimpleInterfaceType() {
-		ResolvableType type = ResolvableType.forClass(
-				MySimpleInterfaceType.class).as(MyInterfaceType.class);
+		ResolvableType type = ResolvableType.forClass(MySimpleInterfaceType.class).as(MyInterfaceType.class);
 		assertThat(type.resolveGeneric()).isEqualTo(String.class);
 	}
 
 	@Test
 	void resolveTypeVariableFromSimpleCollectionInterfaceType() {
-		ResolvableType type = ResolvableType.forClass(
-				MyCollectionInterfaceType.class).as(MyInterfaceType.class);
+		ResolvableType type = ResolvableType.forClass(MyCollectionInterfaceType.class).as(MyInterfaceType.class);
 		assertThat(type.resolveGeneric()).isEqualTo(Collection.class);
 		assertThat(type.resolveGeneric(0, 0)).isEqualTo(String.class);
 	}
 
 	@Test
 	void resolveTypeVariableFromSimpleSuperclassType() {
-		ResolvableType type = ResolvableType.forClass(
-				MySimpleSuperclassType.class).as(MySuperclassType.class);
+		ResolvableType type = ResolvableType.forClass(MySimpleSuperclassType.class).as(MySuperclassType.class);
 		assertThat(type.resolveGeneric()).isEqualTo(String.class);
 	}
 
 	@Test
 	void resolveTypeVariableFromSimpleCollectionSuperclassType() {
-		ResolvableType type = ResolvableType.forClass(
-				MyCollectionSuperclassType.class).as(MySuperclassType.class);
+		ResolvableType type = ResolvableType.forClass(MyCollectionSuperclassType.class).as(MySuperclassType.class);
 		assertThat(type.resolveGeneric()).isEqualTo(Collection.class);
 		assertThat(type.resolveGeneric(0, 0)).isEqualTo(String.class);
 	}
@@ -751,8 +746,7 @@ class ResolvableTypeTests {
 	void resolveTypeVariableFromSuperType() throws Exception {
 		ResolvableType type = ResolvableType.forClass(ExtendsList.class);
 		assertThat(type.resolve()).isEqualTo(ExtendsList.class);
-		assertThat(type.asCollection().resolveGeneric())
-			.isEqualTo(CharSequence.class);
+		assertThat(type.asCollection().resolveGeneric()).isEqualTo(CharSequence.class);
 	}
 
 	@Test
@@ -964,8 +958,8 @@ class ResolvableTypeTests {
 	@Test
 	void isAssignableFromMustNotBeNull() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forClass(Object.class).isAssignableFrom((ResolvableType) null))
-			.withMessage("ResolvableType must not be null");
+				.isThrownBy(() -> ResolvableType.forClass(Object.class).isAssignableFrom((ResolvableType) null))
+				.withMessage("ResolvableType must not be null");
 	}
 
 	@Test
@@ -1004,6 +998,7 @@ class ResolvableTypeTests {
 	void isAssignableFromCannotBeResolved() throws Exception {
 		ResolvableType objectType = ResolvableType.forClass(Object.class);
 		ResolvableType unresolvableVariable = ResolvableType.forField(AssignmentBase.class.getField("o"));
+
 		assertThat(unresolvableVariable.resolve()).isNull();
 		assertThatResolvableType(objectType).isAssignableFrom(unresolvableVariable);
 		assertThatResolvableType(unresolvableVariable).isAssignableFrom(objectType);
@@ -1220,9 +1215,9 @@ class ResolvableTypeTests {
 	@Test
 	void forClassWithMismatchedGenerics() throws Exception {
 		assertThatIllegalArgumentException()
-			.isThrownBy(() -> ResolvableType.forClassWithGenerics(Map.class, Integer.class))
-			.withMessageContaining("Mismatched number of generics specified for")
-			.withMessageContaining("java.util.Map<K,V>");
+				.isThrownBy(() -> ResolvableType.forClassWithGenerics(Map.class, Integer.class))
+				.withMessageContaining("Mismatched number of generics specified for")
+				.withMessageContaining("java.util.Map<K,V>");
 	}
 
 	@Test
@@ -1277,7 +1272,7 @@ class ResolvableTypeTests {
 	}
 
 	@Test
-	void hasUnresolvableGenericsWhenImplementesRawInterface() throws Exception {
+	void hasUnresolvableGenericsWhenImplementingRawInterface() throws Exception {
 		ResolvableType type = ResolvableType.forClass(MySimpleInterfaceTypeWithImplementsRaw.class);
 		for (ResolvableType generic : type.getGenerics()) {
 			assertThat(generic.resolve()).isNotNull();
@@ -1307,7 +1302,7 @@ class ResolvableTypeTests {
 		Type type = resolvableType.getType();
 		assertThat(type).isInstanceOf(ParameterizedType.class);
 		assertThat(((ParameterizedType) type).getRawType()).isEqualTo(Callable.class);
-		assertThat(((ParameterizedType) type).getActualTypeArguments().length).isEqualTo(1);
+		assertThat(((ParameterizedType) type).getActualTypeArguments()).hasSize(1);
 		assertThat(((ParameterizedType) type).getActualTypeArguments()[0]).isEqualTo(String.class);
 	}
 

spring-core/src/test/java/org/springframework/util/ConcurrentLruCacheTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -21,13 +21,39 @@ import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
+ * Tests for {@link ConcurrentLruCache}.
+ *
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
 class ConcurrentLruCacheTests {
 
 	private final ConcurrentLruCache<String, String> cache = new ConcurrentLruCache<>(2, key -> key + "value");
 
 
+	@Test
+	void zeroCapacity() {
+		ConcurrentLruCache<String, String> cache = new ConcurrentLruCache<>(0, key -> key + "value");
+
+		assertThat(cache.sizeLimit()).isZero();
+		assertThat(cache.size()).isZero();
+
+		assertThat(cache.get("k1")).isEqualTo("k1value");
+		assertThat(cache.size()).isZero();
+		assertThat(cache.contains("k1")).isFalse();
+
+		assertThat(cache.get("k2")).isEqualTo("k2value");
+		assertThat(cache.size()).isZero();
+		assertThat(cache.contains("k1")).isFalse();
+		assertThat(cache.contains("k2")).isFalse();
+
+		assertThat(cache.get("k3")).isEqualTo("k3value");
+		assertThat(cache.size()).isZero();
+		assertThat(cache.contains("k1")).isFalse();
+		assertThat(cache.contains("k2")).isFalse();
+		assertThat(cache.contains("k3")).isFalse();
+	}
+
 	@Test
 	void getAndSize() {
 		assertThat(this.cache.sizeLimit()).isEqualTo(2);

spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -154,9 +154,12 @@ final class LogAdapter {
 		private static final LoggerContext loggerContext =
 				LogManager.getContext(Log4jLog.class.getClassLoader(), false);
 
-		private final ExtendedLogger logger;
+		private final String name;
+
+		private final transient ExtendedLogger logger;
 
 		public Log4jLog(String name) {
+			this.name = name;
 			LoggerContext context = loggerContext;
 			if (context == null) {
 				// Circular call in early-init scenario -> static field not initialized yet
@@ -270,6 +273,10 @@ final class LogAdapter {
 				this.logger.logIfEnabled(FQCN, level, null, message, exception);
 			}
 		}
+
+		protected Object readResolve() {
+			return new Log4jLog(this.name);
+		}
 	}
 
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java

@@ -406,8 +406,11 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 
 	/**
 	 * Retrieve a JDBC object value for the specified column.
-	 * <p>The default implementation delegates to
-	 * {@link #getColumnValue(ResultSet, int, Class)}.
+	 * <p>The default implementation calls
+	 * {@link JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)}
+	 * using the type of the specified {@link PropertyDescriptor}.
+	 * <p>Subclasses may override this to check specific value types upfront,
+	 * or to post-process values returned from {@code getResultSetValue}.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
 	 * @param pd the bean property that each result object is expected to match
@@ -424,8 +427,8 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	 * Retrieve a JDBC object value for the specified column.
 	 * <p>The default implementation calls
 	 * {@link JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)}.
-	 * Subclasses may override this to check specific value types upfront,
-	 * or to post-process values return from {@code getResultSetValue}.
+	 * <p>Subclasses may override this to check specific value types upfront,
+	 * or to post-process values returned from {@code getResultSetValue}.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
 	 * @param paramType the target parameter type

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.jdbc.core.metadata;
 
-import java.sql.DatabaseMetaData;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -115,28 +114,28 @@ public class CallMetaDataContext {
 	}
 
 	/**
-	 * Specify a limited set of in parameters to be used.
+	 * Specify a limited set of the {@code in} parameters to be used.
 	 */
 	public void setLimitedInParameterNames(Set<String> limitedInParameterNames) {
 		this.limitedInParameterNames = limitedInParameterNames;
 	}
 
 	/**
-	 * Get a limited set of in parameters to be used.
+	 * Get the limited set of the {@code in} parameters to be used.
 	 */
 	public Set<String> getLimitedInParameterNames() {
 		return this.limitedInParameterNames;
 	}
 
 	/**
-	 * Specify the names of the out parameters.
+	 * Specify the names of the {@code out} parameters.
 	 */
 	public void setOutParameterNames(List<String> outParameterNames) {
 		this.outParameterNames = outParameterNames;
 	}
 
 	/**
-	 * Get a list of the out parameter names.
+	 * Get the list of the {@code out} parameter names.
 	 */
 	public List<String> getOutParameterNames() {
 		return this.outParameterNames;
@@ -434,14 +433,14 @@ public class CallMetaDataContext {
 					if (paramNameToUse == null) {
 						paramNameToUse = "";
 					}
-					if (meta.getParameterType() == DatabaseMetaData.procedureColumnOut) {
+					if (meta.isOutParameter()) {
 						workParams.add(provider.createDefaultOutParameter(paramNameToUse, meta));
 						outParamNames.add(paramNameToUse);
 						if (logger.isDebugEnabled()) {
 							logger.debug("Added meta-data out parameter for '" + paramNameToUse + "'");
 						}
 					}
-					else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
+					else if (meta.isInOutParameter()) {
 						workParams.add(provider.createDefaultInOutParameter(paramNameToUse, meta));
 						outParamNames.add(paramNameToUse);
 						if (logger.isDebugEnabled()) {
@@ -554,7 +553,7 @@ public class CallMetaDataContext {
 		Map<String, String> callParameterNames = CollectionUtils.newHashMap(this.callParameters.size());
 		for (SqlParameter parameter : this.callParameters) {
 			if (parameter.isInputValueProvided()) {
-				String parameterName =  parameter.getName();
+				String parameterName = parameter.getName();
 				String parameterNameToMatch = provider.parameterNameToUse(parameterName);
 				if (parameterNameToMatch != null) {
 					callParameterNames.put(parameterNameToMatch.toLowerCase(), parameterName);
@@ -606,7 +605,7 @@ public class CallMetaDataContext {
 		int i = 0;
 		for (SqlParameter parameter : this.callParameters) {
 			if (parameter.isInputValueProvided()) {
-				String parameterName =  parameter.getName();
+				String parameterName = parameter.getName();
 				matchedParameters.put(parameterName, parameterValues[i++]);
 			}
 		}

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallParameterMetaData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -107,6 +107,28 @@ public class CallParameterMetaData {
 						this.parameterType == DatabaseMetaData.procedureColumnResult));
 	}
 
+	/**
+	 * Determine whether the declared parameter qualifies as an 'out' parameter
+	 * for our purposes: type {@link DatabaseMetaData#procedureColumnOut},
+	 * or in case of a function, {@link DatabaseMetaData#functionColumnOut}.
+	 * @since 5.3.31
+	 */
+	public boolean isOutParameter() {
+		return (this.function ? this.parameterType == DatabaseMetaData.functionColumnOut :
+				this.parameterType == DatabaseMetaData.procedureColumnOut);
+	}
+
+	/**
+	 * Determine whether the declared parameter qualifies as an 'in-out' parameter
+	 * for our purposes: type {@link DatabaseMetaData#procedureColumnInOut},
+	 * or in case of a function, {@link DatabaseMetaData#functionColumnInOut}.
+	 * @since 5.3.31
+	 */
+	public boolean isInOutParameter() {
+		return (this.function ? this.parameterType == DatabaseMetaData.functionColumnInOut :
+				this.parameterType == DatabaseMetaData.procedureColumnInOut);
+	}
+
 	/**
 	 * Return the parameter SQL type.
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -35,7 +35,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * A generic implementation of the {@link CallMetaDataProvider} interface.
- * This class can be extended to provide database specific behavior.
+ *
+ * <p>This class can be extended to provide database specific behavior.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
@@ -113,7 +114,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 			@Nullable String schemaName, @Nullable String procedureName) throws SQLException {
 
 		this.procedureColumnMetaDataUsed = true;
-		processProcedureColumns(databaseMetaData, catalogName, schemaName,  procedureName);
+		processProcedureColumns(databaseMetaData, catalogName, schemaName, procedureName);
 	}
 
 	@Override
@@ -124,52 +125,19 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	@Override
 	@Nullable
 	public String procedureNameToUse(@Nullable String procedureName) {
-		if (procedureName == null) {
-			return null;
-		}
-		else if (isStoresUpperCaseIdentifiers()) {
-			return procedureName.toUpperCase();
-		}
-		else if (isStoresLowerCaseIdentifiers()) {
-			return procedureName.toLowerCase();
-		}
-		else {
-			return procedureName;
-		}
+		return identifierNameToUse(procedureName);
 	}
 
 	@Override
 	@Nullable
 	public String catalogNameToUse(@Nullable String catalogName) {
-		if (catalogName == null) {
-			return null;
-		}
-		else if (isStoresUpperCaseIdentifiers()) {
-			return catalogName.toUpperCase();
-		}
-		else if (isStoresLowerCaseIdentifiers()) {
-			return catalogName.toLowerCase();
-		}
-		else {
-			return catalogName;
-		}
+		return identifierNameToUse(catalogName);
 	}
 
 	@Override
 	@Nullable
 	public String schemaNameToUse(@Nullable String schemaName) {
-		if (schemaName == null) {
-			return null;
-		}
-		else if (isStoresUpperCaseIdentifiers()) {
-			return schemaName.toUpperCase();
-		}
-		else if (isStoresLowerCaseIdentifiers()) {
-			return schemaName.toLowerCase();
-		}
-		else {
-			return schemaName;
-		}
+		return identifierNameToUse(schemaName);
 	}
 
 	@Override
@@ -197,18 +165,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	@Override
 	@Nullable
 	public String parameterNameToUse(@Nullable String parameterName) {
-		if (parameterName == null) {
-			return null;
-		}
-		else if (isStoresUpperCaseIdentifiers()) {
-			return parameterName.toUpperCase();
-		}
-		else if (isStoresLowerCaseIdentifiers()) {
-			return parameterName.toLowerCase();
-		}
-		else {
-			return parameterName;
-		}
+		return identifierNameToUse(parameterName);
 	}
 
 	@Override
@@ -316,6 +273,22 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	}
 
 
+	@Nullable
+	private String identifierNameToUse(@Nullable String identifierName) {
+		if (identifierName == null) {
+			return null;
+		}
+		else if (isStoresUpperCaseIdentifiers()) {
+			return identifierName.toUpperCase();
+		}
+		else if (isStoresLowerCaseIdentifiers()) {
+			return identifierName.toLowerCase();
+		}
+		else {
+			return identifierName;
+		}
+	}
+
 	/**
 	 * Process the procedure column meta-data.
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -526,17 +526,6 @@ public interface NamedParameterJdbcOperations {
 	int update(String sql, SqlParameterSource paramSource, KeyHolder generatedKeyHolder, String[] keyColumnNames)
 			throws DataAccessException;
 
-	/**
-	 * Executes a batch using the supplied SQL statement with the batch of supplied arguments.
-	 * @param sql the SQL statement to execute
-	 * @param batchValues the array of Maps containing the batch of arguments for the query
-	 * @return an array containing the numbers of rows affected by each update in the batch
-	 * (may also contain special JDBC-defined negative values for affected rows such as
-	 * {@link java.sql.Statement#SUCCESS_NO_INFO}/{@link java.sql.Statement#EXECUTE_FAILED})
-	 * @throws DataAccessException if there is any problem issuing the update
-	 */
-	int[] batchUpdate(String sql, Map<String, ?>[] batchValues);
-
 	/**
 	 * Execute a batch using the supplied SQL statement with the batch of supplied arguments.
 	 * @param sql the SQL statement to execute
@@ -549,4 +538,15 @@ public interface NamedParameterJdbcOperations {
 	 */
 	int[] batchUpdate(String sql, SqlParameterSource[] batchArgs);
 
+	/**
+	 * Executes a batch using the supplied SQL statement with the batch of supplied arguments.
+	 * @param sql the SQL statement to execute
+	 * @param batchValues the array of Maps containing the batch of arguments for the query
+	 * @return an array containing the numbers of rows affected by each update in the batch
+	 * (may also contain special JDBC-defined negative values for affected rows such as
+	 * {@link java.sql.Statement#SUCCESS_NO_INFO}/{@link java.sql.Statement#EXECUTE_FAILED})
+	 * @throws DataAccessException if there is any problem issuing the update
+	 */
+	int[] batchUpdate(String sql, Map<String, ?>[] batchValues);
+
 }

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java

@@ -359,11 +359,6 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 		return getJdbcOperations().update(psc, generatedKeyHolder);
 	}
 
-	@Override
-	public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
-		return batchUpdate(sql, SqlParameterSourceUtils.createBatch(batchValues));
-	}
-
 	@Override
 	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs) {
 		if (batchArgs.length == 0) {
@@ -388,6 +383,11 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 				});
 	}
 
+	@Override
+	public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
+		return batchUpdate(sql, SqlParameterSourceUtils.createBatch(batchValues));
+	}
+
 
 	/**
 	 * Build a {@link PreparedStatementCreator} based on the given SQL and named parameters.
@@ -436,6 +436,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 	 * @return a representation of the parsed SQL statement
 	 */
 	protected ParsedSql getParsedSql(String sql) {
+		Assert.notNull(sql, "SQL must not be null");
 		return this.parsedSqlCache.get(sql);
 	}
 

spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -304,8 +304,8 @@ public abstract class AbstractAdaptableMessageListener
 	 * @see #setMessageConverter
 	 */
 	protected Message buildMessage(Session session, Object result) throws JMSException {
-		Object content = preProcessResponse(result instanceof JmsResponse
-				? ((JmsResponse<?>) result).getResponse() : result);
+		Object content = preProcessResponse(result instanceof JmsResponse ?
+				((JmsResponse<?>) result).getResponse() : result);
 
 		MessageConverter converter = getMessageConverter();
 		if (converter != null) {
@@ -553,6 +553,29 @@ public abstract class AbstractAdaptableMessageListener
 				}
 				return this.headers;
 			}
+
+			@Override
+			public String toString() {
+				StringBuilder sb = new StringBuilder(getClass().getSimpleName());
+				if (this.payload == null) {
+					sb.append(" [rawMessage=").append(this.message);
+				}
+				else {
+					sb.append(" [payload=");
+					if (this.payload instanceof byte[]) {
+						sb.append("byte[").append(((byte[]) this.payload).length).append(']');
+					}
+					else {
+						sb.append(this.payload);
+					}
+				}
+				if (this.headers != null) {
+					sb.append(", headers=").append(this.headers);
+				}
+				sb.append(']');
+				return sb.toString();
+			}
+
 		}
 	}
 

spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -40,6 +40,7 @@ import org.springframework.jms.support.QosSettings;
 import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
 import org.springframework.jms.support.converter.MessageConverter;
 import org.springframework.jms.support.converter.MessageType;
+import org.springframework.jms.support.converter.MessagingMessageConverter;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.converter.MessageConversionException;
 import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
@@ -340,6 +341,45 @@ public class MessagingMessageListenerAdapterTests {
 		return responseMessage;
 	}
 
+	@Test
+	void lazyResolutionMessageToStringProvidesBestEffortWithUnresolvedPayload() throws JMSException {
+		MessagingMessageListenerAdapter adapter = getSimpleInstance("echo", Message.class);
+		MessagingMessageConverter messagingMessageConverter = adapter.getMessagingMessageConverter();
+		assertThat(messagingMessageConverter).isNotNull();
+		TextMessage message = new StubTextMessage();
+		assertThat(messagingMessageConverter.fromMessage(message)).isInstanceOfSatisfying(Message.class, msg ->
+				assertThat(msg.toString()).contains("rawMessage=").contains(message.toString())
+						.doesNotContain("payload=").doesNotContain("headers="));
+	}
+
+	@Test
+	void lazyResolutionMessageToStringWithResolvedPayload() throws JMSException {
+		MessagingMessageListenerAdapter adapter = getSimpleInstance("echo", Message.class);
+		MessagingMessageConverter messagingMessageConverter = adapter.getMessagingMessageConverter();
+		assertThat(messagingMessageConverter).isNotNull();
+		TextMessage message = new StubTextMessage("Hello");
+		assertThat(messagingMessageConverter.fromMessage(message)).isInstanceOfSatisfying(Message.class, msg -> {
+			msg.getPayload(); // force resolution
+			assertThat(msg.toString()).contains("payload=Hello")
+					.doesNotContain("rawMessage=").doesNotContain("headers=");
+		});
+	}
+
+	@Test
+	void lazyResolutionMessageToStringWithResolvedPayloadAndHeaders() throws JMSException {
+		MessagingMessageListenerAdapter adapter = getSimpleInstance("echo", Message.class);
+		MessagingMessageConverter messagingMessageConverter = adapter.getMessagingMessageConverter();
+		assertThat(messagingMessageConverter).isNotNull();
+		TextMessage message = new StubTextMessage("Hello");
+		message.setJMSPriority(7);
+		assertThat(messagingMessageConverter.fromMessage(message)).isInstanceOfSatisfying(Message.class, msg -> {
+			msg.getPayload();
+			msg.getHeaders();  // force resolution
+			assertThat(msg.toString()).contains("payload=Hello").contains("headers=").contains("jms_priority=7")
+					.doesNotContain("rawMessage=");
+		});
+	}
+
 
 	protected MessagingMessageListenerAdapter getSimpleInstance(String methodName, Class<?>... parameterTypes) {
 		Method m = ReflectionUtils.findMethod(SampleBean.class, methodName, parameterTypes);

spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java

@@ -200,7 +200,7 @@ public final class MessageBuilder<T> {
 	 * @since 4.1
 	 */
 	@SuppressWarnings("unchecked")
-	public static <T> Message<T> createMessage(@Nullable T payload, MessageHeaders messageHeaders) {
+	public static <T> Message<T> createMessage(T payload, MessageHeaders messageHeaders) {
 		Assert.notNull(payload, "Payload must not be null");
 		Assert.notNull(messageHeaders, "MessageHeaders must not be null");
 		if (payload instanceof Throwable) {

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateExceptionTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -96,7 +96,7 @@ public class HibernateExceptionTranslator implements PersistenceExceptionTransla
 			DataAccessException dae = this.jdbcExceptionTranslator.translate(
 					"Hibernate operation: " + jdbcEx.getMessage(), jdbcEx.getSQL(), jdbcEx.getSQLException());
 			if (dae != null) {
-				throw dae;
+				return dae;
 			}
 		}
 		return SessionFactoryUtils.convertHibernateAccessException(ex);

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java

@@ -777,8 +777,6 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	/**
 	 * Convert the given HibernateException to an appropriate exception
 	 * from the {@code org.springframework.dao} hierarchy.
-	 * <p>Will automatically apply a specified SQLExceptionTranslator to a
-	 * Hibernate JDBCException, else rely on Hibernate's default translation.
 	 * @param ex the HibernateException that occurred
 	 * @return a corresponding DataAccessException
 	 * @see SessionFactoryUtils#convertHibernateAccessException

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -124,8 +124,8 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
 	 * @since 5.1
 	 * @see java.sql.SQLException
 	 * @see org.hibernate.JDBCException
+	 * @see org.springframework.jdbc.support.SQLExceptionSubclassTranslator
 	 * @see org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator
-	 * @see org.springframework.jdbc.support.SQLStateSQLExceptionTranslator
 	 */
 	public void setJdbcExceptionTranslator(SQLExceptionTranslator jdbcExceptionTranslator) {
 		this.jdbcExceptionTranslator = jdbcExceptionTranslator;
@@ -247,7 +247,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
 			DataAccessException dae = this.jdbcExceptionTranslator.translate(
 					"Hibernate operation: " + jdbcEx.getMessage(), jdbcEx.getSQL(), jdbcEx.getSQLException());
 			if (dae != null) {
-				throw dae;
+				return dae;
 			}
 		}
 

spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/ConnectionFactoryUtils.java

@@ -176,6 +176,7 @@ public abstract class ConnectionFactoryUtils {
 			if (conHolder != null && connectionEquals(conHolder, connection)) {
 				// It's the transactional Connection: Don't close it.
 				conHolder.released();
+				return Mono.empty();
 			}
 			return Mono.from(connection.close());
 		}).onErrorResume(NoTransactionException.class, ex -> Mono.from(connection.close()));

spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/SingleConnectionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -231,7 +231,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory
 	 */
 	protected Connection getCloseSuppressingConnectionProxy(Connection target) {
 		return (Connection) Proxy.newProxyInstance(SingleConnectionFactory.class.getClassLoader(),
-				new Class<?>[] { Connection.class, Wrapped.class }, new CloseSuppressingInvocationHandler(target));
+				new Class<?>[] {Connection.class, Wrapped.class}, new CloseSuppressingInvocationHandler(target));
 	}
 
 

spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java

@@ -182,7 +182,7 @@ class DefaultDatabaseClient implements DatabaseClient {
 	 */
 	private static Connection createConnectionProxy(Connection con) {
 		return (Connection) Proxy.newProxyInstance(DatabaseClient.class.getClassLoader(),
-				new Class<?>[] { Connection.class, Wrapped.class },
+				new Class<?>[] {Connection.class, Wrapped.class},
 				new CloseSuppressingInvocationHandler(con));
 	}
 

spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/DelegatingConnectionFactoryUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -40,7 +40,7 @@ class DelegatingConnectionFactoryUnitTests {
 
 
 	@Test
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	void shouldDelegateGetConnection() {
 		Mono<Connection> connectionMono = Mono.just(connectionMock);
 		when(delegate.create()).thenReturn((Mono) connectionMono);
@@ -53,6 +53,7 @@ class DelegatingConnectionFactoryUnitTests {
 		assertThat(connectionFactory.unwrap()).isSameAs(delegate);
 	}
 
+
 	static class ExampleConnectionFactory extends DelegatingConnectionFactory {
 
 		ExampleConnectionFactory(ConnectionFactory targetConnectionFactory) {

spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java

@@ -64,8 +64,9 @@ class R2dbcTransactionManagerUnitTests {
 
 	private R2dbcTransactionManager tm;
 
+
 	@BeforeEach
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	void before() {
 		when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock));
 		when(connectionMock.beginTransaction()).thenReturn(Mono.empty());
@@ -73,6 +74,7 @@ class R2dbcTransactionManagerUnitTests {
 		tm = new R2dbcTransactionManager(connectionFactoryMock);
 	}
 
+
 	@Test
 	void testSimpleTransaction() {
 		TestTransactionSynchronization sync = new TestTransactionSynchronization(

spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/TransactionAwareConnectionFactoryProxyUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,14 +54,16 @@ class TransactionAwareConnectionFactoryProxyUnitTests {
 
 	R2dbcTransactionManager tm;
 
+
 	@BeforeEach
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	void before() {
 		when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock1),
 				(Mono) Mono.just(connectionMock2), (Mono) Mono.just(connectionMock3));
 		tm = new R2dbcTransactionManager(connectionFactoryMock);
 	}
 
+
 	@Test
 	void createShouldWrapConnection() {
 		new TransactionAwareConnectionFactoryProxy(connectionFactoryMock).create()
@@ -143,14 +145,15 @@ class TransactionAwareConnectionFactoryProxyUnitTests {
 		ConnectionFactoryUtils.getConnection(connectionFactoryMock)
 				.doOnNext(transactionalConnection::set).flatMap(connection -> proxyCf.create()
 				.doOnNext(wrappedConnection -> assertThat(((Wrapped<?>) wrappedConnection).unwrap()).isSameAs(connection)))
-				.as(rxtx::transactional)
 				.flatMapMany(Connection::close)
+				.as(rxtx::transactional)
 				.as(StepVerifier::create)
 				.verifyComplete();
 
+		verify(connectionFactoryMock, times(1)).create();
+		verify(connectionMock1, times(1)).close();
 		verifyNoInteractions(connectionMock2);
 		verifyNoInteractions(connectionMock3);
-		verify(connectionFactoryMock, times(1)).create();
 	}
 
 }

spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/lookup/MapConnectionFactoryLookupUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -34,30 +34,27 @@ public class MapConnectionFactoryLookupUnitTests {
 
 	private static final String CONNECTION_FACTORY_NAME = "connectionFactory";
 
+
 	@Test
 	public void getConnectionFactoriesReturnsUnmodifiableMap() {
 		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup();
 		Map<String, ConnectionFactory> connectionFactories = lookup.getConnectionFactories();
 
-		assertThatThrownBy(() -> connectionFactories.put("",
-				new DummyConnectionFactory())).isInstanceOf(
-						UnsupportedOperationException.class);
+		assertThatThrownBy(() -> connectionFactories.put("", new DummyConnectionFactory()))
+				.isInstanceOf(UnsupportedOperationException.class);
 	}
 
 	@Test
 	public void shouldLookupConnectionFactory() {
 		Map<String, ConnectionFactory> connectionFactories = new HashMap<>();
 		DummyConnectionFactory expectedConnectionFactory = new DummyConnectionFactory();
-
 		connectionFactories.put(CONNECTION_FACTORY_NAME, expectedConnectionFactory);
-		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup();
 
+		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup();
 		lookup.setConnectionFactories(connectionFactories);
 
-		ConnectionFactory connectionFactory = lookup.getConnectionFactory(
-				CONNECTION_FACTORY_NAME);
-
-		assertThat(connectionFactory).isNotNull().isSameAs(expectedConnectionFactory);
+		assertThat(lookup.getConnectionFactory(CONNECTION_FACTORY_NAME))
+				.isNotNull().isSameAs(expectedConnectionFactory);
 	}
 
 	@Test
@@ -68,27 +65,22 @@ public class MapConnectionFactoryLookupUnitTests {
 		connectionFactories.put(CONNECTION_FACTORY_NAME, overriddenConnectionFactory);
 
 		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup();
-
 		lookup.setConnectionFactories(connectionFactories);
 		lookup.addConnectionFactory(CONNECTION_FACTORY_NAME, expectedConnectionFactory);
 
-		ConnectionFactory connectionFactory = lookup.getConnectionFactory(
-				CONNECTION_FACTORY_NAME);
-
-		assertThat(connectionFactory).isNotNull().isSameAs(expectedConnectionFactory);
+		assertThat(lookup.getConnectionFactory(CONNECTION_FACTORY_NAME))
+				.isNotNull().isSameAs(expectedConnectionFactory);
 	}
 
 	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	public void getConnectionFactoryWhereSuppliedMapHasNonConnectionFactoryTypeUnderSpecifiedKey() {
 		Map connectionFactories = new HashMap<>();
 		connectionFactories.put(CONNECTION_FACTORY_NAME, new Object());
-		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup(
-				connectionFactories);
+		MapConnectionFactoryLookup lookup = new MapConnectionFactoryLookup(connectionFactories);
 
-		assertThatThrownBy(
-				() -> lookup.getConnectionFactory(CONNECTION_FACTORY_NAME)).isInstanceOf(
-						ClassCastException.class);
+		assertThatThrownBy(() -> lookup.getConnectionFactory(CONNECTION_FACTORY_NAME))
+				.isInstanceOf(ClassCastException.class);
 	}
 
 	@Test
@@ -99,4 +91,5 @@ public class MapConnectionFactoryLookupUnitTests {
 				() -> lookup.getConnectionFactory(CONNECTION_FACTORY_NAME)).isInstanceOf(
 						ConnectionFactoryLookupFailureException.class);
 	}
+
 }

spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java

@@ -77,8 +77,9 @@ class DefaultDatabaseClientUnitTests {
 
 	private DatabaseClient.Builder databaseClientBuilder;
 
+
 	@BeforeEach
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	void before() {
 		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
 
@@ -89,6 +90,7 @@ class DefaultDatabaseClientUnitTests {
 				connectionFactory).bindMarkers(BindMarkersFactory.indexed("$", 1));
 	}
 
+
 	@Test
 	void connectionFactoryIsExposed() {
 		ConnectionFactory connectionFactory = mock(ConnectionFactory.class);

spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -82,8 +82,9 @@ public class NamedParameterUtilsUnitTests {
 	@Test
 	public void substituteObjectArray() {
 		MapBindParameterSource namedParams = new MapBindParameterSource(new HashMap<>());
-		namedParams.addValue("a", Arrays.asList(new Object[] { "Walter", "Heisenberg" },
-				new Object[] { "Walt Jr.", "Flynn" }));
+		namedParams.addValue("a",
+				Arrays.asList(new Object[] {"Walter", "Heisenberg"},
+				new Object[] {"Walt Jr.", "Flynn"}));
 
 		PreparedOperation<?> operation = NamedParameterUtils.substituteNamedParameters(
 				"xxx :a", BIND_MARKERS, namedParams);
@@ -94,8 +95,9 @@ public class NamedParameterUtilsUnitTests {
 	@Test
 	public void shouldBindObjectArray() {
 		MapBindParameterSource namedParams = new MapBindParameterSource(new HashMap<>());
-		namedParams.addValue("a", Arrays.asList(new Object[] { "Walter", "Heisenberg" },
-				new Object[] { "Walt Jr.", "Flynn" }));
+		namedParams.addValue("a",
+				Arrays.asList(new Object[] {"Walter", "Heisenberg"},
+				new Object[] {"Walt Jr.", "Flynn"}));
 
 		BindTarget bindTarget = mock(BindTarget.class);
 

spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/IndexedBindMarkersUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ class IndexedBindMarkersUnitTests {
 	@Test
 	void shouldCreateNewBindMarkers() {
 		BindMarkersFactory factory = BindMarkersFactory.indexed("$", 0);
-
 		BindMarkers bindMarkers1 = factory.create();
 		BindMarkers bindMarkers2 = factory.create();
 
@@ -43,7 +42,6 @@ class IndexedBindMarkersUnitTests {
 	@Test
 	void shouldCreateNewBindMarkersWithOffset() {
 		BindTarget bindTarget = mock(BindTarget.class);
-
 		BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 1).create();
 
 		BindMarker first = bindMarkers.next();
@@ -60,10 +58,9 @@ class IndexedBindMarkersUnitTests {
 
 	@Test
 	void nextShouldIncrementBindMarker() {
-		String[] prefixes = { "$", "?" };
+		String[] prefixes = {"$", "?"};
 
 		for (String prefix : prefixes) {
-
 			BindMarkers bindMarkers = BindMarkersFactory.indexed(prefix, 0).create();
 
 			BindMarker marker1 = bindMarkers.next();
@@ -76,9 +73,7 @@ class IndexedBindMarkersUnitTests {
 
 	@Test
 	void bindValueShouldBindByIndex() {
-
 		BindTarget bindTarget = mock(BindTarget.class);
-
 		BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 0).create();
 
 		bindMarkers.next().bind(bindTarget, "foo");
@@ -91,7 +86,6 @@ class IndexedBindMarkersUnitTests {
 	@Test
 	void bindNullShouldBindByIndex() {
 		BindTarget bindTarget = mock(BindTarget.class);
-
 		BindMarkers bindMarkers = BindMarkersFactory.indexed("$", 0).create();
 
 		bindMarkers.next(); // ignore

spring-r2dbc/src/test/java/org/springframework/r2dbc/core/binding/NamedBindMarkersUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class NamedBindMarkersUnitTests {
 	}
 
 	@ParameterizedTest
-	@ValueSource(strings = { "$", "?" })
+	@ValueSource(strings = {"$", "?"})
 	void nextShouldIncrementBindMarker(String prefix) {
 		BindMarkers bindMarkers = BindMarkersFactory.named(prefix, "p", 32).create();
 

spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -255,16 +255,21 @@ public abstract class CommonsFileUploadSupport {
 		for (FileItem fileItem : fileItems) {
 			if (fileItem.isFormField()) {
 				String value;
-				String partEncoding = determineEncoding(fileItem.getContentType(), encoding);
-				try {
-					value = fileItem.getString(partEncoding);
-				}
-				catch (UnsupportedEncodingException ex) {
-					if (logger.isWarnEnabled()) {
-						logger.warn("Could not decode multipart item '" + fileItem.getFieldName() +
-								"' with encoding '" + partEncoding + "': using platform default");
+				if (fileItem.getSize() > 0) {
+					String partEncoding = determineEncoding(fileItem.getContentType(), encoding);
+					try {
+						value = fileItem.getString(partEncoding);
 					}
-					value = fileItem.getString();
+					catch (UnsupportedEncodingException ex) {
+						if (logger.isWarnEnabled()) {
+							logger.warn("Could not decode multipart item '" + fileItem.getFieldName() +
+									"' with encoding '" + partEncoding + "': using platform default");
+						}
+						value = fileItem.getString();
+					}
+				}
+				else {
+					value = "";
 				}
 				String[] curParam = multipartParameters.get(fileItem.getFieldName());
 				if (curParam == null) {

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/MatrixVariableMapMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.reactive.result.method.annotation;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -71,12 +70,17 @@ public class MatrixVariableMapMethodArgumentResolver extends HandlerMethodArgume
 
 		Map<String, MultiValueMap<String, String>> matrixVariables =
 				exchange.getAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE);
+		MultiValueMap<String, String> map = mapMatrixVariables(parameter, matrixVariables);
+		return (isSingleValueMap(parameter) ? map.toSingleValueMap() : map);
+	}
 
-		if (CollectionUtils.isEmpty(matrixVariables)) {
-			return Collections.emptyMap();
-		}
+	private MultiValueMap<String,String> mapMatrixVariables(MethodParameter parameter,
+			@Nullable Map<String, MultiValueMap<String, String>> matrixVariables) {
 
 		MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+		if (CollectionUtils.isEmpty(matrixVariables)) {
+			return map;
+		}
 		MatrixVariable annotation = parameter.getParameterAnnotation(MatrixVariable.class);
 		Assert.state(annotation != null, "No MatrixVariable annotation");
 		String pathVariable = annotation.pathVar();
@@ -84,7 +88,7 @@ public class MatrixVariableMapMethodArgumentResolver extends HandlerMethodArgume
 		if (!pathVariable.equals(ValueConstants.DEFAULT_NONE)) {
 			MultiValueMap<String, String> mapForPathVariable = matrixVariables.get(pathVariable);
 			if (mapForPathVariable == null) {
-				return Collections.emptyMap();
+				return map;
 			}
 			map.putAll(mapForPathVariable);
 		}
@@ -97,8 +101,7 @@ public class MatrixVariableMapMethodArgumentResolver extends HandlerMethodArgume
 				});
 			}
 		}
-
-		return (isSingleValueMap(parameter) ? map.toSingleValueMap() : map);
+		return map;
 	}
 
 	private boolean isSingleValueMap(MethodParameter parameter) {

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -139,6 +140,19 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		assertThat(mapAll.get("colors")).isEqualTo("red");
 	}
 
+	@Test
+	public void resolveMultiValueMapArgumentNoParams() {
+
+		MethodParameter param = this.testMethod.annot(matrixAttribute().noPathVar())
+				.arg(MultiValueMap.class, String.class, String.class);
+
+		Object result = this.resolver.resolveArgument(param,
+				new BindingContext(), this.exchange).block(Duration.ZERO);
+
+		assertThat(result).isInstanceOf(MultiValueMap.class)
+				.asInstanceOf(InstanceOfAssertFactories.MAP).isEmpty();
+	}
+
 	@Test
 	public void resolveArgumentNoParams() throws Exception {
 

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -68,11 +67,17 @@ public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArg
 				(Map<String, MultiValueMap<String, String>>) request.getAttribute(
 						HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
 
-		if (CollectionUtils.isEmpty(matrixVariables)) {
-			return Collections.emptyMap();
-		}
+		MultiValueMap<String, String> map = mapMatrixVariables(parameter, matrixVariables);
+		return (isSingleValueMap(parameter) ? map.toSingleValueMap() : map);
+	}
+
+	private MultiValueMap<String,String> mapMatrixVariables(MethodParameter parameter,
+			@Nullable Map<String, MultiValueMap<String, String>> matrixVariables) {
 
 		MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+		if (CollectionUtils.isEmpty(matrixVariables)) {
+			return map;
+		}
 		MatrixVariable ann = parameter.getParameterAnnotation(MatrixVariable.class);
 		Assert.state(ann != null, "No MatrixVariable annotation");
 		String pathVariable = ann.pathVar();
@@ -80,7 +85,7 @@ public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArg
 		if (!pathVariable.equals(ValueConstants.DEFAULT_NONE)) {
 			MultiValueMap<String, String> mapForPathVariable = matrixVariables.get(pathVariable);
 			if (mapForPathVariable == null) {
-				return Collections.emptyMap();
+				return map;
 			}
 			map.putAll(mapForPathVariable);
 		}
@@ -93,8 +98,7 @@ public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArg
 				});
 			}
 		}
-
-		return (isSingleValueMap(parameter) ? map.toSingleValueMap() : map);
+		return map;
 	}
 
 	private boolean isSingleValueMap(MethodParameter parameter) {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -155,6 +156,18 @@ public class MatrixVariablesMapMethodArgumentResolverTests {
 		assertThat(map).isEqualTo(Collections.emptyMap());
 	}
 
+	@Test
+	public void resolveMultiValueMapArgumentNoParams() throws Exception {
+
+		MethodParameter param = this.testMethod.annot(matrixAttribute().noPathVar())
+				.arg(MultiValueMap.class, String.class, String.class);
+
+		Object result = this.resolver.resolveArgument(param, this.mavContainer, this.webRequest, null);
+
+		assertThat(result).isInstanceOf(MultiValueMap.class)
+				.asInstanceOf(InstanceOfAssertFactories.MAP).isEmpty();
+	}
+
 	@Test
 	public void resolveArgumentNoMatch() throws Exception {
 		MultiValueMap<String, String> params2 = getVariablesFor("planes");

src/docs/asciidoc/core/core-beans.adoc

@@ -3156,8 +3156,8 @@ the `<aop:scoped-proxy/>` element, a CGLIB-based class proxy is created.
 
 [NOTE]
 ====
-CGLIB proxies intercept only public method calls! Do not call non-public methods
-on such a proxy. They are not delegated to the actual scoped target object.
+CGLIB proxies do not intercept private methods. Attempting to call a private method
+on such a proxy will not delegate to the actual scoped target object.
 ====
 
 Alternatively, you can configure the Spring container to create standard JDK
@@ -8883,7 +8883,6 @@ classes, each depending on beans declared in the others:
 	}
 ----
 
-
 There is another way to achieve the same result. Remember that `@Configuration` classes are
 ultimately only another bean in the container: This means that they can take advantage of
 `@Autowired` and `@Value` injection and other features the same as any other bean.
@@ -8895,6 +8894,11 @@ classes are processed quite early during the initialization of the context, and
 to be injected this way may lead to unexpected early initialization. Whenever possible, resort to
 parameter-based injection, as in the preceding example.
 
+Avoid access to locally defined beans within a `@PostConstruct` method on the same configuration
+class. This effectively leads to a circular reference since non-static `@Bean` methods semantically
+require a fully initialized configuration class instance to be called on. With circular references
+disallowed (e.g. in Spring Boot 2.6+), this may trigger a `BeanCurrentlyInCreationException`.
+
 Also, be particularly careful with `BeanPostProcessor` and `BeanFactoryPostProcessor` definitions
 through `@Bean`. Those should usually be declared as `static @Bean` methods, not triggering the
 instantiation of their containing configuration class. Otherwise, `@Autowired` and `@Value` may not

src/docs/asciidoc/data-access.adoc

@@ -1562,30 +1562,27 @@ chapter for examples.
 ====
 
 You can apply the `@Transactional` annotation to an interface definition, a method
-on an interface, a class definition, or a method on a class. However, the
-mere presence of the `@Transactional` annotation is not enough to activate the
-transactional behavior. The `@Transactional` annotation is merely metadata that can
-be consumed by some runtime infrastructure that is `@Transactional`-aware and that
-can use the metadata to configure the appropriate beans with transactional behavior.
-In the preceding example, the `<tx:annotation-driven/>` element switches on the
-transactional behavior.
+on an interface, a class definition, or a method on a class. However, the mere presence
+of the `@Transactional` annotation is not enough to activate the transactional behavior.
+The `@Transactional` annotation is merely metadata that can be consumed by corresponding
+runtime infrastructure which uses that metadata to configure the appropriate beans with
+transactional behavior. In the preceding example, the `<tx:annotation-driven/>` element
+switches on actual transaction management at runtime.
 
-TIP: The Spring team recommends that you annotate only concrete classes (and methods of
-concrete classes) with the `@Transactional` annotation, as opposed to annotating interfaces.
-You certainly can place the `@Transactional` annotation on an interface (or an interface
-method), but this works only as you would expect it to if you use interface-based
-proxies. The fact that Java annotations are not inherited from interfaces means that,
-if you use class-based proxies (`proxy-target-class="true"`) or the weaving-based
-aspect (`mode="aspectj"`), the transaction settings are not recognized by the proxying
-and weaving infrastructure, and the object is not wrapped in a transactional proxy.
+TIP: The Spring team recommends that you annotate methods of concrete classes with the
+`@Transactional` annotation, rather than relying on annotated methods in interfaces,
+even if the latter does work for interface-based and target-class proxies as of 5.0.
+Since Java annotations are not inherited from interfaces, interface-declared annotations
+are still not recognized by the weaving infrastructure when using AspectJ mode, so the
+aspect does not get applied. As a consequence, your transaction annotations may be
+silently ignored: Your code might appear to "work" until you test a rollback scenario.
 
 NOTE: In proxy mode (which is the default), only external method calls coming in through
 the proxy are intercepted. This means that self-invocation (in effect, a method within
 the target object calling another method of the target object) does not lead to an actual
 transaction at runtime even if the invoked method is marked with `@Transactional`. Also,
 the proxy must be fully initialized to provide the expected behavior, so you should not
-rely on this feature in your initialization code -- for example, in a `@PostConstruct`
-method.
+rely on this feature in your initialization code -- e.g. in a `@PostConstruct` method.
 
 Consider using AspectJ mode (see the `mode` attribute in the following table) if you
 expect self-invocations to be wrapped with transactions as well. In this case, there is
@@ -1610,20 +1607,20 @@ is modified) to support `@Transactional` runtime behavior on any kind of method.
   framework (following proxy semantics, as discussed earlier, applying to method calls
   coming in through the proxy only). The alternative mode (`aspectj`) instead weaves the
   affected classes with Spring's AspectJ transaction aspect, modifying the target class
-  byte code to apply to any kind of method call. AspectJ weaving requires
-  `spring-aspects.jar` in the classpath as well as having load-time weaving (or compile-time
-  weaving) enabled. (See <<core.adoc#aop-aj-ltw-spring, Spring configuration>>
-  for details on how to set up load-time weaving.)
+  byte code to apply to any kind of method call. AspectJ weaving requires `spring-aspects.jar`
+  in the classpath as well as having load-time weaving (or compile-time weaving) enabled.
+  (See <<core.adoc#aop-aj-ltw-spring, Spring configuration>> for details on how to set up
+  load-time weaving.)
 
 | `proxy-target-class`
 | `proxyTargetClass`
 | `false`
 | Applies to `proxy` mode only. Controls what type of transactional proxies are created
-  for classes annotated with the `@Transactional` annotation. If the
-  `proxy-target-class` attribute is set to `true`, class-based proxies are created.
-  If `proxy-target-class` is `false` or if the attribute is omitted, then standard JDK
-  interface-based proxies are created. (See <<core.adoc#aop-proxying, Proxying Mechanisms>>
-  for a detailed examination of the different proxy types.)
+  for classes annotated with the `@Transactional` annotation. If the `proxy-target-class`
+  attribute is set to `true`, class-based proxies are created. If `proxy-target-class` is
+  `false` or if the attribute is omitted, then standard JDK interface-based proxies are
+  created. (See <<core.adoc#aop-proxying, Proxying Mechanisms>> for a detailed examination
+  of the different proxy types.)
 
 | `order`
 | `order`