Release v6.2.4

.github/actions/create-github-release/action.yml

@@ -15,7 +15,7 @@ runs:
   using: composite
   steps:
     - name: Generate Changelog
-      uses: spring-io/github-changelog-generator@86958813a62af8fb223b3fd3b5152035504bcb83 #v0.0.12
+      uses: spring-io/github-changelog-generator@185319ad7eaa75b0e8e72e4b6db19c8b2cb8c4c1 #v0.0.11
       with:
         config-file: .github/actions/create-github-release/changelog-generator.yml
         milestone: ${{ inputs.milestone }}

build.gradle

@@ -102,7 +102,7 @@ configure([rootProject] + javaProjects) { project ->
 			// TODO Uncomment link to JUnit 5 docs once we execute Gradle with Java 18+.
 			// See https://github.com/spring-projects/spring-framework/issues/27497
 			//
-			// "https://junit.org/junit5/docs/5.12.2/api/",
+			// "https://junit.org/junit5/docs/5.12.0/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			//"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/1.0.0.RELEASE/api/",

buildSrc/gradle.properties

@@ -1,2 +1,2 @@
 org.gradle.caching=true
-javaFormatVersion=0.0.43
+javaFormatVersion=0.0.42

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

@@ -50,7 +50,7 @@ public class CheckstyleConventions {
 			project.getPlugins().apply(CheckstylePlugin.class);
 			project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
 			CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-			checkstyle.setToolVersion("10.23.1");
+			checkstyle.setToolVersion("10.21.4");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

buildSrc/src/main/java/org/springframework/build/TestConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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,8 +21,6 @@ import java.util.Map;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.tasks.testing.Test;
-import org.gradle.api.tasks.testing.TestFrameworkOptions;
-import org.gradle.api.tasks.testing.junitplatform.JUnitPlatformOptions;
 import org.gradle.testretry.TestRetryPlugin;
 import org.gradle.testretry.TestRetryTaskExtension;
 
@@ -36,7 +34,6 @@ import org.gradle.testretry.TestRetryTaskExtension;
  *
  * @author Brian Clozel
  * @author Andy Wilkinson
- * @author Sam Brannen
  */
 class TestConventions {
 
@@ -53,12 +50,7 @@ class TestConventions {
 	}
 
 	private void configureTests(Project project, Test test) {
-		TestFrameworkOptions existingOptions = test.getOptions();
-		test.useJUnitPlatform(options -> {
-			if (existingOptions instanceof JUnitPlatformOptions junitPlatformOptions) {
-				options.copyFrom(junitPlatformOptions);
-			}
-		});
+		test.useJUnitPlatform();
 		test.include("**/*Tests.class", "**/*Test.class");
 		test.setSystemProperties(Map.of(
 				"java.awt.headless", "true",

framework-api/framework-api.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id 'java-platform'
-	id 'io.freefair.aggregate-javadoc' version '8.13.1'
+	id 'io.freefair.aggregate-javadoc' version '8.3'
 }
 
 description = "Spring Framework API Docs"
@@ -21,7 +21,6 @@ dependencies {
 
 javadoc {
 	title = "${rootProject.description} ${version} API"
-	failOnError = true
 	options {
 		encoding = "UTF-8"
 		memberLevel = JavadocMemberLevel.PROTECTED
@@ -32,9 +31,8 @@ javadoc {
 		destinationDir = project.java.docsDir.dir("javadoc-api").get().asFile
 		splitIndex = true
 		links(rootProject.ext.javadocLinks)
-		// Check for 'syntax' and 'reference' during linting.
-		addBooleanOption('Xdoclint:syntax,reference', true)
-		addBooleanOption('Werror', true)  // fail build on Javadoc warnings
+		addBooleanOption('Xdoclint:syntax,reference', true) // only check syntax and reference with doclint
+		addBooleanOption('Werror', true) // fail build on Javadoc warnings
 	}
 	maxMemory = "1024m"
 	doFirst {

framework-docs/framework-docs.gradle

@@ -42,34 +42,33 @@ repositories {
 }
 
 dependencies {
-	implementation(project(":spring-aspects"))
-	implementation(project(":spring-context"))
-	implementation(project(":spring-context-support"))
-	implementation(project(":spring-core-test"))
-	implementation(project(":spring-jdbc"))
-	implementation(project(":spring-jms"))
-	implementation(project(":spring-test"))
-	implementation(project(":spring-web"))
-	implementation(project(":spring-webflux"))
-	implementation(project(":spring-webmvc"))
-	implementation(project(":spring-websocket"))
+	api(project(":spring-aspects"))
+	api(project(":spring-context"))
+	api(project(":spring-context-support"))
+	api(project(":spring-jdbc"))
+	api(project(":spring-jms"))
+	api(project(":spring-test"))
+	api(project(":spring-web"))
+	api(project(":spring-webflux"))
+	api(project(":spring-webmvc"))
+	api(project(":spring-websocket"))
 
-	implementation("com.fasterxml.jackson.core:jackson-databind")
-	implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
-	implementation("com.mchange:c3p0:0.9.5.5")
-	implementation("com.oracle.database.jdbc:ojdbc11")
-	implementation("io.projectreactor.netty:reactor-netty-http")
-	implementation("jakarta.jms:jakarta.jms-api")
-	implementation("jakarta.servlet:jakarta.servlet-api")
-	implementation("jakarta.resource:jakarta.resource-api")
-	implementation("jakarta.validation:jakarta.validation-api")
-	implementation("jakarta.websocket:jakarta.websocket-client-api")
-	implementation("javax.cache:cache-api")
-	implementation("org.apache.activemq:activemq-ra:6.1.2")
-	implementation("org.apache.commons:commons-dbcp2:2.11.0")
-	implementation("org.aspectj:aspectjweaver")
+	api("com.fasterxml.jackson.core:jackson-databind")
+	api("com.fasterxml.jackson.module:jackson-module-parameter-names")
+	api("com.mchange:c3p0:0.9.5.5")
+	api("com.oracle.database.jdbc:ojdbc11")
+	api("io.projectreactor.netty:reactor-netty-http")
+	api("jakarta.jms:jakarta.jms-api")
+	api("jakarta.servlet:jakarta.servlet-api")
+	api("jakarta.resource:jakarta.resource-api")
+	api("jakarta.validation:jakarta.validation-api")
+	api("javax.cache:cache-api")
+	api("org.apache.activemq:activemq-ra:6.1.2")
+	api("org.apache.commons:commons-dbcp2:2.11.0")
+	api("org.aspectj:aspectjweaver")
+	api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
+	api("org.jetbrains.kotlin:kotlin-stdlib")
+
+	implementation(project(":spring-core-test"))
 	implementation("org.assertj:assertj-core")
-	implementation("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
-	implementation("org.jetbrains.kotlin:kotlin-stdlib")
-	implementation("org.junit.jupiter:junit-jupiter-api")
 }

framework-docs/modules/ROOT/pages/appendix.adoc

@@ -92,25 +92,11 @@ the repeated JNDI lookup overhead. See
 {spring-framework-api}++/jndi/JndiLocatorDelegate.html#IGNORE_JNDI_PROPERTY_NAME++[`JndiLocatorDelegate`]
 for details.
 
-| `spring.locking.strict`
-| Instructs Spring to enforce strict locking during bean creation, rather than the mix of
-strict and lenient locking that 6.2 applies by default. See
-{spring-framework-api}++/beans/factory/support/DefaultListableBeanFactory.html#STRICT_LOCKING_PROPERTY_NAME++[`DefaultListableBeanFactory`]
-for details.
-
 | `spring.objenesis.ignore`
 | Instructs Spring to ignore Objenesis, not even attempting to use it. See
 {spring-framework-api}++/objenesis/SpringObjenesis.html#IGNORE_OBJENESIS_PROPERTY_NAME++[`SpringObjenesis`]
 for details.
 
-| `spring.placeholder.escapeCharacter.default`
-| The default escape character for property placeholder support. If not set, `'\'` will
-be used. Can be set to a custom escape character or an empty string to disable support
-for an escape character. The default escape character be explicitly overridden in
-`PropertySourcesPlaceholderConfigurer` and subclasses of `AbstractPropertyResolver`. See
-{spring-framework-api}++/core/env/AbstractPropertyResolver.html#DEFAULT_PLACEHOLDER_ESCAPE_CHARACTER_PROPERTY_NAME++[`AbstractPropertyResolver`]
-for details.
-
 | `spring.test.aot.processing.failOnError`
 | A boolean flag that controls whether errors encountered during AOT processing in the
 _Spring TestContext Framework_ should result in an exception that fails the overall process.

framework-docs/modules/ROOT/pages/core/aot.adoc

@@ -469,20 +469,20 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	RootBeanDefinition beanDefinition = new RootBeanDefinition(ClientFactoryBean.class);
-	beanDefinition.setTargetType(ResolvableType.forClassWithGenerics(ClientFactoryBean.class, MyClient.class));
-	// ...
-	registry.registerBeanDefinition("myClient", beanDefinition);
+    RootBeanDefinition beanDefinition = new RootBeanDefinition(ClientFactoryBean.class);
+    beanDefinition.setTargetType(ResolvableType.forClassWithGenerics(ClientFactoryBean.class, MyClient.class));
+    // ...
+    registry.registerBeanDefinition("myClient", beanDefinition);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val beanDefinition = RootBeanDefinition(ClientFactoryBean::class.java)
-	beanDefinition.setTargetType(ResolvableType.forClassWithGenerics(ClientFactoryBean::class.java, MyClient::class.java));
-	// ...
-	registry.registerBeanDefinition("myClient", beanDefinition)
+    val beanDefinition = RootBeanDefinition(ClientFactoryBean::class.java)
+    beanDefinition.setTargetType(ResolvableType.forClassWithGenerics(ClientFactoryBean::class.java, MyClient::class.java));
+    // ...
+    registry.registerBeanDefinition("myClient", beanDefinition)
 ----
 ======
 

framework-docs/modules/ROOT/pages/core/beans/annotation-config/value-annotations.adoc

@@ -9,15 +9,15 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Component
-	public class MovieRecommender {
+    @Component
+    public class MovieRecommender {
 
-		private final String catalog;
+        private final String catalog;
 
-		public MovieRecommender(@Value("${catalog.name}") String catalog) {
-			this.catalog = catalog;
-		}
-	}
+        public MovieRecommender(@Value("${catalog.name}") String catalog) {
+            this.catalog = catalog;
+        }
+    }
 ----
 
 Kotlin::
@@ -37,9 +37,9 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Configuration
-	@PropertySource("classpath:application.properties")
-	public class AppConfig { }
+    @Configuration
+    @PropertySource("classpath:application.properties")
+    public class AppConfig { }
 ----
 
 Kotlin::
@@ -56,7 +56,7 @@ And the following `application.properties` file:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	catalog.name=MovieCatalog
+    catalog.name=MovieCatalog
 ----
 
 In that case, the `catalog` parameter and field will be equal to the `MovieCatalog` value.
@@ -101,11 +101,8 @@ NOTE: When configuring a `PropertySourcesPlaceholderConfigurer` using JavaConfig
 
 Using the above configuration ensures Spring initialization failure if any `${}`
 placeholder could not be resolved. It is also possible to use methods like
-`setPlaceholderPrefix()`, `setPlaceholderSuffix()`, `setValueSeparator()`, or
-`setEscapeCharacter()` to customize the placeholder syntax. In addition, the default
-escape character can be changed or disabled globally by setting the
-`spring.placeholder.escapeCharacter.default` property via a JVM system property (or via
-the xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism).
+`setPlaceholderPrefix`, `setPlaceholderSuffix`, `setValueSeparator`, or
+`setEscapeCharacter` to customize placeholders.
 
 NOTE: Spring Boot configures by default a `PropertySourcesPlaceholderConfigurer` bean that
 will get properties from `application.properties` and `application.yml` files.
@@ -122,15 +119,15 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Component
-	public class MovieRecommender {
+    @Component
+    public class MovieRecommender {
 
-		private final String catalog;
+        private final String catalog;
 
-		public MovieRecommender(@Value("${catalog.name:defaultCatalog}") String catalog) {
-			this.catalog = catalog;
-		}
-	}
+        public MovieRecommender(@Value("${catalog.name:defaultCatalog}") String catalog) {
+            this.catalog = catalog;
+        }
+    }
 ----
 
 Kotlin::
@@ -153,16 +150,16 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Configuration
-	public class AppConfig {
+    @Configuration
+    public class AppConfig {
 
-		@Bean
-		public ConversionService conversionService() {
-			DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
-			conversionService.addConverter(new MyCustomConverter());
-			return conversionService;
-		}
-	}
+        @Bean
+        public ConversionService conversionService() {
+            DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
+            conversionService.addConverter(new MyCustomConverter());
+            return conversionService;
+        }
+    }
 ----
 
 Kotlin::
@@ -191,15 +188,15 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Component
-	public class MovieRecommender {
+    @Component
+    public class MovieRecommender {
 
-		private final String catalog;
+        private final String catalog;
 
-		public MovieRecommender(@Value("#{systemProperties['user.catalog'] + 'Catalog' }") String catalog) {
-			this.catalog = catalog;
-		}
-	}
+        public MovieRecommender(@Value("#{systemProperties['user.catalog'] + 'Catalog' }") String catalog) {
+            this.catalog = catalog;
+        }
+    }
 ----
 
 Kotlin::
@@ -220,16 +217,16 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Component
-	public class MovieRecommender {
+    @Component
+    public class MovieRecommender {
 
-		private final Map<String, Integer> countOfMoviesPerCatalog;
+        private final Map<String, Integer> countOfMoviesPerCatalog;
 
-		public MovieRecommender(
-				@Value("#{{'Thriller': 100, 'Comedy': 300}}") Map<String, Integer> countOfMoviesPerCatalog) {
-			this.countOfMoviesPerCatalog = countOfMoviesPerCatalog;
-		}
-	}
+        public MovieRecommender(
+                @Value("#{{'Thriller': 100, 'Comedy': 300}}") Map<String, Integer> countOfMoviesPerCatalog) {
+            this.countOfMoviesPerCatalog = countOfMoviesPerCatalog;
+        }
+    }
 ----
 
 Kotlin::

framework-docs/modules/ROOT/pages/core/beans/basics.adoc

@@ -119,7 +119,7 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val context = ClassPathXmlApplicationContext("services.xml", "daos.xml")
+    val context = ClassPathXmlApplicationContext("services.xml", "daos.xml")
 ----
 ======
 
@@ -310,16 +310,16 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	import org.springframework.beans.factory.getBean
+    import org.springframework.beans.factory.getBean
 
 	// create and configure beans
-	val context = ClassPathXmlApplicationContext("services.xml", "daos.xml")
+    val context = ClassPathXmlApplicationContext("services.xml", "daos.xml")
 
-	// retrieve configured instance
-	val service = context.getBean<PetStoreService>("petStore")
+    // retrieve configured instance
+    val service = context.getBean<PetStoreService>("petStore")
 
-	// use configured instance
-	var userList = service.getUsernameList()
+    // use configured instance
+    var userList = service.getUsernameList()
 ----
 ======
 

framework-docs/modules/ROOT/pages/core/beans/context-introduction.adoc

@@ -513,7 +513,7 @@ the classes above:
 		<property name="notificationAddress" value="blockedlist@example.org"/>
 	</bean>
 
-	<!-- optional: a custom ApplicationEventMulticaster definition -->
+    <!-- optional: a custom ApplicationEventMulticaster definition -->
 	<bean id="applicationEventMulticaster" class="org.springframework.context.event.SimpleApplicationEventMulticaster">
 		<property name="taskExecutor" ref="..."/>
 		<property name="errorHandler" ref="..."/>

framework-docs/modules/ROOT/pages/core/beans/factory-extension.adoc

@@ -226,7 +226,7 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	import org.springframework.beans.factory.getBean
+    import org.springframework.beans.factory.getBean
 
 	fun main() {
 		val ctx = ClassPathXmlApplicationContext("scripting/beans.xml")
@@ -314,7 +314,7 @@ Thus, marking it for lazy initialization will be ignored, and the
 
 
 [[beans-factory-placeholderconfigurer]]
-=== Example: Property Placeholder Substitution with `PropertySourcesPlaceholderConfigurer`
+=== Example: The Class Name Substitution `PropertySourcesPlaceholderConfigurer`
 
 You can use the `PropertySourcesPlaceholderConfigurer` to externalize property values
 from a bean definition in a separate file by using the standard Java `Properties` format.
@@ -341,8 +341,8 @@ with placeholder values is defined:
 
 The example shows properties configured from an external `Properties` file. At runtime,
 a `PropertySourcesPlaceholderConfigurer` is applied to the metadata that replaces some
-properties of the `DataSource`. The values to replace are specified as placeholders of the
-form pass:q[`${property-name}`], which follows the Ant, log4j, and JSP EL style.
+properties of the DataSource. The values to replace are specified as placeholders of the
+form pass:q[`${property-name}`], which follows the Ant and log4j and JSP EL style.
 
 The actual values come from another file in the standard Java `Properties` format:
 
@@ -355,15 +355,11 @@ jdbc.password=root
 ----
 
 Therefore, the `${jdbc.username}` string is replaced at runtime with the value, 'sa', and
-the same applies for other placeholder values that match keys in the properties file. The
-`PropertySourcesPlaceholderConfigurer` checks for placeholders in most properties and
-attributes of a bean definition. Furthermore, you can customize the placeholder prefix,
-suffix, default value separator, and escape character. In addition, the default escape
-character can be changed or disabled globally by setting the
-`spring.placeholder.escapeCharacter.default` property via a JVM system property (or via
-the xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism).
+the same applies for other placeholder values that match keys in the properties file.
+The `PropertySourcesPlaceholderConfigurer` checks for placeholders in most properties and
+attributes of a bean definition. Furthermore, you can customize the placeholder prefix and suffix.
 
-With the `context` namespace, you can configure property placeholders
+With the `context` namespace introduced in Spring 2.5, you can configure property placeholders
 with a dedicated configuration element. You can provide one or more locations as a
 comma-separated list in the `location` attribute, as the following example shows:
 

framework-docs/modules/ROOT/pages/core/spring-jcl.adoc

@@ -31,7 +31,7 @@ Java::
 ----
 public class MyBean {
 	private final Log log = LogFactory.getLog(getClass());
-	// ...
+    // ...
 }
 ----
 
@@ -40,8 +40,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 class MyBean {
-	private val log = LogFactory.getLog(javaClass)
-	// ...
+  private val log = LogFactory.getLog(javaClass)
+  // ...
 }
 ----
 ======

framework-docs/modules/ROOT/pages/core/validation/beanvalidation.adoc

@@ -399,7 +399,7 @@ A `ConstraintViolation` on the `degrees` method parameter is adapted to a
 `MessageSourceResolvable` with the following:
 
 - Error codes `"Max.myService#addStudent.degrees"`, `"Max.degrees"`, `"Max.int"`, `"Max"`
-- Message arguments "degrees" and 2 (the field name and the constraint attribute)
+- Message arguments "degrees2 and 2 (the field name and the constraint attribute)
 - Default message "must be less than or equal to 2"
 
 To customize the above default message, you can add a property such as:

framework-docs/modules/ROOT/pages/data-access/jdbc/embedded-database-support.adoc

@@ -78,27 +78,27 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Configuration
-	public class DataSourceConfig {
+    @Configuration
+    public class DataSourceConfig {
 
-		@Bean
-		public DataSource dataSource() {
-			return new EmbeddedDatabaseBuilder()
-					.setDatabaseConfigurer(EmbeddedDatabaseConfigurers
-							.customizeConfigurer(H2, this::customize))
-					.addScript("schema.sql")
-					.build();
-		}
+        @Bean
+        public DataSource dataSource() {
+            return new EmbeddedDatabaseBuilder()
+                    .setDatabaseConfigurer(EmbeddedDatabaseConfigurers
+                            .customizeConfigurer(H2, this::customize))
+                    .addScript("schema.sql")
+                    .build();
+        }
 
-		private EmbeddedDatabaseConfigurer customize(EmbeddedDatabaseConfigurer defaultConfigurer) {
-			return new EmbeddedDatabaseConfigurerDelegate(defaultConfigurer) {
-				@Override
-				public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
-					super.configureConnectionProperties(properties, databaseName);
-					properties.setDriverClass(CustomDriver.class);
-				}
-			};
-		}
+        private EmbeddedDatabaseConfigurer customize(EmbeddedDatabaseConfigurer defaultConfigurer) {
+            return new EmbeddedDatabaseConfigurerDelegate(defaultConfigurer) {
+                @Override
+                public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
+                    super.configureConnectionProperties(properties, databaseName);
+                    properties.setDriverClass(CustomDriver.class);
+                }
+            };
+        }
 	}
 ----
 

framework-docs/modules/ROOT/pages/data-access/r2dbc.adoc

@@ -136,7 +136,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	Mono<Void> completion = client.sql("CREATE TABLE person (id VARCHAR(255) PRIMARY KEY, name VARCHAR(255), age INTEGER);")
-			.then();
+	        .then();
 ----
 
 Kotlin::
@@ -144,7 +144,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("CREATE TABLE person (id VARCHAR(255) PRIMARY KEY, name VARCHAR(255), age INTEGER);")
-			.await()
+	        .await()
 ----
 ======
 
@@ -173,7 +173,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	Mono<Map<String, Object>> first = client.sql("SELECT id, name FROM person")
-			.fetch().first();
+	        .fetch().first();
 ----
 
 Kotlin::
@@ -181,7 +181,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val first = client.sql("SELECT id, name FROM person")
-			.fetch().awaitSingle()
+	        .fetch().awaitSingle()
 ----
 ======
 
@@ -194,8 +194,8 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	Mono<Map<String, Object>> first = client.sql("SELECT id, name FROM person WHERE first_name = :fn")
-			.bind("fn", "Joe")
-			.fetch().first();
+	        .bind("fn", "Joe")
+	        .fetch().first();
 ----
 
 Kotlin::
@@ -203,8 +203,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val first = client.sql("SELECT id, name FROM person WHERE first_name = :fn")
-			.bind("fn", "Joe")
-			.fetch().awaitSingle()
+	        .bind("fn", "Joe")
+	        .fetch().awaitSingle()
 ----
 ======
 
@@ -240,8 +240,8 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	Flux<String> names = client.sql("SELECT name FROM person")
-			.map(row -> row.get("name", String.class))
-			.all();
+	        .map(row -> row.get("name", String.class))
+	        .all();
 ----
 
 Kotlin::
@@ -249,8 +249,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val names = client.sql("SELECT name FROM person")
-			.map{ row: Row -> row.get("name", String.class) }
-			.flow()
+	        .map{ row: Row -> row.get("name", String.class) }
+	        .flow()
 ----
 ======
 
@@ -301,8 +301,8 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	Mono<Integer> affectedRows = client.sql("UPDATE person SET first_name = :fn")
-			.bind("fn", "Joe")
-			.fetch().rowsUpdated();
+	        .bind("fn", "Joe")
+	        .fetch().rowsUpdated();
 ----
 
 Kotlin::
@@ -310,8 +310,8 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	val affectedRows = client.sql("UPDATE person SET first_name = :fn")
-			.bind("fn", "Joe")
-			.fetch().awaitRowsUpdated()
+	        .bind("fn", "Joe")
+	        .fetch().awaitRowsUpdated()
 ----
 ======
 
@@ -337,9 +337,9 @@ The following example shows parameter binding for a query:
 
 [source,java]
 ----
-	db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
-			.bind("id", "joe")
-			.bind("name", "Joe")
+    db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
+	    	.bind("id", "joe")
+	    	.bind("name", "Joe")
 			.bind("age", 34);
 ----
 
@@ -369,9 +369,9 @@ Indices are zero based.
 
 [source,java]
 ----
-	db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
-			.bind(0, "joe")
-			.bind(1, "Joe")
+    db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
+	    	.bind(0, "joe")
+	    	.bind(1, "Joe")
 			.bind(2, 34);
 ----
 
@@ -379,9 +379,9 @@ In case your application is binding to many parameters, the same can be achieved
 
 [source,java]
 ----
-	List<?> values = List.of("joe", "Joe", 34);
-	db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
-			.bindValues(values);
+    List<?> values = List.of("joe", "Joe", 34);
+    db.sql("INSERT INTO person (id, name, age) VALUES(:id, :name, :age)")
+	    	.bindValues(values);
 ----
 
 
@@ -428,7 +428,7 @@ Java::
 	tuples.add(new Object[] {"Ann",  50});
 
 	client.sql("SELECT id, name, state FROM table WHERE (name, age) IN (:tuples)")
-			.bind("tuples", tuples);
+		    .bind("tuples", tuples);
 ----
 
 Kotlin::
@@ -440,7 +440,7 @@ Kotlin::
 	tuples.add(arrayOf("Ann", 50))
 
 	client.sql("SELECT id, name, state FROM table WHERE (name, age) IN (:tuples)")
-			.bind("tuples", tuples)
+		    .bind("tuples", tuples)
 ----
 ======
 
@@ -455,7 +455,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("SELECT id, name, state FROM table WHERE age IN (:ages)")
-			.bind("ages", Arrays.asList(35, 50));
+		    .bind("ages", Arrays.asList(35, 50));
 ----
 
 Kotlin::
@@ -463,7 +463,7 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("SELECT id, name, state FROM table WHERE age IN (:ages)")
-			.bind("ages", arrayOf(35, 50))
+		    .bind("ages", arrayOf(35, 50))
 ----
 ======
 
@@ -490,9 +490,9 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("INSERT INTO table (name, state) VALUES(:name, :state)")
-			.filter((s, next) -> next.execute(s.returnGeneratedValues("id")))
-			.bind("name", …)
-			.bind("state", …);
+		    .filter((s, next) -> next.execute(s.returnGeneratedValues("id")))
+		    .bind("name", …)
+		    .bind("state", …);
 ----
 
 Kotlin::
@@ -516,10 +516,10 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("INSERT INTO table (name, state) VALUES(:name, :state)")
-			.filter(statement -> s.returnGeneratedValues("id"));
+		    .filter(statement -> s.returnGeneratedValues("id"));
 
 	client.sql("SELECT id, name, state FROM table")
-			.filter(statement -> s.fetchSize(25));
+		    .filter(statement -> s.fetchSize(25));
 ----
 
 Kotlin::
@@ -527,10 +527,10 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
 	client.sql("INSERT INTO table (name, state) VALUES(:name, :state)")
-			.filter { statement -> s.returnGeneratedValues("id") }
+		    .filter { statement -> s.returnGeneratedValues("id") }
 
 	client.sql("SELECT id, name, state FROM table")
-			.filter { statement -> s.fetchSize(25) }
+		    .filter { statement -> s.fetchSize(25) }
 ----
 ======
 

framework-docs/modules/ROOT/pages/integration/cds.adoc

@@ -55,11 +55,11 @@ a "shared objects file" source, as shown in the following example:
 
 [source,shell,indent=0,subs="verbatim"]
 ----
-	[0.064s][info][class,load] org.springframework.core.env.EnvironmentCapable source: shared objects file (top)
-	[0.064s][info][class,load] org.springframework.beans.factory.BeanFactory source: shared objects file (top)
-	[0.064s][info][class,load] org.springframework.beans.factory.ListableBeanFactory source: shared objects file (top)
-	[0.064s][info][class,load] org.springframework.beans.factory.HierarchicalBeanFactory source: shared objects file (top)
-	[0.065s][info][class,load] org.springframework.context.MessageSource source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.core.env.EnvironmentCapable source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.BeanFactory source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.ListableBeanFactory source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.HierarchicalBeanFactory source: shared objects file (top)
+    [0.065s][info][class,load] org.springframework.context.MessageSource source: shared objects file (top)
 ----
 
 If CDS can't be enabled or if you have a large number of classes that are not loaded from the cache, make sure that

framework-docs/modules/ROOT/pages/integration/rest-clients.adoc

@@ -30,36 +30,36 @@ Java::
 +
 [source,java,indent=0,subs="verbatim"]
 ----
-	RestClient defaultClient = RestClient.create();
-	
-	RestClient customClient = RestClient.builder()
-		.requestFactory(new HttpComponentsClientHttpRequestFactory())
-		.messageConverters(converters -> converters.add(new MyCustomMessageConverter()))
-		.baseUrl("https://example.com")
-		.defaultUriVariables(Map.of("variable", "foo"))
-		.defaultHeader("My-Header", "Foo")
-		.defaultCookie("My-Cookie", "Bar")
-		.requestInterceptor(myCustomInterceptor)
-		.requestInitializer(myCustomInitializer)
-		.build();
+RestClient defaultClient = RestClient.create();
+
+RestClient customClient = RestClient.builder()
+  .requestFactory(new HttpComponentsClientHttpRequestFactory())
+  .messageConverters(converters -> converters.add(new MyCustomMessageConverter()))
+  .baseUrl("https://example.com")
+  .defaultUriVariables(Map.of("variable", "foo"))
+  .defaultHeader("My-Header", "Foo")
+  .defaultCookie("My-Cookie", "Bar")
+  .requestInterceptor(myCustomInterceptor)
+  .requestInitializer(myCustomInitializer)
+  .build();
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim"]
 ----
-	val defaultClient = RestClient.create()
-	
-	val customClient = RestClient.builder()
-		.requestFactory(HttpComponentsClientHttpRequestFactory())
-		.messageConverters { converters -> converters.add(MyCustomMessageConverter()) }
-		.baseUrl("https://example.com")
-		.defaultUriVariables(mapOf("variable" to "foo"))
-		.defaultHeader("My-Header", "Foo")
-		.defaultCookie("My-Cookie", "Bar")
-		.requestInterceptor(myCustomInterceptor)
-		.requestInitializer(myCustomInitializer)
-		.build()
+val defaultClient = RestClient.create()
+
+val customClient = RestClient.builder()
+  .requestFactory(HttpComponentsClientHttpRequestFactory())
+  .messageConverters { converters -> converters.add(MyCustomMessageConverter()) }
+  .baseUrl("https://example.com")
+  .defaultUriVariables(mapOf("variable" to "foo"))
+  .defaultHeader("My-Header", "Foo")
+  .defaultCookie("My-Cookie", "Bar")
+  .requestInterceptor(myCustomInterceptor)
+  .requestInitializer(myCustomInitializer)
+  .build()
 ----
 ======
 
@@ -81,20 +81,20 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	int id = 42;
-	restClient.get()
-		.uri("https://example.com/orders/{id}", id)
-		// ...
+int id = 42;
+restClient.get()
+  .uri("https://example.com/orders/{id}", id)
+  ....
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val id = 42
-	restClient.get()
-		.uri("https://example.com/orders/{id}", id)
-		// ...
+val id = 42
+restClient.get()
+  .uri("https://example.com/orders/{id}", id)
+  ...
 ----
 ======
 
@@ -133,12 +133,12 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	String result = restClient.get() <1>
-		.uri("https://example.com") <2>
-		.retrieve() <3>
-		.body(String.class); <4>
-	
-	System.out.println(result); <5>
+String result = restClient.get() <1>
+  .uri("https://example.com") <2>
+  .retrieve() <3>
+  .body(String.class); <4>
+
+System.out.println(result); <5>
 ----
 <1> Set up a GET request
 <2> Specify the URL to connect to
@@ -150,12 +150,12 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val result= restClient.get() <1>
-		.uri("https://example.com") <2>
-		.retrieve() <3>
-		.body<String>() <4>
-	
-	println(result) <5>
+val result= restClient.get() <1>
+  .uri("https://example.com") <2>
+  .retrieve() <3>
+  .body<String>() <4>
+
+println(result) <5>
 ----
 <1> Set up a GET request
 <2> Specify the URL to connect to
@@ -172,14 +172,14 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	ResponseEntity<String> result = restClient.get() <1>
-		.uri("https://example.com") <1>
-		.retrieve()
-		.toEntity(String.class); <2>
-	
-	System.out.println("Response status: " + result.getStatusCode()); <3>
-	System.out.println("Response headers: " + result.getHeaders()); <3>
-	System.out.println("Contents: " + result.getBody()); <3>
+ResponseEntity<String> result = restClient.get() <1>
+  .uri("https://example.com") <1>
+  .retrieve()
+  .toEntity(String.class); <2>
+
+System.out.println("Response status: " + result.getStatusCode()); <3>
+System.out.println("Response headers: " + result.getHeaders()); <3>
+System.out.println("Contents: " + result.getBody()); <3>
 ----
 <1> Set up a GET request for the specified URL
 <2> Convert the response into a `ResponseEntity`
@@ -189,14 +189,14 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val result = restClient.get() <1>
-		.uri("https://example.com") <1>
-		.retrieve()
-		.toEntity<String>() <2>
-	
-	println("Response status: " + result.statusCode) <3>
-	println("Response headers: " + result.headers) <3>
-	println("Contents: " + result.body) <3>
+val result = restClient.get() <1>
+  .uri("https://example.com") <1>
+  .retrieve()
+  .toEntity<String>() <2>
+
+println("Response status: " + result.statusCode) <3>
+println("Response headers: " + result.headers) <3>
+println("Contents: " + result.body) <3>
 ----
 <1> Set up a GET request for the specified URL
 <2> Convert the response into a `ResponseEntity`
@@ -212,12 +212,12 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	int id = ...;
-	Pet pet = restClient.get()
-		.uri("https://petclinic.example.com/pets/{id}", id) <1>
-		.accept(APPLICATION_JSON) <2>
-		.retrieve()
-		.body(Pet.class); <3>
+int id = ...;
+Pet pet = restClient.get()
+  .uri("https://petclinic.example.com/pets/{id}", id) <1>
+  .accept(APPLICATION_JSON) <2>
+  .retrieve()
+  .body(Pet.class); <3>
 ----
 <1> Using URI variables
 <2> Set the `Accept` header to `application/json`
@@ -227,12 +227,12 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val id = ...
-	val pet = restClient.get()
-		.uri("https://petclinic.example.com/pets/{id}", id) <1>
-		.accept(APPLICATION_JSON) <2>
-		.retrieve()
-		.body<Pet>() <3>
+val id = ...
+val pet = restClient.get()
+  .uri("https://petclinic.example.com/pets/{id}", id) <1>
+  .accept(APPLICATION_JSON) <2>
+  .retrieve()
+  .body<Pet>() <3>
 ----
 <1> Using URI variables
 <2> Set the `Accept` header to `application/json`
@@ -247,13 +247,13 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Pet pet = ... <1>
-	ResponseEntity<Void> response = restClient.post() <2>
-		.uri("https://petclinic.example.com/pets/new") <2>
-		.contentType(APPLICATION_JSON) <3>
-		.body(pet) <4>
-		.retrieve()
-		.toBodilessEntity(); <5>
+Pet pet = ... <1>
+ResponseEntity<Void> response = restClient.post() <2>
+  .uri("https://petclinic.example.com/pets/new") <2>
+  .contentType(APPLICATION_JSON) <3>
+  .body(pet) <4>
+  .retrieve()
+  .toBodilessEntity(); <5>
 ----
 <1> Create a `Pet` domain object
 <2> Set up a POST request, and the URL to connect to
@@ -265,13 +265,13 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val pet: Pet = ... <1>
-	val response = restClient.post() <2>
-		.uri("https://petclinic.example.com/pets/new") <2>
-		.contentType(APPLICATION_JSON) <3>
-		.body(pet) <4>
-		.retrieve()
-		.toBodilessEntity() <5>
+val pet: Pet = ... <1>
+val response = restClient.post() <2>
+  .uri("https://petclinic.example.com/pets/new") <2>
+  .contentType(APPLICATION_JSON) <3>
+  .body(pet) <4>
+  .retrieve()
+  .toBodilessEntity() <5>
 ----
 <1> Create a `Pet` domain object
 <2> Set up a POST request, and the URL to connect to
@@ -291,13 +291,13 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	String result = restClient.get() <1>
-		.uri("https://example.com/this-url-does-not-exist") <1>
-		.retrieve()
-		.onStatus(HttpStatusCode::is4xxClientError, (request, response) -> { <2>
-			throw new MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()); <3>
-		})
-		.body(String.class);
+String result = restClient.get() <1>
+  .uri("https://example.com/this-url-does-not-exist") <1>
+  .retrieve()
+  .onStatus(HttpStatusCode::is4xxClientError, (request, response) -> { <2>
+      throw new MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()); <3>
+  })
+  .body(String.class);
 ----
 <1> Create a GET request for a URL that returns a 404 status code
 <2> Set up a status handler for all 4xx status codes
@@ -307,12 +307,12 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val result = restClient.get() <1>
-		.uri("https://example.com/this-url-does-not-exist") <1>
-		.retrieve()
-		.onStatus(HttpStatusCode::is4xxClientError) { _, response -> <2>
-			throw MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()) } <3>
-		.body<String>()
+val result = restClient.get() <1>
+  .uri("https://example.com/this-url-does-not-exist") <1>
+  .retrieve()
+  .onStatus(HttpStatusCode::is4xxClientError) { _, response -> <2>
+    throw MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()) } <3>
+  .body<String>()
 ----
 <1> Create a GET request for a URL that returns a 404 status code
 <2> Set up a status handler for all 4xx status codes
@@ -330,18 +330,18 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Pet result = restClient.get()
-		.uri("https://petclinic.example.com/pets/{id}", id)
-		.accept(APPLICATION_JSON)
-		.exchange((request, response) -> { <1>
-			if (response.getStatusCode().is4xxClientError()) { <2>
-				throw new MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()); <2>
-			}
-			else {
-				Pet pet = convertResponse(response); <3>
-				return pet;
-			}
-		});
+Pet result = restClient.get()
+  .uri("https://petclinic.example.com/pets/{id}", id)
+  .accept(APPLICATION_JSON)
+  .exchange((request, response) -> { <1>
+    if (response.getStatusCode().is4xxClientError()) { <2>
+      throw new MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()); <2>
+    }
+    else {
+      Pet pet = convertResponse(response); <3>
+      return pet;
+    }
+  });
 ----
 <1> `exchange` provides the request and response
 <2> Throw an exception when the response has a 4xx status code
@@ -351,17 +351,17 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val result = restClient.get()
-		.uri("https://petclinic.example.com/pets/{id}", id)
-		.accept(MediaType.APPLICATION_JSON)
-		.exchange { request, response -> <1>
-			if (response.getStatusCode().is4xxClientError()) { <2>
-				throw MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()) <2>
-			} else {
-				val pet: Pet = convertResponse(response) <3>
-				pet
-			}
-		}
+val result = restClient.get()
+  .uri("https://petclinic.example.com/pets/{id}", id)
+  .accept(MediaType.APPLICATION_JSON)
+  .exchange { request, response -> <1>
+    if (response.getStatusCode().is4xxClientError()) { <2>
+      throw MyCustomRuntimeException(response.getStatusCode(), response.getHeaders()) <2>
+    } else {
+      val pet: Pet = convertResponse(response) <3>
+      pet
+    }
+  }
 ----
 <1> `exchange` provides the request and response
 <2> Throw an exception when the response has a 4xx status code
@@ -380,14 +380,15 @@ To serialize only a subset of the object properties, you can specify a {baeldung
 
 [source,java,indent=0,subs="verbatim"]
 ----
-	MappingJacksonValue value = new MappingJacksonValue(new User("eric", "7!jd#h23"));
-	value.setSerializationView(User.WithoutPasswordView.class);
-	
-	ResponseEntity<Void> response = restClient.post() // or RestTemplate.postForEntity
-		.contentType(APPLICATION_JSON)
-		.body(value)
-		.retrieve()
-		.toBodilessEntity();
+MappingJacksonValue value = new MappingJacksonValue(new User("eric", "7!jd#h23"));
+value.setSerializationView(User.WithoutPasswordView.class);
+
+ResponseEntity<Void> response = restClient.post() // or RestTemplate.postForEntity
+  .contentType(APPLICATION_JSON)
+  .body(value)
+  .retrieve()
+  .toBodilessEntity();
+
 ----
 
 ==== Multipart
@@ -397,24 +398,24 @@ For example:
 
 [source,java,indent=0,subs="verbatim"]
 ----
-	MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
-	
-	parts.add("fieldPart", "fieldValue");
-	parts.add("filePart", new FileSystemResource("...logo.png"));
-	parts.add("jsonPart", new Person("Jason"));
-	
-	HttpHeaders headers = new HttpHeaders();
-	headers.setContentType(MediaType.APPLICATION_XML);
-	parts.add("xmlPart", new HttpEntity<>(myBean, headers));
-	
-	// send using RestClient.post or RestTemplate.postForEntity
+MultiValueMap<String, Object> parts = new LinkedMultiValueMap<>();
+
+parts.add("fieldPart", "fieldValue");
+parts.add("filePart", new FileSystemResource("...logo.png"));
+parts.add("jsonPart", new Person("Jason"));
+
+HttpHeaders headers = new HttpHeaders();
+headers.setContentType(MediaType.APPLICATION_XML);
+parts.add("xmlPart", new HttpEntity<>(myBean, headers));
+
+// send using RestClient.post or RestTemplate.postForEntity
 ----
 
 In most cases, you do not have to specify the `Content-Type` for each part.
 The content type is determined automatically based on the `HttpMessageConverter` chosen to serialize it or, in the case of a `Resource`, based on the file extension.
 If necessary, you can explicitly provide the `MediaType` with an `HttpEntity` wrapper.
 
-Once the `MultiValueMap` is ready, you can use it as the body of a `POST` request, using `RestClient.post().body(parts)` (or `RestTemplate.postForObject`).
+Once the `MultiValueMap` is ready, you can use it as the body of a `POST` request, using  `RestClient.post().body(parts)` (or `RestTemplate.postForObject`).
 
 If the `MultiValueMap` contains at least one non-`String` value, the `Content-Type` is set to `multipart/form-data` by the `FormHttpMessageConverter`.
 If the `MultiValueMap` has `String` values, the `Content-Type` defaults to `application/x-www-form-urlencoded`.
@@ -1136,11 +1137,11 @@ performed through the client:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	RestTemplate restTemplate = new RestTemplate();
-	restTemplate.setErrorHandler(myErrorHandler);
-	
-	RestTemplateAdapter adapter = RestTemplateAdapter.create(restTemplate);
-	HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
+    RestTemplate restTemplate = new RestTemplate();
+    restTemplate.setErrorHandler(myErrorHandler);
+
+    RestTemplateAdapter adapter = RestTemplateAdapter.create(restTemplate);
+    HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
 ----
 
 For more details and options, see the Javadoc of `setErrorHandler` in `RestTemplate` and

framework-docs/modules/ROOT/pages/languages/kotlin/coroutines.adoc

@@ -215,43 +215,45 @@ For suspending functions, a `TransactionalOperator.executeAndAwait` extension is
 
 [source,kotlin,indent=0]
 ----
-	import org.springframework.transaction.reactive.executeAndAwait
+    import org.springframework.transaction.reactive.executeAndAwait
 
-	class PersonRepository(private val operator: TransactionalOperator) {
+    class PersonRepository(private val operator: TransactionalOperator) {
 
-		suspend fun initDatabase() = operator.executeAndAwait {
-			insertPerson1()
-			insertPerson2()
-		}
+        suspend fun initDatabase() = operator.executeAndAwait {
+            insertPerson1()
+            insertPerson2()
+        }
 
-		private suspend fun insertPerson1() {
-			// INSERT SQL statement
-		}
+        private suspend fun insertPerson1() {
+            // INSERT SQL statement
+        }
 
-		private suspend fun insertPerson2() {
-			// INSERT SQL statement
-		}
-	}
+        private suspend fun insertPerson2() {
+            // INSERT SQL statement
+        }
+    }
 ----
 
 For Kotlin `Flow`, a  `Flow<T>.transactional` extension is provided.
 
 [source,kotlin,indent=0]
 ----
-	import org.springframework.transaction.reactive.transactional
+    import org.springframework.transaction.reactive.transactional
 
-	class PersonRepository(private val operator: TransactionalOperator) {
+    class PersonRepository(private val operator: TransactionalOperator) {
 
-		fun updatePeople() = findPeople().map(::updatePerson).transactional(operator)
+        fun updatePeople() = findPeople().map(::updatePerson).transactional(operator)
 
-		private fun findPeople(): Flow<Person> {
-			// SELECT SQL statement
-		}
+        private fun findPeople(): Flow<Person> {
+            // SELECT SQL statement
+        }
 
-		private suspend fun updatePerson(person: Person): Person {
-			// UPDATE SQL statement
-		}
-	}
+        private suspend fun updatePerson(person: Person): Person {
+            // UPDATE SQL statement
+        }
+    }
 ----
 
 
+
+

framework-docs/modules/ROOT/pages/languages/kotlin/spring-projects-in.adoc

@@ -190,7 +190,7 @@ NOTE: If you use Spring Boot, you should probably use
 instead of `@Value` annotations.
 
 As an alternative, you can customize the property placeholder prefix by declaring the
-following `PropertySourcesPlaceholderConfigurer` bean:
+following configuration beans:
 
 [source,kotlin,indent=0]
 ----
@@ -200,10 +200,8 @@ following `PropertySourcesPlaceholderConfigurer` bean:
 	}
 ----
 
-You can support components (such as Spring Boot actuators or `@LocalServerPort`) that use
-the standard `${...}` syntax alongside components that use the custom `%{...}` syntax by
-declaring multiple `PropertySourcesPlaceholderConfigurer` beans, as the following example
-shows:
+You can customize existing code (such as Spring Boot actuators or `@LocalServerPort`)
+that uses the `${...}` syntax, with configuration beans, as the following example shows:
 
 [source,kotlin,indent=0]
 ----
@@ -217,9 +215,6 @@ shows:
 	fun defaultPropertyConfigurer() = PropertySourcesPlaceholderConfigurer()
 ----
 
-In addition, the default escape character can be changed or disabled globally by setting
-the `spring.placeholder.escapeCharacter.default` property via a JVM system property (or
-via the xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism).
 
 
 [[checked-exceptions]]
@@ -301,17 +296,17 @@ for example when writing a `org.springframework.core.convert.converter.Converter
 
 [source,kotlin,indent=0]
 ----
-	class ListOfFooConverter : Converter<List<Foo>, CustomJavaList<out Foo>> {
-		// ...
-	}
+class ListOfFooConverter : Converter<List<Foo>, CustomJavaList<out Foo>> {
+    // ...
+}
 ----
 
 When converting any kind of objects, star projection with `*` can be used instead of `out Any`.
 [source,kotlin,indent=0]
 ----
-	class ListOfAnyConverter : Converter<List<*>, CustomJavaList<*>> {
-		// ...
-	}
+class ListOfAnyConverter : Converter<List<*>, CustomJavaList<*>> {
+    // ...
+}
 ----
 
 NOTE: Spring Framework does not leverage yet declaration-site variance type information for injecting beans,
@@ -345,14 +340,13 @@ file with a `spring.test.constructor.autowire.mode = all` property.
 
 [source,kotlin,indent=0]
 ----
-	@SpringJUnitConfig(TestConfig::class)
-	@TestConstructor(autowireMode = AutowireMode.ALL)
-	class OrderServiceIntegrationTests(
-					val orderService: OrderService,
-					val customerService: CustomerService) {
-	
-		// tests that use the injected OrderService and CustomerService
-	}
+@SpringJUnitConfig(TestConfig::class)
+@TestConstructor(autowireMode = AutowireMode.ALL)
+class OrderServiceIntegrationTests(val orderService: OrderService,
+                                   val customerService: CustomerService) {
+
+    // tests that use the injected OrderService and CustomerService
+}
 ----
 
 
@@ -374,29 +368,29 @@ The following example demonstrates `@BeforeAll` and `@AfterAll` annotations on n
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class IntegrationTests {
 
-	val application = Application(8181)
-	val client = WebClient.create("http://localhost:8181")
+  val application = Application(8181)
+  val client = WebClient.create("http://localhost:8181")
 
-	@BeforeAll
-	fun beforeAll() {
-		application.start()
-	}
+  @BeforeAll
+  fun beforeAll() {
+    application.start()
+  }
 
-	@Test
-	fun `Find all users on HTML page`() {
-		client.get().uri("/users")
-				.accept(TEXT_HTML)
-				.retrieve()
-				.bodyToMono<String>()
-				.test()
-				.expectNextMatches { it.contains("Foo") }
-				.verifyComplete()
-	}
+  @Test
+  fun `Find all users on HTML page`() {
+    client.get().uri("/users")
+        .accept(TEXT_HTML)
+        .retrieve()
+        .bodyToMono<String>()
+        .test()
+        .expectNextMatches { it.contains("Foo") }
+        .verifyComplete()
+  }
 
-	@AfterAll
-	fun afterAll() {
-		application.stop()
-	}
+  @AfterAll
+  fun afterAll() {
+    application.stop()
+  }
 }
 ----
 
@@ -409,27 +403,26 @@ The following example shows how to do so:
 
 [source,kotlin,indent=0]
 ----
-	class SpecificationLikeTests {
-	
-		@Nested
-		@DisplayName("a calculator")
-		inner class Calculator {
+class SpecificationLikeTests {
 
-			val calculator = SampleCalculator()
-	
-			@Test
-			fun `should return the result of adding the first number to the second number`() {
-				val sum = calculator.sum(2, 4)
-				assertEquals(6, sum)
-			}
-	
-			@Test
-			fun `should return the result of subtracting the second number from the first number`() {
-				val subtract = calculator.subtract(4, 2)
-				assertEquals(2, subtract)
-			}
-		}
-	}
+  @Nested
+  @DisplayName("a calculator")
+  inner class Calculator {
+     val calculator = SampleCalculator()
+
+     @Test
+     fun `should return the result of adding the first number to the second number`() {
+        val sum = calculator.sum(2, 4)
+        assertEquals(6, sum)
+     }
+
+     @Test
+     fun `should return the result of subtracting the second number from the first number`() {
+        val subtract = calculator.subtract(4, 2)
+        assertEquals(2, subtract)
+     }
+  }
+}
 ----
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/web.adoc

@@ -1,6 +1,8 @@
 [[kotlin-web]]
 = Web
 
+
+
 [[router-dsl]]
 == Router DSL
 
@@ -14,27 +16,27 @@ These DSL let you write clean and idiomatic Kotlin code to build a `RouterFuncti
 
 [source,kotlin,indent=0]
 ----
-	@Configuration
-	class RouterRouterConfiguration {
-	
-		@Bean
-		fun mainRouter(userHandler: UserHandler) = router {
-			accept(TEXT_HTML).nest {
-				GET("/") { ok().render("index") }
-				GET("/sse") { ok().render("sse") }
-				GET("/users", userHandler::findAllView)
-			}
-			"/api".nest {
-				accept(APPLICATION_JSON).nest {
-					GET("/users", userHandler::findAll)
-				}
-				accept(TEXT_EVENT_STREAM).nest {
-					GET("/users", userHandler::stream)
-				}
-			}
-			resources("/**", ClassPathResource("static/"))
+@Configuration
+class RouterRouterConfiguration {
+
+	@Bean
+	fun mainRouter(userHandler: UserHandler) = router {
+		accept(TEXT_HTML).nest {
+			GET("/") { ok().render("index") }
+			GET("/sse") { ok().render("sse") }
+			GET("/users", userHandler::findAllView)
 		}
+		"/api".nest {
+			accept(APPLICATION_JSON).nest {
+				GET("/users", userHandler::findAll)
+			}
+			accept(TEXT_EVENT_STREAM).nest {
+				GET("/users", userHandler::stream)
+			}
+		}
+		resources("/**", ClassPathResource("static/"))
 	}
+}
 ----
 
 NOTE: This DSL is programmatic, meaning that it allows custom registration logic of beans
@@ -53,22 +55,22 @@ idiomatic Kotlin API and to allow better discoverability (no usage of static met
 
 [source,kotlin,indent=0]
 ----
-	val mockMvc: MockMvc = ...
-	mockMvc.get("/person/{name}", "Lee") {
-		secure = true
-		accept = APPLICATION_JSON
-		headers {
-			contentLanguage = Locale.FRANCE
-		}
-		principal = Principal { "foo" }
-	}.andExpect {
-		status { isOk }
-		content { contentType(APPLICATION_JSON) }
-		jsonPath("$.name") { value("Lee") }
-		content { json("""{"someBoolean": false}""", false) }
-	}.andDo {
-		print()
+val mockMvc: MockMvc = ...
+mockMvc.get("/person/{name}", "Lee") {
+	secure = true
+	accept = APPLICATION_JSON
+	headers {
+		contentLanguage = Locale.FRANCE
 	}
+	principal = Principal { "foo" }
+}.andExpect {
+	status { isOk }
+	content { contentType(APPLICATION_JSON) }
+	jsonPath("$.name") { value("Lee") }
+	content { json("""{"someBoolean": false}""", false) }
+}.andDo {
+	print()
+}
 ----
 
 
@@ -87,9 +89,9 @@ is possible to use such feature to render Kotlin-based templates with
 `build.gradle.kts`
 [source,kotlin,indent=0]
 ----
-	dependencies {
-		runtime("org.jetbrains.kotlin:kotlin-scripting-jsr223:${kotlinVersion}")
-	}
+dependencies {
+        runtime("org.jetbrains.kotlin:kotlin-scripting-jsr223:${kotlinVersion}")
+}
 ----
 
 Configuration is usually done with `ScriptTemplateConfigurer` and `ScriptTemplateViewResolver` beans.
@@ -97,23 +99,23 @@ Configuration is usually done with `ScriptTemplateConfigurer` and `ScriptTemplat
 `KotlinScriptConfiguration.kt`
 [source,kotlin,indent=0]
 ----
-	@Configuration
-	class KotlinScriptConfiguration {
-	
-		@Bean
-		fun kotlinScriptConfigurer() = ScriptTemplateConfigurer().apply {
-			engineName = "kotlin"
-			setScripts("scripts/render.kts")
-			renderFunction = "render"
-			isSharedEngine = false
-		}
-	
-		@Bean
-		fun kotlinScriptViewResolver() = ScriptTemplateViewResolver().apply {
-			setPrefix("templates/")
-			setSuffix(".kts")
-		}
+@Configuration
+class KotlinScriptConfiguration {
+
+    @Bean
+	fun kotlinScriptConfigurer() = ScriptTemplateConfigurer().apply {
+		engineName = "kotlin"
+		setScripts("scripts/render.kts")
+		renderFunction = "render"
+		isSharedEngine = false
 	}
+
+    @Bean
+    fun kotlinScriptViewResolver() = ScriptTemplateViewResolver().apply {
+        setPrefix("templates/")
+        setSuffix(".kts")
+    }
+}
 ----
 
 See the https://github.com/sdeleuze/kotlin-script-templating[kotlin-script-templating] example
@@ -125,7 +127,7 @@ project for more details.
 == Kotlin multiplatform serialization
 
 {kotlin-github-org}/kotlinx.serialization[Kotlin multiplatform serialization] is
-supported in Spring MVC, Spring WebFlux and Spring Messaging (RSocket). The built-in support currently targets CBOR, JSON, and ProtoBuf formats.
+supported in Spring MVC, Spring WebFlux and Spring Messaging (RSocket). The builtin support currently targets CBOR, JSON, and ProtoBuf formats.
 
 To enable it, follow {kotlin-github-org}/kotlinx.serialization#setup[those instructions] to add the related dependency and plugin.
 With Spring MVC and WebFlux, both Kotlin serialization and Jackson will be configured by default if they are in the classpath since
@@ -133,3 +135,6 @@ Kotlin serialization is designed to serialize only Kotlin classes annotated with
 With Spring Messaging (RSocket), make sure that neither Jackson, GSON or JSONB are in the classpath if you want automatic configuration,
 if Jackson is needed configure `KotlinSerializationJsonMessageConverter` manually.
 
+
+
+

framework-docs/modules/ROOT/pages/testing/annotations/integration-junit4.adoc

@@ -2,9 +2,8 @@
 = Spring JUnit 4 Testing Annotations
 
 The following annotations are supported only when used in conjunction with the
-xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-runner[SpringRunner],
-xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's JUnit 4 rules], or
-xref:testing/testcontext-framework/support-classes.adoc#testcontext-support-classes-junit4[Spring's JUnit 4 support classes]:
+xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-runner[SpringRunner], xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's JUnit 4 rules]
+, or xref:testing/testcontext-framework/support-classes.adoc#testcontext-support-classes-junit4[Spring's JUnit 4 support classes]:
 
 * xref:testing/annotations/integration-junit4.adoc#integration-testing-annotations-junit4-ifprofilevalue[`@IfProfileValue`]
 * xref:testing/annotations/integration-junit4.adoc#integration-testing-annotations-junit4-profilevaluesourceconfiguration[`@ProfileValueSourceConfiguration`]

framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-mockitobean.adoc

@@ -47,21 +47,6 @@ the same bean in several test classes, make sure to name the fields consistently
 creating unnecessary contexts.
 ====
 
-[WARNING]
-====
-Using `@MockitoBean` or `@MockitoSpyBean` in conjunction with `@ContextHierarchy` can
-lead to undesirable results since each `@MockitoBean` or `@MockitoSpyBean` will be
-applied to all context hierarchy levels by default. To ensure that a particular
-`@MockitoBean` or `@MockitoSpyBean` is applied to a single context hierarchy level, set
-the `contextName` attribute to match a configured `@ContextConfiguration` name – for
-example, `@MockitoBean(contextName = "app-config")` or
-`@MockitoSpyBean(contextName = "app-config")`.
-
-See
-xref:testing/testcontext-framework/ctx-management/hierarchies.adoc#testcontext-ctx-management-ctx-hierarchies-with-bean-overrides[context
-hierarchies with bean overrides] for further details and examples.
-====
-
 Each annotation also defines Mockito-specific attributes to fine-tune the mocking behavior.
 
 The `@MockitoBean` annotation uses the `REPLACE_OR_CREATE`

framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-testbean.adoc

@@ -31,19 +31,6 @@ same bean in several tests, make sure to name the field consistently to avoid cr
 unnecessary contexts.
 ====
 
-[WARNING]
-====
-Using `@TestBean` in conjunction with `@ContextHierarchy` can lead to undesirable results
-since each `@TestBean` will be applied to all context hierarchy levels by default. To
-ensure that a particular `@TestBean` is applied to a single context hierarchy level, set
-the `contextName` attribute to match a configured `@ContextConfiguration` name – for
-example, `@TestBean(contextName = "app-config")`.
-
-See
-xref:testing/testcontext-framework/ctx-management/hierarchies.adoc#testcontext-ctx-management-ctx-hierarchies-with-bean-overrides[context
-hierarchies with bean overrides] for further details and examples.
-====
-
 [NOTE]
 ====
 There are no restrictions on the visibility of `@TestBean` fields or factory methods.

framework-docs/modules/ROOT/pages/testing/mockmvc/hamcrest/async-requests.adoc

@@ -26,16 +26,16 @@ Java::
 
 	@Test
 	void test() throws Exception {
-		MvcResult mvcResult = this.mockMvc.perform(get("/path"))
-				.andExpect(status().isOk()) <1>
-				.andExpect(request().asyncStarted()) <2>
-				.andExpect(request().asyncResult("body")) <3>
-				.andReturn();
+        MvcResult mvcResult = this.mockMvc.perform(get("/path"))
+                .andExpect(status().isOk()) <1>
+                .andExpect(request().asyncStarted()) <2>
+                .andExpect(request().asyncResult("body")) <3>
+                .andReturn();
 
-		this.mockMvc.perform(asyncDispatch(mvcResult)) <4>
-				.andExpect(status().isOk()) <5>
-				.andExpect(content().string("body"));
-	}
+        this.mockMvc.perform(asyncDispatch(mvcResult)) <4>
+                .andExpect(status().isOk()) <5>
+                .andExpect(content().string("body"));
+    }
 ----
 <1> Check response status is still unchanged
 <2> Async processing must have started

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc

@@ -4,7 +4,7 @@
 Once the TestContext framework loads an `ApplicationContext` (or `WebApplicationContext`)
 for a test, that context is cached and reused for all subsequent tests that declare the
 same unique context configuration within the same test suite. To understand how caching
-works, it is important to understand what is meant by "unique" and "test suite."
+works, it is important to understand what is meant by "`unique`" and "`test suite.`"
 
 An `ApplicationContext` can be uniquely identified by the combination of configuration
 parameters that is used to load it. Consequently, the unique combination of configuration
@@ -15,8 +15,8 @@ framework uses the following configuration parameters to build the context cache
 * `classes` (from `@ContextConfiguration`)
 * `contextInitializerClasses` (from `@ContextConfiguration`)
 * `contextCustomizers` (from `ContextCustomizerFactory`) – this includes
-  `@DynamicPropertySource` methods, bean overrides (such as `@TestBean`, `@MockitoBean`,
-  `@MockitoSpyBean` etc.), as well as various features from Spring Boot's testing support.
+  `@DynamicPropertySource` methods as well as various features from Spring Boot's
+  testing support such as `@MockBean` and `@SpyBean`.
 * `contextLoader` (from `@ContextConfiguration`)
 * `parent` (from `@ContextHierarchy`)
 * `activeProfiles` (from `@ActiveProfiles`)

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/context-customizers.adoc

@@ -1,5 +1,5 @@
 [[testcontext-context-customizers]]
-= Context Configuration with Context Customizers
+= Configuration Configuration with Context Customizers
 
 A `ContextCustomizer` is responsible for customizing the supplied
 `ConfigurableApplicationContext` after bean definitions have been loaded into the context

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/hierarchies.adoc

@@ -22,19 +22,8 @@ given level in the hierarchy, the configuration resource type (that is, XML conf
 files or component classes) must be consistent. Otherwise, it is perfectly acceptable to
 have different levels in a context hierarchy configured using different resource types.
 
-[NOTE]
-====
-If you use `@DirtiesContext` in a test whose context is configured as part of a context
-hierarchy, you can use the `hierarchyMode` flag to control how the context cache is
-cleared.
-
-For further details, see the discussion of `@DirtiesContext` in
-xref:testing/annotations/integration-spring/annotation-dirtiescontext.adoc[Spring Testing Annotations]
-and the {spring-framework-api}/test/annotation/DirtiesContext.html[`@DirtiesContext`] javadoc.
-====
-
-The JUnit Jupiter based examples in this section show common configuration scenarios for
-integration tests that require the use of context hierarchies.
+The remaining JUnit Jupiter based examples in this section show common configuration
+scenarios for integration tests that require the use of context hierarchies.
 
 **Single test class with context hierarchy**
 --
@@ -240,118 +229,12 @@ Kotlin::
 	class ExtendedTests : BaseTests() {}
 ----
 ======
+
+.Dirtying a context within a context hierarchy
+NOTE: If you use `@DirtiesContext` in a test whose context is configured as part of a
+context hierarchy, you can use the `hierarchyMode` flag to control how the context cache
+is cleared. For further details, see the discussion of `@DirtiesContext` in
+xref:testing/annotations/integration-spring/annotation-dirtiescontext.adoc[Spring Testing Annotations] and the
+{spring-framework-api}/test/annotation/DirtiesContext.html[`@DirtiesContext`] javadoc.
 --
 
-[[testcontext-ctx-management-ctx-hierarchies-with-bean-overrides]]
-**Context hierarchies with bean overrides**
---
-When `@ContextHierarchy` is used in conjunction with
-xref:testing/testcontext-framework/bean-overriding.adoc[bean overrides] such as
-`@TestBean`, `@MockitoBean`, or `@MockitoSpyBean`, it may be desirable or necessary to
-have the override applied to a single level in the context hierarchy. To achieve that,
-the bean override must specify a context name that matches a name configured via the
-`name` attribute in `@ContextConfiguration`.
-
-The following test class configures the name of the second hierarchy level to be
-`"user-config"` and simultaneously specifies that the `UserService` should be wrapped in
-a Mockito spy in the context named `"user-config"`. Consequently, Spring will only
-attempt to create the spy in the `"user-config"` context and will not attempt to create
-the spy in the parent context.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@ExtendWith(SpringExtension.class)
-	@ContextHierarchy({
-		@ContextConfiguration(classes = AppConfig.class),
-		@ContextConfiguration(classes = UserConfig.class, name = "user-config")
-	})
-	class IntegrationTests {
-
-		@MockitoSpyBean(contextName = "user-config")
-		UserService userService;
-
-		// ...
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@ExtendWith(SpringExtension::class)
-	@ContextHierarchy(
-		ContextConfiguration(classes = [AppConfig::class]),
-		ContextConfiguration(classes = [UserConfig::class], name = "user-config"))
-	class IntegrationTests {
-
-		@MockitoSpyBean(contextName = "user-config")
-		lateinit var userService: UserService
-
-		// ...
-	}
-----
-======
-
-When applying bean overrides in different levels of the context hierarchy, you may need
-to have all of the bean override instances injected into the test class in order to
-interact with them — for example, to configure stubbing for mocks. However, `@Autowired`
-will always inject a matching bean found in the lowest level of the context hierarchy.
-Thus, to inject bean override instances from specific levels in the context hierarchy,
-you need to annotate fields with appropriate bean override annotations and configure the
-name of the context level.
-
-The following test class configures the names of the hierarchy levels to be `"parent"`
-and `"child"`. It also declares two `PropertyService` fields that are configured to
-create or replace `PropertyService` beans with Mockito mocks in the respective contexts,
-named `"parent"` and `"child"`. Consequently, the mock from the `"parent"` context will
-be injected into the `propertyServiceInParent` field, and the mock from the `"child"`
-context will be injected into the `propertyServiceInChild` field.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@ExtendWith(SpringExtension.class)
-	@ContextHierarchy({
-		@ContextConfiguration(classes = ParentConfig.class, name = "parent"),
-		@ContextConfiguration(classes = ChildConfig.class, name = "child")
-	})
-	class IntegrationTests {
-
-		@MockitoBean(contextName = "parent")
-		PropertyService propertyServiceInParent;
-
-		@MockitoBean(contextName = "child")
-		PropertyService propertyServiceInChild;
-
-		// ...
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@ExtendWith(SpringExtension::class)
-	@ContextHierarchy(
-		ContextConfiguration(classes = [ParentConfig::class], name = "parent"),
-		ContextConfiguration(classes = [ChildConfig::class], name = "child"))
-	class IntegrationTests {
-
-		@MockitoBean(contextName = "parent")
-		lateinit var propertyServiceInParent: PropertyService
-
-		@MockitoBean(contextName = "child")
-		lateinit var propertyServiceInChild: PropertyService
-
-		// ...
-	}
-----
-======
---

framework-docs/modules/ROOT/pages/testing/testcontext-framework/parallel-test-execution.adoc

@@ -18,9 +18,9 @@ Do not run tests in parallel if the tests:
 * Use Spring Framework's `@DirtiesContext` support.
 * Use Spring Framework's `@MockitoBean` or `@MockitoSpyBean` support.
 * Use Spring Boot's `@MockBean` or `@SpyBean` support.
-* Use JUnit Jupiter's `@TestMethodOrder` support or any testing framework feature that is
-  designed to ensure that test methods run in a particular order. Note, however, that
-  this does not apply if entire test classes are run in parallel.
+* Use JUnit 4's `@FixMethodOrder` support or any testing framework feature
+  that is designed to ensure that test methods run in a particular order. Note,
+  however, that this does not apply if entire test classes are run in parallel.
 * Change the state of shared services or systems such as a database, message broker,
   filesystem, and others. This applies to both embedded and external systems.
 

framework-docs/modules/ROOT/pages/testing/testcontext-framework/support-classes.adoc

@@ -1,9 +1,166 @@
 [[testcontext-support-classes]]
 = TestContext Framework Support Classes
 
-This section describes the various classes that support the Spring TestContext Framework
-in JUnit and TestNG.
+This section describes the various classes that support the Spring TestContext Framework.
 
+[[testcontext-junit4-runner]]
+== Spring JUnit 4 Runner
+
+The Spring TestContext Framework offers full integration with JUnit 4 through a custom
+runner (supported on JUnit 4.12 or higher). By annotating test classes with
+`@RunWith(SpringJUnit4ClassRunner.class)` or the shorter `@RunWith(SpringRunner.class)`
+variant, developers can implement standard JUnit 4-based unit and integration tests and
+simultaneously reap the benefits of the TestContext framework, such as support for
+loading application contexts, dependency injection of test instances, transactional test
+method execution, and so on. If you want to use the Spring TestContext Framework with an
+alternative runner (such as JUnit 4's `Parameterized` runner) or third-party runners
+(such as the `MockitoJUnitRunner`), you can, optionally, use
+xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's support for JUnit rules] instead.
+
+The following code listing shows the minimal requirements for configuring a test class to
+run with the custom Spring `Runner`:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+	@RunWith(SpringRunner.class)
+	@TestExecutionListeners({})
+	public class SimpleTest {
+
+		@Test
+		public void testMethod() {
+			// test logic...
+		}
+	}
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes"]
+----
+	@RunWith(SpringRunner::class)
+	@TestExecutionListeners
+	class SimpleTest {
+
+		@Test
+		fun testMethod() {
+			// test logic...
+		}
+	}
+----
+======
+
+In the preceding example, `@TestExecutionListeners` is configured with an empty list, to
+disable the default listeners, which otherwise would require an `ApplicationContext` to
+be configured through `@ContextConfiguration`.
+
+[[testcontext-junit4-rules]]
+== Spring JUnit 4 Rules
+
+The `org.springframework.test.context.junit4.rules` package provides the following JUnit
+4 rules (supported on JUnit 4.12 or higher):
+
+* `SpringClassRule`
+* `SpringMethodRule`
+
+`SpringClassRule` is a JUnit `TestRule` that supports class-level features of the Spring
+TestContext Framework, whereas `SpringMethodRule` is a JUnit `MethodRule` that supports
+instance-level and method-level features of the Spring TestContext Framework.
+
+In contrast to the `SpringRunner`, Spring's rule-based JUnit support has the advantage of
+being independent of any `org.junit.runner.Runner` implementation and can, therefore, be
+combined with existing alternative runners (such as JUnit 4's `Parameterized`) or
+third-party runners (such as the `MockitoJUnitRunner`).
+
+To support the full functionality of the TestContext framework, you must combine a
+`SpringClassRule` with a `SpringMethodRule`. The following example shows the proper way
+to declare these rules in an integration test:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+	// Optionally specify a non-Spring Runner via @RunWith(...)
+	@ContextConfiguration
+	public class IntegrationTest {
+
+		@ClassRule
+		public static final SpringClassRule springClassRule = new SpringClassRule();
+
+		@Rule
+		public final SpringMethodRule springMethodRule = new SpringMethodRule();
+
+		@Test
+		public void testMethod() {
+			// test logic...
+		}
+	}
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes"]
+----
+	// Optionally specify a non-Spring Runner via @RunWith(...)
+	@ContextConfiguration
+	class IntegrationTest {
+
+		@Rule
+		val springMethodRule = SpringMethodRule()
+
+		@Test
+		fun testMethod() {
+			// test logic...
+		}
+
+		companion object {
+			@ClassRule
+			val springClassRule = SpringClassRule()
+		}
+	}
+----
+======
+
+[[testcontext-support-classes-junit4]]
+== JUnit 4 Support Classes
+
+The `org.springframework.test.context.junit4` package provides the following support
+classes for JUnit 4-based test cases (supported on JUnit 4.12 or higher):
+
+* `AbstractJUnit4SpringContextTests`
+* `AbstractTransactionalJUnit4SpringContextTests`
+
+`AbstractJUnit4SpringContextTests` is an abstract base test class that integrates the
+Spring TestContext Framework with explicit `ApplicationContext` testing support in a
+JUnit 4 environment. When you extend `AbstractJUnit4SpringContextTests`, you can access a
+`protected` `applicationContext` instance variable that you can use to perform explicit
+bean lookups or to test the state of the context as a whole.
+
+`AbstractTransactionalJUnit4SpringContextTests` is an abstract transactional extension of
+`AbstractJUnit4SpringContextTests` that adds some convenience functionality for JDBC
+access. This class expects a `javax.sql.DataSource` bean and a
+`PlatformTransactionManager` bean to be defined in the `ApplicationContext`. When you
+extend `AbstractTransactionalJUnit4SpringContextTests`, you can access a `protected`
+`jdbcTemplate` instance variable that you can use to run SQL statements to query the
+database. You can use such queries to confirm database state both before and after
+running database-related application code, and Spring ensures that such queries run in
+the scope of the same transaction as the application code. When used in conjunction with
+an ORM tool, be sure to avoid xref:testing/testcontext-framework/tx.adoc#testcontext-tx-false-positives[false positives].
+As mentioned in xref:testing/support-jdbc.adoc[JDBC Testing Support],
+`AbstractTransactionalJUnit4SpringContextTests` also provides convenience methods that
+delegate to methods in `JdbcTestUtils` by using the aforementioned `jdbcTemplate`.
+Furthermore, `AbstractTransactionalJUnit4SpringContextTests` provides an
+`executeSqlScript(..)` method for running SQL scripts against the configured `DataSource`.
+
+TIP: These classes are a convenience for extension. If you do not want your test classes
+to be tied to a Spring-specific class hierarchy, you can configure your own custom test
+classes by using `@RunWith(SpringRunner.class)` or xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's JUnit rules]
+.
 
 [[testcontext-junit-jupiter-extension]]
 == SpringExtension for JUnit Jupiter
@@ -20,17 +177,14 @@ following features above and beyond the feature set that Spring supports for JUn
 TestNG:
 
 * Dependency injection for test constructors, test methods, and test lifecycle callback
-  methods. See xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-di[Dependency
-  Injection with the `SpringExtension`] for further details.
+  methods. See xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-di[Dependency Injection with the `SpringExtension`] for further details.
 * Powerful support for link:https://junit.org/junit5/docs/current/user-guide/#extensions-conditions[conditional
   test execution] based on SpEL expressions, environment variables, system properties,
   and so on. See the documentation for `@EnabledIf` and `@DisabledIf` in
-  xref:testing/annotations/integration-junit-jupiter.adoc[Spring JUnit Jupiter Testing Annotations]
-  for further details and examples.
+  xref:testing/annotations/integration-junit-jupiter.adoc[Spring JUnit Jupiter Testing Annotations] for further details and examples.
 * Custom composed annotations that combine annotations from Spring and JUnit Jupiter. See
   the `@TransactionalDevTestConfig` and `@TransactionalIntegrationTest` examples in
-  xref:testing/annotations/integration-meta.adoc[Meta-Annotation Support for Testing] for
-  further details.
+  xref:testing/annotations/integration-meta.adoc[Meta-Annotation Support for Testing] for further details.
 
 The following code listing shows how to configure a test class to use the
 `SpringExtension` in conjunction with `@ContextConfiguration`:
@@ -153,8 +307,7 @@ Kotlin::
 ======
 
 See the documentation for `@SpringJUnitConfig` and `@SpringJUnitWebConfig` in
-xref:testing/annotations/integration-junit-jupiter.adoc[Spring JUnit Jupiter Testing Annotations]
-for further details.
+xref:testing/annotations/integration-junit-jupiter.adoc[Spring JUnit Jupiter Testing Annotations] for further details.
 
 [[testcontext-junit-jupiter-di]]
 === Dependency Injection with the `SpringExtension`
@@ -165,9 +318,10 @@ extension API from JUnit Jupiter, which lets Spring provide dependency injection
 constructors, test methods, and test lifecycle callback methods.
 
 Specifically, the `SpringExtension` can inject dependencies from the test's
-`ApplicationContext` into test constructors and methods that are annotated with Spring's
-`@BeforeTransaction` and `@AfterTransaction` or JUnit's `@BeforeAll`, `@AfterAll`,
-`@BeforeEach`, `@AfterEach`, `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and others.
+`ApplicationContext` into test constructors and methods that are annotated with
+Spring's `@BeforeTransaction` and `@AfterTransaction` or JUnit's `@BeforeAll`,
+`@AfterAll`, `@BeforeEach`, `@AfterEach`, `@Test`, `@RepeatedTest`, `@ParameterizedTest`,
+and others.
 
 
 [[testcontext-junit-jupiter-di-constructor]]
@@ -187,9 +341,8 @@ autowirable if one of the following conditions is met (in order of precedence).
   attribute set to `ALL`.
 * The default _test constructor autowire mode_ has been changed to `ALL`.
 
-See xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-testconstructor[`@TestConstructor`]
-for details on the use of `@TestConstructor` and how to change the global _test
-constructor autowire mode_.
+See xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-testconstructor[`@TestConstructor`] for details on the use of
+`@TestConstructor` and how to change the global _test constructor autowire mode_.
 
 WARNING: If the constructor for a test class is considered to be _autowirable_, Spring
 assumes the responsibility for resolving arguments for all parameters in the constructor.
@@ -254,9 +407,8 @@ Kotlin::
 Note that this feature lets test dependencies be `final` and therefore immutable.
 
 If the `spring.test.constructor.autowire.mode` property is to `all` (see
-xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-testconstructor[`@TestConstructor`]),
-we can omit the declaration of `@Autowired` on the constructor in the previous example,
-resulting in the following.
+xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-testconstructor[`@TestConstructor`]), we can omit the declaration of
+`@Autowired` on the constructor in the previous example, resulting in the following.
 
 [tabs]
 ======
@@ -401,19 +553,17 @@ honor `@NestedTestConfiguration` semantics.
 In order to allow development teams to change the default to `OVERRIDE` – for example,
 for compatibility with Spring Framework 5.0 through 5.2 – the default mode can be changed
 globally via a JVM system property or a `spring.properties` file in the root of the
-classpath. See the
-xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-nestedtestconfiguration["Changing the default enclosing configuration inheritance mode"]
-note for details.
+classpath. See the xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-nestedtestconfiguration["Changing the default enclosing configuration inheritance mode"]
+ note for details.
 
 Although the following "Hello World" example is very simplistic, it shows how to declare
 common configuration on a top-level class that is inherited by its `@Nested` test
 classes. In this particular example, only the `TestConfig` configuration class is
 inherited. Each nested test class provides its own set of active profiles, resulting in a
 distinct `ApplicationContext` for each nested test class (see
-xref:testing/testcontext-framework/ctx-management/caching.adoc[Context Caching] for details).
-Consult the list of
-xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-nestedtestconfiguration[supported annotations]
-to see which annotations can be inherited in `@Nested` test classes.
+xref:testing/testcontext-framework/ctx-management/caching.adoc[Context Caching] for details). Consult the list of
+xref:testing/annotations/integration-junit-jupiter.adoc#integration-testing-annotations-nestedtestconfiguration[supported annotations] to see
+which annotations can be inherited in `@Nested` test classes.
 
 [tabs]
 ======
@@ -476,174 +626,8 @@ Kotlin::
 ----
 ======
 
-
-[[testcontext-junit4-support]]
-== JUnit 4 Support
-
-[[testcontext-junit4-runner]]
-=== Spring JUnit 4 Runner
-
-The Spring TestContext Framework offers full integration with JUnit 4 through a custom
-runner (supported on JUnit 4.12 or higher). By annotating test classes with
-`@RunWith(SpringJUnit4ClassRunner.class)` or the shorter `@RunWith(SpringRunner.class)`
-variant, developers can implement standard JUnit 4-based unit and integration tests and
-simultaneously reap the benefits of the TestContext framework, such as support for
-loading application contexts, dependency injection of test instances, transactional test
-method execution, and so on. If you want to use the Spring TestContext Framework with an
-alternative runner (such as JUnit 4's `Parameterized` runner) or third-party runners
-(such as the `MockitoJUnitRunner`), you can, optionally, use
-xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's support for JUnit rules]
-instead.
-
-The following code listing shows the minimal requirements for configuring a test class to
-run with the custom Spring `Runner`:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@RunWith(SpringRunner.class)
-	@TestExecutionListeners({})
-	public class SimpleTest {
-
-		@Test
-		public void testMethod() {
-			// test logic...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@RunWith(SpringRunner::class)
-	@TestExecutionListeners
-	class SimpleTest {
-
-		@Test
-		fun testMethod() {
-			// test logic...
-		}
-	}
-----
-======
-
-In the preceding example, `@TestExecutionListeners` is configured with an empty list, to
-disable the default listeners, which otherwise would require an `ApplicationContext` to
-be configured through `@ContextConfiguration`.
-
-[[testcontext-junit4-rules]]
-=== Spring JUnit 4 Rules
-
-The `org.springframework.test.context.junit4.rules` package provides the following JUnit
-4 rules (supported on JUnit 4.12 or higher):
-
-* `SpringClassRule`
-* `SpringMethodRule`
-
-`SpringClassRule` is a JUnit `TestRule` that supports class-level features of the Spring
-TestContext Framework, whereas `SpringMethodRule` is a JUnit `MethodRule` that supports
-instance-level and method-level features of the Spring TestContext Framework.
-
-In contrast to the `SpringRunner`, Spring's rule-based JUnit support has the advantage of
-being independent of any `org.junit.runner.Runner` implementation and can, therefore, be
-combined with existing alternative runners (such as JUnit 4's `Parameterized`) or
-third-party runners (such as the `MockitoJUnitRunner`).
-
-To support the full functionality of the TestContext framework, you must combine a
-`SpringClassRule` with a `SpringMethodRule`. The following example shows the proper way
-to declare these rules in an integration test:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	// Optionally specify a non-Spring Runner via @RunWith(...)
-	@ContextConfiguration
-	public class IntegrationTest {
-
-		@ClassRule
-		public static final SpringClassRule springClassRule = new SpringClassRule();
-
-		@Rule
-		public final SpringMethodRule springMethodRule = new SpringMethodRule();
-
-		@Test
-		public void testMethod() {
-			// test logic...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	// Optionally specify a non-Spring Runner via @RunWith(...)
-	@ContextConfiguration
-	class IntegrationTest {
-
-		@Rule
-		val springMethodRule = SpringMethodRule()
-
-		@Test
-		fun testMethod() {
-			// test logic...
-		}
-
-		companion object {
-			@ClassRule
-			val springClassRule = SpringClassRule()
-		}
-	}
-----
-======
-
-[[testcontext-support-classes-junit4]]
-=== JUnit 4 Base Classes
-
-The `org.springframework.test.context.junit4` package provides the following support
-classes for JUnit 4-based test cases (supported on JUnit 4.12 or higher):
-
-* `AbstractJUnit4SpringContextTests`
-* `AbstractTransactionalJUnit4SpringContextTests`
-
-`AbstractJUnit4SpringContextTests` is an abstract base test class that integrates the
-Spring TestContext Framework with explicit `ApplicationContext` testing support in a
-JUnit 4 environment. When you extend `AbstractJUnit4SpringContextTests`, you can access a
-`protected` `applicationContext` instance variable that you can use to perform explicit
-bean lookups or to test the state of the context as a whole.
-
-`AbstractTransactionalJUnit4SpringContextTests` is an abstract transactional extension of
-`AbstractJUnit4SpringContextTests` that adds some convenience functionality for JDBC
-access. This class expects a `javax.sql.DataSource` bean and a
-`PlatformTransactionManager` bean to be defined in the `ApplicationContext`. When you
-extend `AbstractTransactionalJUnit4SpringContextTests`, you can access a `protected`
-`jdbcTemplate` instance variable that you can use to run SQL statements to query the
-database. You can use such queries to confirm database state both before and after
-running database-related application code, and Spring ensures that such queries run in
-the scope of the same transaction as the application code. When used in conjunction with
-an ORM tool, be sure to avoid
-xref:testing/testcontext-framework/tx.adoc#testcontext-tx-false-positives[false positives].
-As mentioned in xref:testing/support-jdbc.adoc[JDBC Testing Support],
-`AbstractTransactionalJUnit4SpringContextTests` also provides convenience methods that
-delegate to methods in `JdbcTestUtils` by using the aforementioned `jdbcTemplate`.
-Furthermore, `AbstractTransactionalJUnit4SpringContextTests` provides an
-`executeSqlScript(..)` method for running SQL scripts against the configured `DataSource`.
-
-TIP: These classes are a convenience for extension. If you do not want your test classes
-to be tied to a Spring-specific class hierarchy, you can configure your own custom test
-classes by using `@RunWith(SpringRunner.class)` or
-xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit4-rules[Spring's JUnit rules].
-
-
 [[testcontext-support-classes-testng]]
-== TestNG Support
+== TestNG Support Classes
 
 The `org.springframework.test.context.testng` package provides the following support
 classes for TestNG based test cases:
@@ -666,8 +650,7 @@ extend `AbstractTransactionalTestNGSpringContextTests`, you can access a `protec
 database. You can use such queries to confirm database state both before and after
 running database-related application code, and Spring ensures that such queries run in
 the scope of the same transaction as the application code. When used in conjunction with
-an ORM tool, be sure to avoid
-xref:testing/testcontext-framework/tx.adoc#testcontext-tx-false-positives[false positives].
+an ORM tool, be sure to avoid xref:testing/testcontext-framework/tx.adoc#testcontext-tx-false-positives[false positives].
 As mentioned in xref:testing/support-jdbc.adoc[JDBC Testing Support],
 `AbstractTransactionalTestNGSpringContextTests` also provides convenience methods that
 delegate to methods in `JdbcTestUtils` by using the aforementioned `jdbcTemplate`.

framework-docs/modules/ROOT/pages/testing/unit.adoc

@@ -47,7 +47,8 @@ out-of-container tests for code that depends on environment-specific properties.
 The `org.springframework.mock.web` package contains a comprehensive set of Servlet API
 mock objects that are useful for testing web contexts, controllers, and filters. These
 mock objects are targeted at usage with Spring's Web MVC framework and are generally more
-convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock]).
+convenient to use than dynamic mock objects (such as https://easymock.org/[EasyMock])
+or alternative Servlet API mock objects (such as http://www.mockobjects.com[MockObjects]).
 
 TIP: Since Spring Framework 6.0, the mock objects in `org.springframework.mock.web` are
 based on the Servlet 6.0 API.

framework-docs/modules/ROOT/pages/testing/webtestclient.adoc

@@ -396,7 +396,7 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	import org.springframework.test.web.reactive.server.expectBody
+    import org.springframework.test.web.reactive.server.expectBody
 
 	client.get().uri("/persons/1")
 			.exchange()

framework-docs/modules/ROOT/pages/web/webflux-view.adoc

@@ -225,9 +225,9 @@ The following table shows the templating libraries that we have tested on differ
 |Scripting Library |Scripting Engine
 |https://handlebarsjs.com/[Handlebars] |https://openjdk.java.net/projects/nashorn/[Nashorn]
 |https://mustache.github.io/[Mustache] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://react.dev/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://ejs.co/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://docs.ruby-lang.org/en/master/ERB.html[ERB] |https://www.jruby.org[JRuby]
+|https://facebook.github.io/react/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
+|https://www.embeddedjs.com/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
+|https://www.stuartellis.name/articles/erb/[ERB] |https://www.jruby.org[JRuby]
 |https://docs.python.org/2/library/string.html#template-strings[String templates] |https://www.jython.org/[Jython]
 |https://github.com/sdeleuze/kotlin-script-templating[Kotlin Script templating] |{kotlin-site}[Kotlin]
 |===

framework-docs/modules/ROOT/pages/web/webflux-webclient/client-body.adoc

@@ -306,34 +306,34 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Resource resource = ...
-	Mono<String> result = webClient
-		.post()
-		.uri("https://example.com")
-		.body(Flux.concat(
-				FormPartEvent.create("field", "field value"),
-				FilePartEvent.create("file", resource)
-		), PartEvent.class)
-		.retrieve()
-		.bodyToMono(String.class);
+Resource resource = ...
+Mono<String> result = webClient
+    .post()
+    .uri("https://example.com")
+    .body(Flux.concat(
+            FormPartEvent.create("field", "field value"),
+            FilePartEvent.create("file", resource)
+    ), PartEvent.class)
+    .retrieve()
+    .bodyToMono(String.class);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	var resource: Resource = ...
-	var result: Mono<String> = webClient
-		.post()
-		.uri("https://example.com")
-		.body(
-			Flux.concat(
-				FormPartEvent.create("field", "field value"),
-				FilePartEvent.create("file", resource)
-			)
+var resource: Resource = ...
+var result: Mono<String> = webClient
+	.post()
+	.uri("https://example.com")
+	.body(
+		Flux.concat(
+			FormPartEvent.create("field", "field value"),
+			FilePartEvent.create("file", resource)
 		)
-		.retrieve()
-		.bodyToMono()
+	)
+	.retrieve()
+	.bodyToMono()
 ----
 ======
 

framework-docs/modules/ROOT/pages/web/webflux-webclient/client-builder.adoc

@@ -390,29 +390,29 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	HttpClient httpClient = HttpClient.newBuilder()
-		.followRedirects(Redirect.NORMAL)
-		.connectTimeout(Duration.ofSeconds(20))
-		.build();
+    HttpClient httpClient = HttpClient.newBuilder()
+        .followRedirects(Redirect.NORMAL)
+        .connectTimeout(Duration.ofSeconds(20))
+        .build();
 
-	ClientHttpConnector connector =
-			new JdkClientHttpConnector(httpClient, new DefaultDataBufferFactory());
+    ClientHttpConnector connector =
+            new JdkClientHttpConnector(httpClient, new DefaultDataBufferFactory());
 
-	WebClient webClient = WebClient.builder().clientConnector(connector).build();
+    WebClient webClient = WebClient.builder().clientConnector(connector).build();
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val httpClient = HttpClient.newBuilder()
-		.followRedirects(Redirect.NORMAL)
-		.connectTimeout(Duration.ofSeconds(20))
-		.build()
+    val httpClient = HttpClient.newBuilder()
+        .followRedirects(Redirect.NORMAL)
+        .connectTimeout(Duration.ofSeconds(20))
+        .build()
 
-	val connector = JdkClientHttpConnector(httpClient, DefaultDataBufferFactory())
+    val connector = JdkClientHttpConnector(httpClient, DefaultDataBufferFactory())
 
-	val webClient = WebClient.builder().clientConnector(connector).build()
+    val webClient = WebClient.builder().clientConnector(connector).build()
 ----
 ======
 

framework-docs/modules/ROOT/pages/web/webflux-webclient/client-filter.adoc

@@ -158,65 +158,65 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	public class MultipartExchangeFilterFunction implements ExchangeFilterFunction {
-	
-		@Override
-		public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
-			if (MediaType.MULTIPART_FORM_DATA.includes(request.headers().getContentType())
-					&& (request.method() == HttpMethod.PUT || request.method() == HttpMethod.POST)) {
-				return next.exchange(ClientRequest.from(request).body((outputMessage, context) ->
-					request.body().insert(new BufferingDecorator(outputMessage), context)).build()
-				);
-			} else {
-				return next.exchange(request);
-			}
-		}
-	
-		private static final class BufferingDecorator extends ClientHttpRequestDecorator {
-	
-			private BufferingDecorator(ClientHttpRequest delegate) {
-				super(delegate);
-			}
-	
-			@Override
-			public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
-				return DataBufferUtils.join(body).flatMap(buffer -> {
-					getHeaders().setContentLength(buffer.readableByteCount());
-					return super.writeWith(Mono.just(buffer));
-				});
-			}
-		}
-	}
+public class MultipartExchangeFilterFunction implements ExchangeFilterFunction {
+
+    @Override
+    public Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
+        if (MediaType.MULTIPART_FORM_DATA.includes(request.headers().getContentType())
+                && (request.method() == HttpMethod.PUT || request.method() == HttpMethod.POST)) {
+            return next.exchange(ClientRequest.from(request).body((outputMessage, context) ->
+                request.body().insert(new BufferingDecorator(outputMessage), context)).build()
+            );
+        } else {
+            return next.exchange(request);
+        }
+    }
+
+    private static final class BufferingDecorator extends ClientHttpRequestDecorator {
+
+        private BufferingDecorator(ClientHttpRequest delegate) {
+            super(delegate);
+        }
+
+        @Override
+        public Mono<Void> writeWith(Publisher<? extends DataBuffer> body) {
+            return DataBufferUtils.join(body).flatMap(buffer -> {
+                getHeaders().setContentLength(buffer.readableByteCount());
+                return super.writeWith(Mono.just(buffer));
+            });
+        }
+    }
+}
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	class MultipartExchangeFilterFunction : ExchangeFilterFunction {
-	
-		override fun filter(request: ClientRequest, next: ExchangeFunction): Mono<ClientResponse> {
-			return if (MediaType.MULTIPART_FORM_DATA.includes(request.headers().getContentType())
-				&& (request.method() == HttpMethod.PUT || request.method() == HttpMethod.POST)) {
-				next.exchange(ClientRequest.from(request)
-					.body { message, context -> request.body().insert(BufferingDecorator(message), context) }
-					.build())
-			}
-			else {
-				next.exchange(request)
-			}
-	
-		}
-	
-		private class BufferingDecorator(delegate: ClientHttpRequest) : ClientHttpRequestDecorator(delegate) {
-			override fun writeWith(body: Publisher<out DataBuffer>): Mono<Void> {
-				return DataBufferUtils.join(body)
-					.flatMap {
-						headers.contentLength = it.readableByteCount().toLong()
-						super.writeWith(Mono.just(it))
-					}
-			}
-		}
-	}
+class MultipartExchangeFilterFunction : ExchangeFilterFunction {
+
+    override fun filter(request: ClientRequest, next: ExchangeFunction): Mono<ClientResponse> {
+        return if (MediaType.MULTIPART_FORM_DATA.includes(request.headers().getContentType())
+            && (request.method() == HttpMethod.PUT || request.method() == HttpMethod.POST)) {
+            next.exchange(ClientRequest.from(request)
+                .body { message, context -> request.body().insert(BufferingDecorator(message), context) }
+                .build())
+        }
+        else {
+            next.exchange(request)
+        }
+
+    }
+
+    private class BufferingDecorator(delegate: ClientHttpRequest) : ClientHttpRequestDecorator(delegate) {
+        override fun writeWith(body: Publisher<out DataBuffer>): Mono<Void> {
+            return DataBufferUtils.join(body)
+                .flatMap {
+                    headers.contentLength = it.readableByteCount().toLong()
+                    super.writeWith(Mono.just(it))
+                }
+        }
+    }
+}
 ----
-======
+======

framework-docs/modules/ROOT/pages/web/webflux-websocket.adoc

@@ -207,14 +207,14 @@ Kotlin::
 	class ExampleHandler : WebSocketHandler {
 
 		override fun handle(session: WebSocketSession): Mono<Void> {
-			return session.receive()			// <1>
+			return session.receive()            // <1>
 					.doOnNext {
 						// ...					// <2>
 					}
 					.concatMap {
 						// ...					// <3>
 					}
-					.then()						// <4>
+					.then()                     // <4>
 		}
 	}
 ----
@@ -268,16 +268,16 @@ Kotlin::
 
 		override fun handle(session: WebSocketSession): Mono<Void> {
 
-			val output = session.receive()						// <1>
+			val output = session.receive()                      // <1>
 					.doOnNext {
 						// ...
 					}
 					.concatMap {
 						// ...
 					}
-					.map { session.textMessage("Echo $it") }	// <2>
+					.map { session.textMessage("Echo $it") }    // <2>
 
-			return session.send(output)							// <3>
+			return session.send(output)                         // <3>
 		}
 	}
 ----

framework-docs/modules/ROOT/pages/web/webflux/config.adoc

@@ -149,7 +149,7 @@ Java::
 			DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar();
 			registrar.setUseIsoFormat(true);
 			registrar.registerFormatters(registry);
-		}
+      	}
 	}
 ----
 

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-methods/modelattrib-method-args.adoc

@@ -62,7 +62,7 @@ Java::
 ----
 	class Account {
 
-		private final String firstName;
+	    private final String firstName;
 
 		public Account(@BindParam("first-name") String firstName) {
 			this.firstName = firstName;

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-modelattrib-methods.adoc

@@ -93,8 +93,8 @@ Java::
 ----
 	@ModelAttribute
 	public void addAccount(@RequestParam String number) {
-		Mono<Account> accountMono = accountRepository.findAccount(number);
-		model.addAttribute("account", accountMono);
+	    Mono<Account> accountMono = accountRepository.findAccount(number);
+	    model.addAttribute("account", accountMono);
 	}
 
 	@PostMapping("/accounts")

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-requestmapping.adoc

@@ -234,8 +234,8 @@ Kotlin::
 --
 
 URI path patterns can also have embedded `${...}` placeholders that are resolved on startup
-by using `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
-other property sources. You can use this, for example, to parameterize a base URL based on
+through `PropertySourcesPlaceholderConfigurer` against local, system, environment, and
+other property sources. You can use this to, for example, parameterize a base URL based on
 some external configuration.
 
 NOTE: Spring WebFlux uses `PathPattern` and the `PathPatternParser` for URI path matching support.

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-validation.adoc

@@ -57,7 +57,7 @@ locale and language specific resource bundles.
 For further custom handling of method validation errors, you can extend
 `ResponseEntityExceptionHandler` or use an `@ExceptionHandler` method in a controller
 or in a `@ControllerAdvice`, and handle `HandlerMethodValidationException` directly.
-The exception contains a list of ``ParameterValidationResult``s that group validation errors
+The exception contains a list of``ParameterValidationResult``s that group validation errors
 by method parameter. You can either iterate over those, or provide a visitor with callback
 methods by controller method parameter type:
 
@@ -104,21 +104,21 @@ Kotlin::
 
 		override fun requestHeader(requestHeader: RequestHeader, result: ParameterValidationResult) {
 				// ...
-		}
+        }
 
 		override fun requestParam(requestParam: RequestParam?, result: ParameterValidationResult) {
 				// ...
-		}
+        }
 
 		override fun modelAttribute(modelAttribute: ModelAttribute?, errors: ParameterErrors) {
 				// ...
-		}
+        }
 
 		// ...
 
 		override fun other(result: ParameterValidationResult) {
 				// ...
-		}
+        }
 	})
 ----
 ======

framework-docs/modules/ROOT/pages/web/webflux/reactive-spring.adoc

@@ -782,8 +782,8 @@ Java::
 ----
 	WebClient webClient = WebClient.builder()
 			.codecs(configurer -> {
-				CustomDecoder decoder = new CustomDecoder();
-				configurer.customCodecs().registerWithDefaultConfig(decoder);
+					CustomDecoder decoder = new CustomDecoder();
+                    configurer.customCodecs().registerWithDefaultConfig(decoder);
 			})
 			.build();
 ----
@@ -794,8 +794,8 @@ Kotlin::
 ----
 	val webClient = WebClient.builder()
 			.codecs({ configurer ->
-				val decoder = CustomDecoder()
-				configurer.customCodecs().registerWithDefaultConfig(decoder)
+					val decoder = CustomDecoder()
+            		configurer.customCodecs().registerWithDefaultConfig(decoder)
 			 })
 			.build()
 ----

framework-docs/modules/ROOT/pages/web/webmvc-functional.adoc

@@ -276,7 +276,7 @@ ServerResponse.async(asyncResponse);
 ----
 ======
 
-https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events] can be provided via the
+https://www.w3.org/TR/eventsource/[Server-Sent Events] can be provided via the
 static `sse` method on `ServerResponse`. The builder provided by that method
 allows you to send Strings, or other objects as JSON. For example:
 
@@ -781,7 +781,7 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	ClassPathResource index = new ClassPathResource("static/index.html");
+    ClassPathResource index = new ClassPathResource("static/index.html");
 	List<String> extensions = List.of("js", "css", "ico", "png", "jpg", "gif");
 	RequestPredicate spaPredicate = path("/api/**").or(path("/error")).or(pathExtension(extensions::contains)).negate();
 	RouterFunction<ServerResponse> redirectToIndex = route()
@@ -793,7 +793,7 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val redirectToIndex = router {
+    val redirectToIndex = router {
 		val index = ClassPathResource("static/index.html")
 		val extensions = listOf("js", "css", "ico", "png", "jpg", "gif")
 		val spaPredicate = !(path("/api/**") or path("/error") or
@@ -814,16 +814,16 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Resource location = new FileUrlResource("public-resources/");
-	RouterFunction<ServerResponse> resources = RouterFunctions.resources("/resources/**", location);
+    Resource location = new FileUrlResource("public-resources/");
+    RouterFunction<ServerResponse> resources = RouterFunctions.resources("/resources/**", location);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val location = FileUrlResource("public-resources/")
-	val resources = router { resources("/resources/**", location) }
+    val location = FileUrlResource("public-resources/")
+    val resources = router { resources("/resources/**", location) }
 ----
 ======
 

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-script.adoc

@@ -13,9 +13,9 @@ templating libraries on different script engines:
 |Scripting Library |Scripting Engine
 |https://handlebarsjs.com/[Handlebars] |https://openjdk.java.net/projects/nashorn/[Nashorn]
 |https://mustache.github.io/[Mustache] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://react.dev/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://ejs.co/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
-|https://docs.ruby-lang.org/en/master/ERB.html[ERB] |https://www.jruby.org[JRuby]
+|https://facebook.github.io/react/[React] |https://openjdk.java.net/projects/nashorn/[Nashorn]
+|https://www.embeddedjs.com/[EJS] |https://openjdk.java.net/projects/nashorn/[Nashorn]
+|https://www.stuartellis.name/articles/erb/[ERB] |https://www.jruby.org[JRuby]
 |https://docs.python.org/2/library/string.html#template-strings[String templates] |https://www.jython.org/[Jython]
 |https://github.com/sdeleuze/kotlin-script-templating[Kotlin Script templating] |{kotlin-site}[Kotlin]
 |===

framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-async.adoc

@@ -281,7 +281,7 @@ invokes the configured exception resolvers and completes the request.
 === SSE
 
 `SseEmitter` (a subclass of `ResponseBodyEmitter`) provides support for
-https://html.spec.whatwg.org/multipage/server-sent-events.html[Server-Sent Events], where events sent from the server
+https://www.w3.org/TR/eventsource/[Server-Sent Events], where events sent from the server
 are formatted according to the W3C SSE specification. To produce an SSE
 stream from a controller, return `SseEmitter`, as the following example shows:
 

framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-methods/modelattrib-method-args.adoc

@@ -97,7 +97,7 @@ Java::
 ----
 	class Account {
 
-		private final String firstName;
+	    private final String firstName;
 
 		public Account(@BindParam("first-name") String firstName) {
 			this.firstName = firstName;

framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-validation.adoc

@@ -57,7 +57,7 @@ locale and language specific resource bundles.
 For further custom handling of method validation errors, you can extend
 `ResponseEntityExceptionHandler` or use an `@ExceptionHandler` method in a controller
 or in a `@ControllerAdvice`, and handle `HandlerMethodValidationException` directly.
-The exception contains a list of ``ParameterValidationResult``s that group validation errors
+The exception contains a list of``ParameterValidationResult``s that group validation errors
 by method parameter. You can either iterate over those, or provide a visitor with callback
 methods by controller method parameter type:
 
@@ -73,12 +73,12 @@ Java::
 
 		@Override
 		public void requestHeader(RequestHeader requestHeader, ParameterValidationResult result) {
-			// ...
+				// ...
 		}
 
 		@Override
 		public void requestParam(@Nullable RequestParam requestParam, ParameterValidationResult result) {
-			// ...
+				// ...
 		}
 
 		@Override
@@ -88,7 +88,7 @@ Java::
 
 		@Override
 		public void other(ParameterValidationResult result) {
-			// ...
+				// ...
 		}
 	});
 ----
@@ -103,22 +103,22 @@ Kotlin::
 	ex.visitResults(object : HandlerMethodValidationException.Visitor {
 
 		override fun requestHeader(requestHeader: RequestHeader, result: ParameterValidationResult) {
-			// ...
-		}
+				// ...
+        }
 
 		override fun requestParam(requestParam: RequestParam?, result: ParameterValidationResult) {
-			// ...
-		}
+				// ...
+        }
 
 		override fun modelAttribute(modelAttribute: ModelAttribute?, errors: ParameterErrors) {
-			// ...
-		}
+				// ...
+        }
 
 		// ...
 
 		override fun other(result: ParameterValidationResult) {
-			// ...
-		}
+				// ...
+        }
 	})
 ----
 ======

framework-docs/modules/ROOT/pages/web/webmvc/mvc-security.adoc

@@ -13,7 +13,7 @@ reference documentation, including:
 * {docs-spring-security}/features/exploits/csrf.html#csrf-protection[CSRF protection]
 * {docs-spring-security}/features/exploits/headers.html[Security Response Headers]
 
-https://github.com/hdiv/hdiv[HDIV] is another web security framework that integrates with Spring MVC.
+https://hdiv.org/[HDIV] is another web security framework that integrates with Spring MVC.
 
 
 

framework-docs/modules/ROOT/pages/web/websocket/stomp/enable.adoc

@@ -22,11 +22,11 @@ The following example code is based on it:
 [source,javascript,indent=0,subs="verbatim,quotes"]
 ----
 	const stompClient = new StompJs.Client({
-		brokerURL: 'ws://domain.com/portfolio',
-		onConnect: () => {
-			// ...
-		}
-	});
+        brokerURL: 'ws://domain.com/portfolio',
+        onConnect: () => {
+            // ...
+        }
+    });
 ----
 
 Alternatively, if you connect through SockJS, you can enable the
@@ -47,3 +47,5 @@ interactive web application] -- a getting started guide.
 * https://github.com/rstoyanchev/spring-websocket-portfolio[Stock Portfolio] -- a sample
 application.
 
+
+

framework-platform/framework-platform.gradle

@@ -7,21 +7,21 @@ javaPlatform {
 }
 
 dependencies {
-	api(platform("com.fasterxml.jackson:jackson-bom:2.18.4"))
-	api(platform("io.micrometer:micrometer-bom:1.14.7"))
-	api(platform("io.netty:netty-bom:4.1.121.Final"))
+	api(platform("com.fasterxml.jackson:jackson-bom:2.18.3"))
+	api(platform("io.micrometer:micrometer-bom:1.14.5"))
+	api(platform("io.netty:netty-bom:4.1.119.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
-	api(platform("io.projectreactor:reactor-bom:2024.0.6"))
+	api(platform("io.projectreactor:reactor-bom:2024.0.4"))
 	api(platform("io.rsocket:rsocket-bom:1.1.5"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.26"))
 	api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
 	api(platform("org.assertj:assertj-bom:3.27.3"))
-	api(platform("org.eclipse.jetty:jetty-bom:12.0.21"))
-	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.21"))
+	api(platform("org.eclipse.jetty:jetty-bom:12.0.17"))
+	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.17"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
-	api(platform("org.junit:junit-bom:5.12.2"))
-	api(platform("org.mockito:mockito-bom:5.17.0"))
+	api(platform("org.junit:junit-bom:5.12.0"))
+	api(platform("org.mockito:mockito-bom:5.16.0"))
 
 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
@@ -31,7 +31,7 @@ dependencies {
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.12.1")
-		api("com.google.protobuf:protobuf-java-util:4.30.2")
+		api("com.google.protobuf:protobuf-java-util:4.30.0")
 		api("com.h2database:h2:2.3.232")
 		api("com.jayway.jsonpath:json-path:2.9.0")
 		api("com.oracle.database.jdbc:ojdbc11:21.9.0.0")
@@ -100,8 +100,8 @@ dependencies {
 		api("org.apache.derby:derby:10.16.1.1")
 		api("org.apache.derby:derbyclient:10.16.1.1")
 		api("org.apache.derby:derbytools:10.16.1.1")
-		api("org.apache.httpcomponents.client5:httpclient5:5.4.4")
-		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.4")
+		api("org.apache.httpcomponents.client5:httpclient5:5.4.2")
+		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.3")
 		api("org.apache.poi:poi-ooxml:5.2.5")
 		api("org.apache.tomcat.embed:tomcat-embed-core:10.1.28")
 		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28")

gradle.properties

@@ -1,4 +1,4 @@
-version=6.2.7
+version=6.2.4
 
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m

gradle/ide.gradle

@@ -98,7 +98,7 @@ if (project.name == "spring-oxm") {
 }
 
 // Include project specific settings
-tasks.register('eclipseSettings', Copy) {
+task eclipseSettings(type: Copy) {
 	from rootProject.files(
 		'src/eclipse/org.eclipse.core.resources.prefs',
 		'src/eclipse/org.eclipse.jdt.core.prefs',
@@ -107,7 +107,7 @@ tasks.register('eclipseSettings', Copy) {
 	outputs.upToDateWhen { false }
 }
 
-tasks.register('cleanEclipseSettings', Delete) {
+task cleanEclipseSettings(type: Delete) {
 	delete project.file('.settings/org.eclipse.core.resources.prefs')
 	delete project.file('.settings/org.eclipse.jdt.core.prefs')
 	delete project.file('.settings/org.eclipse.jdt.ui.prefs')

gradle/spring-module.gradle

@@ -69,31 +69,32 @@ normalization {
 
 javadoc {
 	description = "Generates project-level javadoc for use in -javadoc jar"
-	failOnError = true
-	options {
-		encoding = "UTF-8"
-		memberLevel = JavadocMemberLevel.PROTECTED
-		author = true
-		header = project.name
-		use = true
-		links(project.ext.javadocLinks)
-		// Check for 'syntax' during linting. Note that the global
-		// 'framework-api:javadoc' task checks for 'reference' in addition
-		// to 'syntax'.
-		addBooleanOption("Xdoclint:syntax,-reference", true)
-		addBooleanOption('Werror', true)  // fail build on Javadoc warnings
-	}
+
+	options.encoding = "UTF-8"
+	options.memberLevel = JavadocMemberLevel.PROTECTED
+	options.author = true
+	options.header = project.name
+	options.use = true
+	options.links(project.ext.javadocLinks)
+	// Check for syntax during linting. 'none' doesn't seem to work in suppressing
+	// all linting warnings all the time (see/link references most notably).
+	options.addStringOption("Xdoclint:syntax", "-quiet")
+
+	// Suppress warnings due to cross-module @see and @link references.
+	// Note that global 'api' task does display all warnings, and
+	// checks for 'reference' on top of 'syntax'.
+	logging.captureStandardError LogLevel.INFO
+	logging.captureStandardOutput LogLevel.INFO  // suppress "## warnings" message
 }
 
-tasks.register('sourcesJar', Jar) {
-	dependsOn classes
+task sourcesJar(type: Jar, dependsOn: classes) {
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 	archiveClassifier.set("sources")
 	from sourceSets.main.allSource
 	// Don't include or exclude anything explicitly by default. See SPR-12085.
 }
 
-tasks.register('javadocJar', Jar) {
+task javadocJar(type: Jar) {
 	archiveClassifier.set("javadoc")
 	from javadoc
 }
@@ -113,16 +114,16 @@ components.java.withVariantsFromConfiguration(configurations.testFixturesApiElem
 components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
 
 tasks.withType(JavaCompile).configureEach {
-	options.errorprone {
-		disableAllChecks = true
-		option("NullAway:CustomContractAnnotations", "org.springframework.lang.Contract")
-		option("NullAway:AnnotatedPackages", "org.springframework")
-		option("NullAway:UnannotatedSubPackages", "org.springframework.instrument,org.springframework.context.index," +
+    options.errorprone {
+    	disableAllChecks = true
+        option("NullAway:CustomContractAnnotations", "org.springframework.lang.Contract")
+        option("NullAway:AnnotatedPackages", "org.springframework")
+        option("NullAway:UnannotatedSubPackages", "org.springframework.instrument,org.springframework.context.index," +
 				"org.springframework.asm,org.springframework.cglib,org.springframework.objenesis," +
 				"org.springframework.javapoet,org.springframework.aot.nativex.substitution,org.springframework.aot.nativex.feature")
-	}
+    }
 }
 tasks.compileJava {
-	// The check defaults to a warning, bump it up to an error for the main sources
-	options.errorprone.error("NullAway")
-}
+    // The check defaults to a warning, bump it up to an error for the main sources
+    options.errorprone.error("NullAway")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -241,7 +241,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 
 		try {
 			int algorithmicStep = STEP_JOIN_POINT_BINDING;
-			while (this.numberOfRemainingUnboundArguments > 0 && algorithmicStep < STEP_FINISHED) {
+			while ((this.numberOfRemainingUnboundArguments > 0) && algorithmicStep < STEP_FINISHED) {
 				switch (algorithmicStep++) {
 					case STEP_JOIN_POINT_BINDING -> {
 						if (!maybeBindThisJoinPoint()) {
@@ -373,8 +373,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		if (this.returningName != null) {
 			if (this.numberOfRemainingUnboundArguments > 1) {
 				throw new AmbiguousBindingException("Binding of returning parameter '" + this.returningName +
-						"' is ambiguous: there are " + this.numberOfRemainingUnboundArguments + " candidates. " +
-						"Consider compiling with -parameters in order to make declared parameter names available.");
+						"' is ambiguous: there are " + this.numberOfRemainingUnboundArguments + " candidates.");
 			}
 
 			// We're all set... find the unbound parameter, and bind it.
@@ -486,8 +485,8 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 */
 	private void maybeBindThisOrTargetOrArgsFromPointcutExpression() {
 		if (this.numberOfRemainingUnboundArguments > 1) {
-			throw new AmbiguousBindingException("Still " + this.numberOfRemainingUnboundArguments +
-					" unbound args at this()/target()/args() binding stage, with no way to determine between them");
+			throw new AmbiguousBindingException("Still " + this.numberOfRemainingUnboundArguments
+					+ " unbound args at this()/target()/args() binding stage, with no way to determine between them");
 		}
 
 		List<String> varNames = new ArrayList<>();
@@ -536,8 +535,8 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 
 	private void maybeBindReferencePointcutParameter() {
 		if (this.numberOfRemainingUnboundArguments > 1) {
-			throw new AmbiguousBindingException("Still " + this.numberOfRemainingUnboundArguments +
-					" unbound args at reference pointcut binding stage, with no way to determine between them");
+			throw new AmbiguousBindingException("Still " + this.numberOfRemainingUnboundArguments
+					+ " unbound args at reference pointcut binding stage, with no way to determine between them");
 		}
 
 		List<String> varNames = new ArrayList<>();
@@ -742,9 +741,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * Simple record to hold the extracted text from a pointcut body, together
 	 * with the number of tokens consumed in extracting it.
 	 */
-	private record PointcutBody(int numTokensConsumed, @Nullable String text) {
-	}
-
+	private record PointcutBody(int numTokensConsumed, @Nullable String text) {}
 
 	/**
 	 * Thrown in response to an ambiguous binding being detected when

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -111,7 +111,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	 * Create a new {@code ReflectiveAspectJAdvisorFactory}, propagating the given
 	 * {@link BeanFactory} to the created {@link AspectJExpressionPointcut} instances,
 	 * for bean pointcut handling as well as consistent {@link ClassLoader} resolution.
-	 * @param beanFactory the BeanFactory to propagate (may be {@code null})
+	 * @param beanFactory the BeanFactory to propagate (may be {@code null}}
 	 * @since 4.3.6
 	 * @see AspectJExpressionPointcut#setBeanFactory
 	 * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#getBeanClassLoader()

spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -46,8 +46,8 @@ public class AspectEntry implements ParseState.Entry {
 
 	@Override
 	public String toString() {
-		return "Aspect: " + (StringUtils.hasLength(this.id) ? "id='" + this.id + "'" :
-				"ref='" + this.ref + "'");
+		return "Aspect: " + (StringUtils.hasLength(this.id) ? "id='" + this.id + "'"
+				: "ref='" + this.ref + "'");
 	}
 
 }

spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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,6 @@ import org.springframework.aop.AopInvocationException;
 import org.springframework.aop.RawTargetAccess;
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.aot.AotDetector;
 import org.springframework.cglib.core.ClassLoaderAwareGeneratorStrategy;
 import org.springframework.cglib.core.CodeGenerationException;
 import org.springframework.cglib.core.GeneratorStrategy;
@@ -206,7 +205,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 			enhancer.setSuperclass(proxySuperClass);
 			enhancer.setInterfaces(AopProxyUtils.completeProxiedInterfaces(this.advised));
 			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
-			enhancer.setAttemptLoad(enhancer.getUseCache() && AotDetector.useGeneratedArtifacts());
+			enhancer.setAttemptLoad(true);
 			enhancer.setStrategy(KotlinDetector.isKotlinType(proxySuperClass) ?
 					new ClassLoaderAwareGeneratorStrategy(classLoader) :
 					new ClassLoaderAwareGeneratorStrategy(classLoader, undeclaredThrowableStrategy)

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,10 +114,10 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
 			boolean isFactoryBean = FactoryBean.class.isAssignableFrom(beanClass);
 			for (String mappedName : this.beanNames) {
 				if (isFactoryBean) {
-					if (mappedName.isEmpty() || mappedName.charAt(0) != BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
+					if (!mappedName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) {
 						continue;
 					}
-					mappedName = mappedName.substring(1);  // length of '&'
+					mappedName = mappedName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length());
 				}
 				if (isMatch(beanName, mappedName)) {
 					return true;

spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -198,8 +198,8 @@ public abstract class ClassFilters {
 
 		@Override
 		public boolean equals(Object other) {
-			return (this == other || (other instanceof NegateClassFilter that &&
-					this.original.equals(that.original)));
+			return (this == other || (other instanceof NegateClassFilter that
+					&& this.original.equals(that.original)));
 		}
 
 		@Override

spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -378,8 +378,8 @@ public abstract class MethodMatchers {
 
 		@Override
 		public boolean equals(Object other) {
-			return (this == other || (other instanceof NegateMethodMatcher that &&
-					this.original.equals(that.original)));
+			return (this == other || (other instanceof NegateMethodMatcher that
+					&& this.original.equals(that.original)));
 		}
 
 		@Override

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -203,6 +203,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		itb.getSpouse();
 
 		assertThat(maaif.isMaterialized()).isTrue();
+
 		assertThat(imapa.getDeclaredPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getAge"), null)).isTrue();
 
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(0);
@@ -300,7 +301,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void bindingWithMultipleArgsDifferentlyOrdered() {
 		ManyValuedArgs target = new ManyValuedArgs();
 		ManyValuedArgs mva = createProxy(target, ManyValuedArgs.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new ManyValuedArgs(), "someBean")));
+			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new ManyValuedArgs(), "someBean")));
 
 		String a = "a";
 		int b = 12;
@@ -319,7 +320,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		NotLockable notLockableTarget = new NotLockable();
 		assertThat(notLockableTarget).isNotInstanceOf(Lockable.class);
 		NotLockable notLockable1 = createProxy(notLockableTarget, NotLockable.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
+			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
 		assertThat(notLockable1).isInstanceOf(Lockable.class);
 		Lockable lockable = (Lockable) notLockable1;
 		assertThat(lockable.locked()).isFalse();
@@ -328,7 +329,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 
 		NotLockable notLockable2Target = new NotLockable();
 		NotLockable notLockable2 = createProxy(notLockable2Target, NotLockable.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
+			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
 		assertThat(notLockable2).isInstanceOf(Lockable.class);
 		Lockable lockable2 = (Lockable) notLockable2;
 		assertThat(lockable2.locked()).isFalse();
@@ -342,19 +343,20 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void introductionAdvisorExcludedFromTargetImplementingInterface() {
 		assertThat(AopUtils.findAdvisorsThatCanApply(
 		getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new MakeLockable(), "someBean")),
+			aspectInstanceFactory(new MakeLockable(), "someBean")),
 		CannotBeUnlocked.class)).isEmpty();
 		assertThat(AopUtils.findAdvisorsThatCanApply(getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2);
+			aspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2);
 	}
 
 	@Test
 	void introductionOnTargetImplementingInterface() {
 		CannotBeUnlocked target = new CannotBeUnlocked();
 		Lockable proxy = createProxy(target, CannotBeUnlocked.class,
+				// Ensure that we exclude
 				AopUtils.findAdvisorsThatCanApply(
-						getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
-						CannotBeUnlocked.class));
+					getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
+					CannotBeUnlocked.class));
 		assertThat(proxy).isInstanceOf(Lockable.class);
 		Lockable lockable = proxy;
 		assertThat(lockable.locked()).as("Already locked").isTrue();
@@ -368,8 +370,8 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		ArrayList<Object> target = new ArrayList<>();
 		List<?> proxy = createProxy(target, List.class,
 				AopUtils.findAdvisorsThatCanApply(
-						getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
-						List.class));
+					getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
+					List.class));
 		assertThat(proxy).as("Type pattern must have excluded mixin").isNotInstanceOf(Lockable.class);
 	}
 
@@ -377,7 +379,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void introductionBasedOnAnnotationMatch() { // gh-9980
 		AnnotatedTarget target = new AnnotatedTargetImpl();
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new MakeAnnotatedTypeModifiable(), "someBean"));
+			aspectInstanceFactory(new MakeAnnotatedTypeModifiable(), "someBean"));
 		Object proxy = createProxy(target, AnnotatedTarget.class, advisors);
 		assertThat(proxy).isInstanceOf(Lockable.class);
 		Lockable lockable = (Lockable) proxy;
@@ -391,9 +393,9 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new MakeITestBeanModifiable(), "someBean"));
+			aspectInstanceFactory(new MakeITestBeanModifiable(), "someBean"));
 		advisors.addAll(getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new MakeLockable(), "someBean")));
+			aspectInstanceFactory(new MakeLockable(), "someBean")));
 
 		Modifiable modifiable = (Modifiable) createProxy(target, ITestBean.class, advisors);
 		assertThat(modifiable).isInstanceOf(Modifiable.class);
@@ -424,7 +426,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		UnsupportedOperationException expectedException = new UnsupportedOperationException();
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
+			aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
 		assertThat(advisors).as("One advice method was found").hasSize(1);
 		ITestBean itb = createProxy(target, ITestBean.class, advisors);
 		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(itb::getAge);
@@ -437,12 +439,12 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		RemoteException expectedException = new RemoteException();
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
+			aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
 		assertThat(advisors).as("One advice method was found").hasSize(1);
 		ITestBean itb = createProxy(target, ITestBean.class, advisors);
 		assertThatExceptionOfType(UndeclaredThrowableException.class)
-				.isThrownBy(itb::getAge)
-				.withCause(expectedException);
+			.isThrownBy(itb::getAge)
+			.withCause(expectedException);
 	}
 
 	@Test
@@ -450,7 +452,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		TwoAdviceAspect twoAdviceAspect = new TwoAdviceAspect();
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(twoAdviceAspect, "someBean"));
+			aspectInstanceFactory(twoAdviceAspect, "someBean"));
 		assertThat(advisors).as("Two advice methods found").hasSize(2);
 		ITestBean itb = createProxy(target, ITestBean.class, advisors);
 		itb.setName("");
@@ -464,7 +466,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void afterAdviceTypes() throws Exception {
 		InvocationTrackingAspect aspect = new InvocationTrackingAspect();
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-				aspectInstanceFactory(aspect, "exceptionHandlingAspect"));
+			aspectInstanceFactory(aspect, "exceptionHandlingAspect"));
 		Echo echo = createProxy(new Echo(), Echo.class, advisors);
 
 		assertThat(aspect.invocations).isEmpty();
@@ -473,7 +475,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 
 		aspect.invocations.clear();
 		assertThatExceptionOfType(FileNotFoundException.class)
-				.isThrownBy(() -> echo.echo(new FileNotFoundException()));
+			.isThrownBy(() -> echo.echo(new FileNotFoundException()));
 		assertThat(aspect.invocations).containsExactly("around - start", "before", "after throwing", "after", "around - end");
 	}
 
@@ -485,6 +487,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		assertThat(Modifier.isAbstract(aspect.getClass().getSuperclass().getModifiers())).isFalse();
 
 		List<Advisor> advisors = getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspect, "incrementingAspect"));
+
 		ITestBean proxy = createProxy(new TestBean("Jane", 42), ITestBean.class, advisors);
 		assertThat(proxy.getAge()).isEqualTo(86); // (42 + 1) * 2
 	}
@@ -809,20 +812,20 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 			invocations.add("before");
 		}
 
-		@After("echo()")
-		void after() {
-			invocations.add("after");
-		}
-
-		@AfterReturning(pointcut = "this(target) && execution(* echo(*))", returning = "returnValue")
-		void afterReturning(JoinPoint joinPoint, Echo target, Object returnValue) {
+		@AfterReturning("echo()")
+		void afterReturning() {
 			invocations.add("after returning");
 		}
 
-		@AfterThrowing(pointcut = "this(target) && execution(* echo(*))", throwing = "exception")
-		void afterThrowing(JoinPoint joinPoint, Echo target, Throwable exception) {
+		@AfterThrowing("echo()")
+		void afterThrowing() {
 			invocations.add("after throwing");
 		}
+
+		@After("echo()")
+		void after() {
+			invocations.add("after");
+		}
 	}
 
 
@@ -964,7 +967,7 @@ abstract class AbstractMakeModifiable {
 class MakeITestBeanModifiable extends AbstractMakeModifiable {
 
 	@DeclareParents(value = "org.springframework.beans.testfixture.beans.ITestBean+",
-			defaultImpl = ModifiableImpl.class)
+			defaultImpl=ModifiableImpl.class)
 	static MutableModifiable mixin;
 
 }

spring-aop/src/test/java/org/springframework/aop/interceptor/AsyncExecutionInterceptorTests.java

@@ -27,12 +27,13 @@ import org.mockito.ArgumentCaptor;
 import org.springframework.core.task.AsyncTaskExecutor;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
+
 /**
  * Tests for {@link AsyncExecutionInterceptor}.
  *

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

@@ -291,7 +291,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 		String lastKey = tokens.keys[tokens.keys.length - 1];
 
 		if (propValue.getClass().isArray()) {
-			Class<?> componentType = propValue.getClass().componentType();
+			Class<?> requiredType = propValue.getClass().componentType();
 			int arrayIndex = Integer.parseInt(lastKey);
 			Object oldValue = null;
 			try {
@@ -299,9 +299,10 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 					oldValue = Array.get(propValue, arrayIndex);
 				}
 				Object convertedValue = convertIfNecessary(tokens.canonicalName, oldValue, pv.getValue(),
-						componentType, ph.nested(tokens.keys.length));
+						requiredType, ph.nested(tokens.keys.length));
 				int length = Array.getLength(propValue);
 				if (arrayIndex >= length && arrayIndex < this.autoGrowCollectionLimit) {
+					Class<?> componentType = propValue.getClass().componentType();
 					Object newArray = Array.newInstance(componentType, arrayIndex + 1);
 					System.arraycopy(propValue, 0, newArray, 0, length);
 					int lastKeyIndex = tokens.canonicalName.lastIndexOf('[');

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -25,7 +25,6 @@ import org.springframework.lang.Nullable;
  * analogous to an InvocationTargetException.
  *
  * @author Rod Johnson
- * @author Juergen Hoeller
  */
 @SuppressWarnings("serial")
 public class MethodInvocationException extends PropertyAccessException {
@@ -42,9 +41,7 @@ public class MethodInvocationException extends PropertyAccessException {
 	 * @param cause the Throwable raised by the invoked method
 	 */
 	public MethodInvocationException(PropertyChangeEvent propertyChangeEvent, @Nullable Throwable cause) {
-		super(propertyChangeEvent,
-				"Property '" + propertyChangeEvent.getPropertyName() + "' threw exception: " + cause,
-				cause);
+		super(propertyChangeEvent, "Property '" + propertyChangeEvent.getPropertyName() + "' threw exception", cause);
 	}
 
 	@Override

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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,16 +124,9 @@ public interface BeanFactory {
 	 * beans <i>created</i> by the FactoryBean. For example, if the bean named
 	 * {@code myJndiObject} is a FactoryBean, getting {@code &myJndiObject}
 	 * will return the factory, not the instance returned by the factory.
-	 * @see #FACTORY_BEAN_PREFIX_CHAR
 	 */
 	String FACTORY_BEAN_PREFIX = "&";
 
-	/**
-	 * Character variant of {@link #FACTORY_BEAN_PREFIX}.
-	 * @since 6.2.6
-	 */
-	char FACTORY_BEAN_PREFIX_CHAR = '&';
-
 
 	/**
 	 * Return an instance, which may be shared or independent, of the specified bean.

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java

@@ -72,7 +72,7 @@ public abstract class BeanFactoryUtils {
 	 * @see BeanFactory#FACTORY_BEAN_PREFIX
 	 */
 	public static boolean isFactoryDereference(@Nullable String name) {
-		return (name != null && !name.isEmpty() && name.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR);
+		return (name != null && name.startsWith(BeanFactory.FACTORY_BEAN_PREFIX));
 	}
 
 	/**
@@ -84,14 +84,14 @@ public abstract class BeanFactoryUtils {
 	 */
 	public static String transformedBeanName(String name) {
 		Assert.notNull(name, "'name' must not be null");
-		if (name.isEmpty() || name.charAt(0) != BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
+		if (!name.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) {
 			return name;
 		}
 		return transformedBeanNameCache.computeIfAbsent(name, beanName -> {
 			do {
-				beanName = beanName.substring(1);  // length of '&'
+				beanName = beanName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length());
 			}
-			while (beanName.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR);
+			while (beanName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX));
 			return beanName;
 		});
 	}

spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -145,6 +145,8 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>This version of {@code getBeanNamesForType} matches all kinds of beans,
 	 * be it singletons, prototypes, or FactoryBeans. In most implementations, the
 	 * result will be the same as for {@code getBeanNamesForType(type, true, true)}.
@@ -174,6 +176,8 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>Bean names returned by this method should always return bean names <i>in the
 	 * order of definition</i> in the backend configuration, as far as possible.
 	 * @param type the generically typed class or interface to match
@@ -206,6 +210,8 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>This version of {@code getBeanNamesForType} matches all kinds of beans,
 	 * be it singletons, prototypes, or FactoryBeans. In most implementations, the
 	 * result will be the same as for {@code getBeanNamesForType(type, true, true)}.
@@ -233,6 +239,8 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>Bean names returned by this method should always return bean names <i>in the
 	 * order of definition</i> in the backend configuration, as far as possible.
 	 * @param type the class or interface to match, or {@code null} for all bean names
@@ -257,24 +265,21 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * subclasses), judging from either bean definitions or the value of
 	 * {@code getObjectType} in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
-	 * check nested beans which might match the specified type as well. Also, it
-	 * <b>suppresses exceptions for beans that are currently in creation in a circular
-	 * reference scenario:</b> typically, references back to the caller of this method.
+	 * check nested beans which might match the specified type as well.
 	 * <p>Does consider objects created by FactoryBeans, which means that FactoryBeans
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beansOfTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>This version of getBeansOfType matches all kinds of beans, be it
 	 * singletons, prototypes, or FactoryBeans. In most implementations, the
 	 * result will be the same as for {@code getBeansOfType(type, true, true)}.
 	 * <p>The Map returned by this method should always return bean names and
 	 * corresponding bean instances <i>in the order of definition</i> in the
 	 * backend configuration, as far as possible.
-	 * <p><b>Consider {@link #getBeanNamesForType(Class)} with selective {@link #getBean}
-	 * calls for specific bean names in preference to this Map-based retrieval method.</b>
-	 * Aside from lazy instantiation benefits, this also avoids any exception suppression.
 	 * @param type the class or interface to match, or {@code null} for all concrete beans
 	 * @return a Map with the matching beans, containing the bean names as
 	 * keys and the corresponding bean instances as values
@@ -290,9 +295,7 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * subclasses), judging from either bean definitions or the value of
 	 * {@code getObjectType} in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
-	 * check nested beans which might match the specified type as well. Also, it
-	 * <b>suppresses exceptions for beans that are currently in creation in a circular
-	 * reference scenario:</b> typically, references back to the caller of this method.
+	 * check nested beans which might match the specified type as well.
 	 * <p>Does consider objects created by FactoryBeans if the "allowEagerInit" flag is set,
 	 * which means that FactoryBeans will get initialized. If the object created by the
 	 * FactoryBean doesn't match, the raw FactoryBean itself will be matched against the
@@ -301,12 +304,11 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * <p>Does not consider any hierarchy this factory may participate in.
 	 * Use BeanFactoryUtils' {@code beansOfTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
+	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
+	 * by other means than bean definitions.
 	 * <p>The Map returned by this method should always return bean names and
 	 * corresponding bean instances <i>in the order of definition</i> in the
 	 * backend configuration, as far as possible.
-	 * <p><b>Consider {@link #getBeanNamesForType(Class)} with selective {@link #getBean}
-	 * calls for specific bean names in preference to this Map-based retrieval method.</b>
-	 * Aside from lazy instantiation benefits, this also avoids any exception suppression.
 	 * @param type the class or interface to match, or {@code null} for all concrete beans
 	 * @param includeNonSingletons whether to include prototype or scoped beans too
 	 * or just singletons (also applies to FactoryBeans)

spring-beans/src/main/java/org/springframework/beans/factory/ObjectProvider.java

@@ -274,7 +274,7 @@ public interface ObjectProvider<T> extends ObjectFactory<T>, Iterable<T> {
 	 * @see #orderedStream(Predicate)
 	 */
 	default Stream<T> stream(Predicate<Class<?>> customFilter) {
-		return stream(customFilter, true);
+		return stream().filter(obj -> customFilter.test(obj.getClass()));
 	}
 
 	/**
@@ -288,44 +288,6 @@ public interface ObjectProvider<T> extends ObjectFactory<T>, Iterable<T> {
 	 * @see #stream(Predicate)
 	 */
 	default Stream<T> orderedStream(Predicate<Class<?>> customFilter) {
-		return orderedStream(customFilter, true);
-	}
-
-	/**
-	 * Return a custom-filtered {@link Stream} over all matching object instances,
-	 * without specific ordering guarantees (but typically in registration order).
-	 * @param customFilter a custom type filter for selecting beans among the raw
-	 * bean type matches (or {@link #UNFILTERED} for all raw type matches without
-	 * any default filtering)
-	 * @param includeNonSingletons whether to include prototype or scoped beans too
-	 * or just singletons (also applies to FactoryBeans)
-	 * @since 6.2.5
-	 * @see #stream(Predicate)
-	 * @see #orderedStream(Predicate, boolean)
-	 */
-	default Stream<T> stream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-		if (!includeNonSingletons) {
-			throw new UnsupportedOperationException("Only supports includeNonSingletons=true by default");
-		}
-		return stream().filter(obj -> customFilter.test(obj.getClass()));
-	}
-
-	/**
-	 * Return a custom-filtered {@link Stream} over all matching object instances,
-	 * pre-ordered according to the factory's common order comparator.
-	 * @param customFilter a custom type filter for selecting beans among the raw
-	 * bean type matches (or {@link #UNFILTERED} for all raw type matches without
-	 * any default filtering)
-	 * @param includeNonSingletons whether to include prototype or scoped beans too
-	 * or just singletons (also applies to FactoryBeans)
-	 * @since 6.2.5
-	 * @see #orderedStream()
-	 * @see #stream(Predicate)
-	 */
-	default Stream<T> orderedStream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-		if (!includeNonSingletons) {
-			throw new UnsupportedOperationException("Only supports includeNonSingletons=true by default");
-		}
 		return orderedStream().filter(obj -> customFilter.test(obj.getClass()));
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/aot/AotServices.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,9 +212,9 @@ public final class AotServices<T> implements Iterable<T> {
 		}
 
 		private <T> Map<String, T> loadBeans(Class<T> type) {
-			return (this.beanFactory != null ?
-					BeanFactoryUtils.beansOfTypeIncludingAncestors(this.beanFactory, type, true, false) :
-					Collections.emptyMap());
+			return (this.beanFactory != null) ? BeanFactoryUtils
+					.beansOfTypeIncludingAncestors(this.beanFactory, type, true, false)
+					: Collections.emptyMap();
 		}
 
 	}

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactory.java

@@ -69,8 +69,8 @@ class BeanDefinitionMethodGeneratorFactory {
 		this.excludeFilters = loader.load(BeanRegistrationExcludeFilter.class);
 		for (BeanRegistrationExcludeFilter excludeFilter : this.excludeFilters) {
 			if (this.excludeFilters.getSource(excludeFilter) == Source.BEAN_FACTORY) {
-				Assert.state(excludeFilter instanceof BeanRegistrationAotProcessor ||
-						excludeFilter instanceof BeanFactoryInitializationAotProcessor,
+				Assert.state(excludeFilter instanceof BeanRegistrationAotProcessor
+						|| excludeFilter instanceof BeanFactoryInitializationAotProcessor,
 						() -> "BeanRegistrationExcludeFilter bean of type %s must also implement an AOT processor interface"
 								.formatted(excludeFilter.getClass().getName()));
 			}

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorDelegates.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -156,8 +156,6 @@ abstract class BeanDefinitionPropertyValueCodeGeneratorDelegates {
 						.builder(SuppressWarnings.class)
 						.addMember("value", "{\"rawtypes\", \"unchecked\"}")
 						.build());
-				method.addModifiers(javax.lang.model.element.Modifier.PRIVATE,
-						javax.lang.model.element.Modifier.STATIC);
 				method.returns(Map.class);
 				method.addStatement("$T map = new $T($L)", Map.class,
 						LinkedHashMap.class, map.size());

spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java

@@ -234,7 +234,8 @@ public class InstanceSupplierCodeGenerator {
 
 		CodeBlock arguments = hasArguments ?
 				new AutowiredArgumentsCodeGenerator(actualType, constructor)
-						.generateCode(constructor.getParameterTypes(), (onInnerClass ? 1 : 0)) : NO_ARGS;
+						.generateCode(constructor.getParameterTypes(), (onInnerClass ? 1 : 0))
+				: NO_ARGS;
 
 		CodeBlock newInstance = generateNewInstanceCodeForConstructor(actualType, arguments);
 		code.add(generateWithGeneratorCode(hasArguments, newInstance));
@@ -324,7 +325,8 @@ public class InstanceSupplierCodeGenerator {
 		boolean hasArguments = factoryMethod.getParameterCount() > 0;
 		CodeBlock arguments = hasArguments ?
 				new AutowiredArgumentsCodeGenerator(ClassUtils.getUserClass(targetClass), factoryMethod)
-						.generateCode(factoryMethod.getParameterTypes()) : NO_ARGS;
+						.generateCode(factoryMethod.getParameterTypes())
+				: NO_ARGS;
 
 		CodeBlock newInstance = generateNewInstanceCodeForMethod(
 				factoryBeanName, ClassUtils.getUserClass(targetClass), factoryMethodName, arguments);

spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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,10 +20,8 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.core.env.AbstractPropertyResolver;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringValueResolver;
-import org.springframework.util.SystemPropertyUtils;
 
 /**
  * Abstract base class for property resource configurers that resolve placeholders
@@ -39,16 +37,16 @@ import org.springframework.util.SystemPropertyUtils;
  *
  * <pre class="code">
  * &lt;bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"&gt;
- *   &lt;property name="driverClassName" value="${jdbc.driver}" /&gt;
- *   &lt;property name="url" value="jdbc:${jdbc.dbname}" /&gt;
+ *   &lt;property name="driverClassName" value="${driver}" /&gt;
+ *   &lt;property name="url" value="jdbc:${dbname}" /&gt;
  * &lt;/bean&gt;
  * </pre>
  *
  * Example properties file:
  *
  * <pre class="code">
- * jdbc.driver=com.mysql.jdbc.Driver
- * jdbc.dbname=mysql:mydb</pre>
+ * driver=com.mysql.jdbc.Driver
+ * dbname=mysql:mydb</pre>
  *
  * Annotated bean definitions may take advantage of property replacement using
  * the {@link org.springframework.beans.factory.annotation.Value @Value} annotation:
@@ -81,12 +79,11 @@ import org.springframework.util.SystemPropertyUtils;
  * <p>Example XML property with default value:
  *
  * <pre class="code">
- *   &lt;property name="url" value="jdbc:${jdbc.dbname:defaultdb}" /&gt;
+ *   &lt;property name="url" value="jdbc:${dbname:defaultdb}" /&gt;
  * </pre>
  *
  * @author Chris Beams
  * @author Juergen Hoeller
- * @author Sam Brannen
  * @since 3.1
  * @see PropertyPlaceholderConfigurer
  * @see org.springframework.context.support.PropertySourcesPlaceholderConfigurer
@@ -95,21 +92,16 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 		implements BeanNameAware, BeanFactoryAware {
 
 	/** Default placeholder prefix: {@value}. */
-	public static final String DEFAULT_PLACEHOLDER_PREFIX = SystemPropertyUtils.PLACEHOLDER_PREFIX;
+	public static final String DEFAULT_PLACEHOLDER_PREFIX = "${";
 
 	/** Default placeholder suffix: {@value}. */
-	public static final String DEFAULT_PLACEHOLDER_SUFFIX = SystemPropertyUtils.PLACEHOLDER_SUFFIX;
+	public static final String DEFAULT_PLACEHOLDER_SUFFIX = "}";
 
 	/** Default value separator: {@value}. */
-	public static final String DEFAULT_VALUE_SEPARATOR = SystemPropertyUtils.VALUE_SEPARATOR;
-
-	/**
-	 * Default escape character: {@code '\'}.
-	 * @since 6.2
-	 * @see AbstractPropertyResolver#getDefaultEscapeCharacter()
-	 */
-	public static final Character DEFAULT_ESCAPE_CHARACTER = SystemPropertyUtils.ESCAPE_CHARACTER;
+	public static final String DEFAULT_VALUE_SEPARATOR = ":";
 
+	/** Default escape character: {@code '\'}. */
+	public static final Character DEFAULT_ESCAPE_CHARACTER = '\\';
 
 	/** Defaults to {@value #DEFAULT_PLACEHOLDER_PREFIX}. */
 	protected String placeholderPrefix = DEFAULT_PLACEHOLDER_PREFIX;
@@ -121,11 +113,9 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 	@Nullable
 	protected String valueSeparator = DEFAULT_VALUE_SEPARATOR;
 
-	/**
-	 * The default is determined by {@link AbstractPropertyResolver#getDefaultEscapeCharacter()}.
-	 */
+	/** Defaults to {@link #DEFAULT_ESCAPE_CHARACTER}. */
 	@Nullable
-	protected Character escapeCharacter = AbstractPropertyResolver.getDefaultEscapeCharacter();
+	protected Character escapeCharacter = DEFAULT_ESCAPE_CHARACTER;
 
 	protected boolean trimValues = false;
 
@@ -143,7 +133,7 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 
 	/**
 	 * Set the prefix that a placeholder string starts with.
-	 * <p>The default is {@value #DEFAULT_PLACEHOLDER_PREFIX}.
+	 * The default is {@value #DEFAULT_PLACEHOLDER_PREFIX}.
 	 */
 	public void setPlaceholderPrefix(String placeholderPrefix) {
 		this.placeholderPrefix = placeholderPrefix;
@@ -151,32 +141,31 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 
 	/**
 	 * Set the suffix that a placeholder string ends with.
-	 * <p>The default is {@value #DEFAULT_PLACEHOLDER_SUFFIX}.
+	 * The default is {@value #DEFAULT_PLACEHOLDER_SUFFIX}.
 	 */
 	public void setPlaceholderSuffix(String placeholderSuffix) {
 		this.placeholderSuffix = placeholderSuffix;
 	}
 
 	/**
-	 * Specify the separating character between the placeholder variable and the
-	 * associated default value, or {@code null} if no such special character
-	 * should be processed as a value separator.
-	 * <p>The default is {@value #DEFAULT_VALUE_SEPARATOR}.
+	 * Specify the separating character between the placeholder variable
+	 * and the associated default value, or {@code null} if no such
+	 * special character should be processed as a value separator.
+	 * The default is {@value #DEFAULT_VALUE_SEPARATOR}.
 	 */
 	public void setValueSeparator(@Nullable String valueSeparator) {
 		this.valueSeparator = valueSeparator;
 	}
 
 	/**
-	 * Set the escape character to use to ignore the
-	 * {@linkplain #setPlaceholderPrefix(String) placeholder prefix} and the
-	 * {@linkplain #setValueSeparator(String) value separator}, or {@code null}
-	 * if no escaping should take place.
-	 * <p>The default is determined by {@link AbstractPropertyResolver#getDefaultEscapeCharacter()}.
+	 * Specify the escape character to use to ignore placeholder prefix
+	 * or value separator, or {@code null} if no escaping should take
+	 * place.
+	 * <p>Default is {@link #DEFAULT_ESCAPE_CHARACTER}.
 	 * @since 6.2
 	 */
-	public void setEscapeCharacter(@Nullable Character escapeCharacter) {
-		this.escapeCharacter = escapeCharacter;
+	public void setEscapeCharacter(@Nullable Character escsEscapeCharacter) {
+		this.escapeCharacter = escsEscapeCharacter;
 	}
 
 	/**

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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,14 +35,12 @@ import org.springframework.beans.factory.BeanInitializationException;
  *
  * Example properties file:
  *
- * <pre class="code">
- * dataSource.driverClassName=com.mysql.jdbc.Driver
+ * <pre class="code">dataSource.driverClassName=com.mysql.jdbc.Driver
  * dataSource.url=jdbc:mysql:mydb</pre>
  *
- * <p>In contrast to {@link PropertyPlaceholderConfigurer}, the original definition
- * can have default values or no values at all for such bean properties. If an
- * overriding properties file does not have an entry for a certain bean property,
- * the default context definition is used.
+ * In contrast to PropertyPlaceholderConfigurer, the original definition can have default
+ * values or no values at all for such bean properties. If an overriding properties file does
+ * not have an entry for a certain bean property, the default context definition is used.
  *
  * <p>Note that the context definition <i>is not</i> aware of being overridden;
  * so this is not immediately obvious when looking at the XML definition file.

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

@@ -144,10 +144,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	private final Set<Class<?>> ignoredDependencyTypes = new HashSet<>();
 
 	/**
-	 * Dependency interfaces to ignore on dependency check and autowire, as a Set
-	 * of Class objects.
-	 * <p>By default, the {@code BeanNameAware}, {@code BeanFactoryAware}, and
-	 * {@code BeanClassLoaderAware} interfaces are ignored.
+	 * Dependency interfaces to ignore on dependency check and autowire, as Set of
+	 * Class objects. By default, only the BeanFactory interface is ignored.
 	 */
 	private final Set<Class<?>> ignoredDependencyInterfaces = new HashSet<>();
 
@@ -287,15 +285,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	/**
 	 * Ignore the given dependency interface for autowiring.
 	 * <p>This will typically be used by application contexts to register
-	 * dependencies that are resolved in other ways, like {@code BeanFactory}
-	 * through {@code BeanFactoryAware} or {@code ApplicationContext} through
-	 * {@code ApplicationContextAware}.
-	 * <p>By default, the {@code BeanNameAware}, {@code BeanFactoryAware}, and
-	 * {@code BeanClassLoaderAware} interfaces are ignored.
+	 * dependencies that are resolved in other ways, like BeanFactory through
+	 * BeanFactoryAware or ApplicationContext through ApplicationContextAware.
+	 * <p>By default, only the BeanFactoryAware interface is ignored.
 	 * For further types to ignore, invoke this method for each type.
-	 * @see org.springframework.beans.factory.BeanNameAware
 	 * @see org.springframework.beans.factory.BeanFactoryAware
-	 * @see org.springframework.beans.factory.BeanClassLoaderAware
 	 * @see org.springframework.context.ApplicationContextAware
 	 */
 	public void ignoreDependencyInterface(Class<?> ifc) {
@@ -997,17 +991,9 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 */
 	@Nullable
 	private FactoryBean<?> getSingletonFactoryBeanForTypeCheck(String beanName, RootBeanDefinition mbd) {
-		Boolean lockFlag = isCurrentThreadAllowedToHoldSingletonLock();
-		if (lockFlag == null) {
-			this.singletonLock.lock();
-		}
-		else {
-			boolean locked = (lockFlag && this.singletonLock.tryLock());
-			if (!locked) {
-				// Avoid shortcut FactoryBean instance but allow for subsequent type-based resolution.
-				resolveBeanClass(mbd, beanName);
-				return null;
-			}
+		boolean locked = this.singletonLock.tryLock();
+		if (!locked) {
+			return null;
 		}
 
 		try {

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -770,16 +770,16 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	public String[] getAliases(String name) {
 		String beanName = transformedBeanName(name);
 		List<String> aliases = new ArrayList<>();
-		boolean hasFactoryPrefix = (!name.isEmpty() && name.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR);
+		boolean factoryPrefix = name.startsWith(FACTORY_BEAN_PREFIX);
 		String fullBeanName = beanName;
-		if (hasFactoryPrefix) {
+		if (factoryPrefix) {
 			fullBeanName = FACTORY_BEAN_PREFIX + beanName;
 		}
 		if (!fullBeanName.equals(name)) {
 			aliases.add(fullBeanName);
 		}
 		String[] retrievedAliases = super.getAliases(beanName);
-		String prefix = (hasFactoryPrefix ? FACTORY_BEAN_PREFIX : "");
+		String prefix = (factoryPrefix ? FACTORY_BEAN_PREFIX : "");
 		for (String retrievedAlias : retrievedAliases) {
 			String alias = prefix + retrievedAlias;
 			if (!alias.equals(name)) {
@@ -1153,7 +1153,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	public BeanDefinition getMergedBeanDefinition(String name) throws BeansException {
 		String beanName = transformedBeanName(name);
 		// Efficiently check whether bean definition exists in this factory.
-		if (getParentBeanFactory() instanceof ConfigurableBeanFactory parent && !containsBeanDefinition(beanName)) {
+		if (!containsBeanDefinition(beanName) && getParentBeanFactory() instanceof ConfigurableBeanFactory parent) {
 			return parent.getMergedBeanDefinition(beanName);
 		}
 		// Resolve merged bean definition locally.
@@ -1292,7 +1292,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 */
 	protected String originalBeanName(String name) {
 		String beanName = transformedBeanName(name);
-		if (!name.isEmpty() && name.charAt(0) == BeanFactory.FACTORY_BEAN_PREFIX_CHAR) {
+		if (name.startsWith(FACTORY_BEAN_PREFIX)) {
 			beanName = FACTORY_BEAN_PREFIX + beanName;
 		}
 		return beanName;
@@ -1474,7 +1474,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				// Cache the merged bean definition for the time being
 				// (it might still get re-merged later on in order to pick up metadata changes)
 				if (containingBd == null && (isCacheBeanMetadata() || isBeanEligibleForMetadataCaching(beanName))) {
-					cacheMergedBeanDefinition(mbd, beanName);
+					this.mergedBeanDefinitions.put(beanName, mbd);
 				}
 			}
 			if (previous != null) {
@@ -1503,18 +1503,6 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
-	/**
-	 * Cache the given merged bean definition.
-	 * <p>Subclasses can override this to derive additional cached state
-	 * from the final post-processed bean definition.
-	 * @param mbd the merged bean definition to cache
-	 * @param beanName the name of the bean
-	 * @since 6.2.6
-	 */
-	protected void cacheMergedBeanDefinition(RootBeanDefinition mbd, String beanName) {
-		this.mergedBeanDefinitions.put(beanName, mbd);
-	}
-
 	/**
 	 * Check the given merged bean definition,
 	 * potentially throwing validation exceptions.

spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.aot.AotDetector;
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactory;
@@ -154,7 +153,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(beanDefinition.getBeanClass());
 			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
-			enhancer.setAttemptLoad(AotDetector.useGeneratedArtifacts());
+			enhancer.setAttemptLoad(true);
 			if (this.owner instanceof ConfigurableBeanFactory cbf) {
 				ClassLoader cl = cbf.getBeanClassLoader();
 				enhancer.setStrategy(new ClassLoaderAwareGeneratorStrategy(cl));
@@ -277,11 +276,12 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 			this.owner = owner;
 		}
 
-		@Override
 		@Nullable
+		@Override
 		public Object intercept(Object obj, Method method, Object[] args, MethodProxy mp) throws Throwable {
 			ReplaceOverride ro = (ReplaceOverride) getBeanDefinition().getMethodOverrides().getOverride(method);
 			Assert.state(ro != null, "ReplaceOverride not found");
+			// TODO could cache if a singleton for minor performance optimization
 			MethodReplacer mr = this.owner.getBean(ro.getMethodReplacerBeanName(), MethodReplacer.class);
 			return processReturnType(method, mr.reimplement(obj, method, args));
 		}

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -76,7 +76,6 @@ import org.springframework.core.NamedThreadLocal;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
-import org.springframework.core.SpringProperties;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
@@ -129,20 +128,6 @@ import org.springframework.util.StringUtils;
 public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFactory
 		implements ConfigurableListableBeanFactory, BeanDefinitionRegistry, Serializable {
 
-	/**
-	 * System property that instructs Spring to enforce strict locking during bean creation,
-	 * rather than the mix of strict and lenient locking that 6.2 applies by default. Setting
-	 * this flag to "true" restores 6.1.x style locking in the entire pre-instantiation phase.
-	 * <p>By default, the factory infers strict locking from the encountered thread names:
-	 * If additional threads have names that match the thread prefix of the main bootstrap thread,
-	 * they are considered external (multiple external bootstrap threads calling into the factory)
-	 * and therefore have strict locking applied to them. This inference can be turned off through
-	 * explicitly setting this flag to "false" rather than leaving it unspecified.
-	 * @since 6.2.6
-	 * @see #preInstantiateSingletons()
-	 */
-	public static final String STRICT_LOCKING_PROPERTY_NAME = "spring.locking.strict";
-
 	@Nullable
 	private static Class<?> jakartaInjectProviderClass;
 
@@ -162,10 +147,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	private static final Map<String, Reference<DefaultListableBeanFactory>> serializableFactories =
 			new ConcurrentHashMap<>(8);
 
-	/** Whether strict locking is enforced or relaxed in this factory. */
-	@Nullable
-	private final Boolean strictLocking = SpringProperties.checkFlag(STRICT_LOCKING_PROPERTY_NAME);
-
 	/** Optional id for this factory, for serialization purposes. */
 	@Nullable
 	private String serializationId;
@@ -218,9 +199,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	/** Whether bean definition metadata may be cached for all beans. */
 	private volatile boolean configurationFrozen;
 
-	/** Name prefix of main thread: only set during pre-instantiation phase. */
-	@Nullable
-	private volatile String mainThreadPrefix;
+	private volatile boolean preInstantiationPhase;
 
 	private final NamedThreadLocal<PreInstantiation> preInstantiationThread =
 			new NamedThreadLocal<>("Pre-instantiation thread marker");
@@ -508,14 +487,14 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			@SuppressWarnings("unchecked")
 			@Override
 			public Stream<T> stream() {
-				return Arrays.stream(beanNamesForStream(requiredType, true, allowEagerInit))
+				return Arrays.stream(getBeanNamesForTypedStream(requiredType, allowEagerInit))
 						.map(name -> (T) getBean(name))
 						.filter(bean -> !(bean instanceof NullBean));
 			}
 			@SuppressWarnings("unchecked")
 			@Override
 			public Stream<T> orderedStream() {
-				String[] beanNames = beanNamesForStream(requiredType, true, allowEagerInit);
+				String[] beanNames = getBeanNamesForTypedStream(requiredType, allowEagerInit);
 				if (beanNames.length == 0) {
 					return Stream.empty();
 				}
@@ -531,16 +510,16 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 			@SuppressWarnings("unchecked")
 			@Override
-			public Stream<T> stream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-				return Arrays.stream(beanNamesForStream(requiredType, includeNonSingletons, allowEagerInit))
+			public Stream<T> stream(Predicate<Class<?>> customFilter) {
+				return Arrays.stream(getBeanNamesForTypedStream(requiredType, allowEagerInit))
 						.filter(name -> customFilter.test(getType(name)))
 						.map(name -> (T) getBean(name))
 						.filter(bean -> !(bean instanceof NullBean));
 			}
 			@SuppressWarnings("unchecked")
 			@Override
-			public Stream<T> orderedStream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-				String[] beanNames = beanNamesForStream(requiredType, includeNonSingletons, allowEagerInit);
+			public Stream<T> orderedStream(Predicate<Class<?>> customFilter) {
+				String[] beanNames = getBeanNamesForTypedStream(requiredType, allowEagerInit);
 				if (beanNames.length == 0) {
 					return Stream.empty();
 				}
@@ -580,8 +559,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return null;
 	}
 
-	private String[] beanNamesForStream(ResolvableType requiredType, boolean includeNonSingletons, boolean allowEagerInit) {
-		return BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this, requiredType, includeNonSingletons, allowEagerInit);
+	private String[] getBeanNamesForTypedStream(ResolvableType requiredType, boolean allowEagerInit) {
+		return BeanFactoryUtils.beanNamesForTypeIncludingAncestors(this, requiredType, true, allowEagerInit);
 	}
 
 	@Override
@@ -647,15 +626,10 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 							}
 						}
 						else {
-							if (includeNonSingletons || isNonLazyDecorated) {
+							if (includeNonSingletons || isNonLazyDecorated ||
+									(allowFactoryBeanInit && isSingleton(beanName, mbd, dbd))) {
 								matchFound = isTypeMatch(beanName, type, allowFactoryBeanInit);
 							}
-							else if (allowFactoryBeanInit) {
-								// Type check before singleton check, avoiding FactoryBean instantiation
-								// for early FactoryBean.isSingleton() calls on non-matching beans.
-								matchFound = isTypeMatch(beanName, type, allowFactoryBeanInit) &&
-										isSingleton(beanName, mbd, dbd);
-							}
 							if (!matchFound) {
 								// In case of FactoryBean, try to match FactoryBean instance itself next.
 								beanName = FACTORY_BEAN_PREFIX + beanName;
@@ -921,7 +895,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			String beanName, DependencyDescriptor descriptor, AutowireCandidateResolver resolver)
 			throws NoSuchBeanDefinitionException {
 
-		String bdName = transformedBeanName(beanName);
+		String bdName = BeanFactoryUtils.transformedBeanName(beanName);
 		if (containsBeanDefinition(bdName)) {
 			return isAutowireCandidate(beanName, getMergedLocalBeanDefinition(bdName), descriptor, resolver);
 		}
@@ -955,7 +929,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	protected boolean isAutowireCandidate(String beanName, RootBeanDefinition mbd,
 			DependencyDescriptor descriptor, AutowireCandidateResolver resolver) {
 
-		String bdName = transformedBeanName(beanName);
+		String bdName = BeanFactoryUtils.transformedBeanName(beanName);
 		resolveBeanClass(mbd, bdName);
 		if (mbd.isFactoryMethodUnique && mbd.factoryMethodToIntrospect == null) {
 			new ConstructorResolver(this).resolveFactoryMethodIfPossible(mbd);
@@ -1033,14 +1007,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return super.obtainInstanceFromSupplier(supplier, beanName, mbd);
 	}
 
-	@Override
-	protected void cacheMergedBeanDefinition(RootBeanDefinition mbd, String beanName) {
-		super.cacheMergedBeanDefinition(mbd, beanName);
-		if (mbd.isPrimary()) {
-			this.primaryBeanNames.add(beanName);
-		}
-	}
-
 	@Override
 	protected void checkMergedBeanDefinition(RootBeanDefinition mbd, String beanName, @Nullable Object[] args) {
 		super.checkMergedBeanDefinition(mbd, beanName, args);
@@ -1053,7 +1019,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 		}
 		else {
-			// Bean intended to be initialized in main bootstrap thread.
+			// Bean intended to be initialized in main bootstrap thread
 			if (this.preInstantiationThread.get() == PreInstantiation.BACKGROUND) {
 				throw new BeanCurrentlyInCreationException(beanName, "Bean marked for mainline initialization " +
 						"but requested in background thread - enforce early instantiation in mainline thread " +
@@ -1065,40 +1031,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	@Override
 	@Nullable
 	protected Boolean isCurrentThreadAllowedToHoldSingletonLock() {
-		String mainThreadPrefix = this.mainThreadPrefix;
-		if (mainThreadPrefix != null) {
-			// We only differentiate in the preInstantiateSingletons phase, using
-			// the volatile mainThreadPrefix field as an indicator for that phase.
-
-			PreInstantiation preInstantiation = this.preInstantiationThread.get();
-			if (preInstantiation != null) {
-				// A Spring-managed bootstrap thread:
-				// MAIN is allowed to lock (true) or even forced to lock (null),
-				// BACKGROUND is never allowed to lock (false).
-				return switch (preInstantiation) {
-					case MAIN -> (Boolean.TRUE.equals(this.strictLocking) ? null : true);
-					case BACKGROUND -> false;
-				};
-			}
-
-			// Not a Spring-managed bootstrap thread...
-			if (Boolean.FALSE.equals(this.strictLocking)) {
-				// Explicitly configured to use lenient locking wherever possible.
-				return true;
-			}
-			else if (this.strictLocking == null) {
-				// No explicit locking configuration -> infer appropriate locking.
-				if (!getThreadNamePrefix().equals(mainThreadPrefix)) {
-					// An unmanaged thread (assumed to be application-internal) with lenient locking,
-					// and not part of the same thread pool that provided the main bootstrap thread
-					// (excluding scenarios where we are hit by multiple external bootstrap threads).
-					return true;
-				}
-			}
-		}
-
-		// Traditional behavior: forced to always hold a full lock.
-		return null;
+		return (this.preInstantiationPhase ? this.preInstantiationThread.get() != PreInstantiation.BACKGROUND : null);
 	}
 
 	@Override
@@ -1114,8 +1047,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		// Trigger initialization of all non-lazy singleton beans...
 		List<CompletableFuture<?>> futures = new ArrayList<>();
 
+		this.preInstantiationPhase = true;
 		this.preInstantiationThread.set(PreInstantiation.MAIN);
-		this.mainThreadPrefix = getThreadNamePrefix();
 		try {
 			for (String beanName : beanNames) {
 				RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
@@ -1128,8 +1061,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 		}
 		finally {
-			this.mainThreadPrefix = null;
 			this.preInstantiationThread.remove();
+			this.preInstantiationPhase = false;
 		}
 
 		if (!futures.isEmpty()) {
@@ -1223,12 +1156,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 	}
 
-	private static String getThreadNamePrefix() {
-		String name = Thread.currentThread().getName();
-		int numberSeparator = name.lastIndexOf('-');
-		return (numberSeparator >= 0 ? name.substring(0, numberSeparator) : name);
-	}
-
 
 	//---------------------------------------------------------------------
 	// Implementation of BeanDefinitionRegistry interface
@@ -2617,8 +2544,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 
 		@Override
-		public Stream<Object> stream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-			return Arrays.stream(beanNamesForStream(this.descriptor.getResolvableType(), includeNonSingletons, true))
+		public Stream<Object> stream(Predicate<Class<?>> customFilter) {
+			return Arrays.stream(getBeanNamesForTypedStream(this.descriptor.getResolvableType(), true))
 					.filter(name -> AutowireUtils.isAutowireCandidate(DefaultListableBeanFactory.this, name))
 					.filter(name -> customFilter.test(getType(name)))
 					.map(name -> getBean(name))
@@ -2626,8 +2553,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 
 		@Override
-		public Stream<Object> orderedStream(Predicate<Class<?>> customFilter, boolean includeNonSingletons) {
-			String[] beanNames = beanNamesForStream(this.descriptor.getResolvableType(), includeNonSingletons, true);
+		public Stream<Object> orderedStream(Predicate<Class<?>> customFilter) {
+			String[] beanNames = getBeanNamesForTypedStream(this.descriptor.getResolvableType(), true);
 			if (beanNames.length == 0) {
 				return Stream.empty();
 			}

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java

@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.support;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -111,12 +110,6 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	/** Names of beans that are currently in lenient creation. */
 	private final Set<String> singletonsInLenientCreation = new HashSet<>();
 
-	/** Map from one creation thread waiting on a lenient creation thread. */
-	private final Map<Thread, Thread> lenientWaitingThreads = new HashMap<>();
-
-	/** Map from bean name to actual creation thread for currently created beans. */
-	private final Map<String, Thread> currentCreationThreads = new ConcurrentHashMap<>();
-
 	/** Flag that indicates whether we're currently within destroySingletons. */
 	private volatile boolean singletonsCurrentlyInDestruction = false;
 
@@ -257,11 +250,9 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	public Object getSingleton(String beanName, ObjectFactory<?> singletonFactory) {
 		Assert.notNull(beanName, "Bean name must not be null");
 
-		Thread currentThread = Thread.currentThread();
 		Boolean lockFlag = isCurrentThreadAllowedToHoldSingletonLock();
 		boolean acquireLock = !Boolean.FALSE.equals(lockFlag);
 		boolean locked = (acquireLock && this.singletonLock.tryLock());
-
 		try {
 			Object singletonObject = this.singletonObjects.get(beanName);
 			if (singletonObject == null) {
@@ -271,15 +262,13 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 						// Fallback as of 6.2: process given singleton bean outside of singleton lock.
 						// Thread-safe exposure is still guaranteed, there is just a risk of collisions
 						// when triggering creation of other beans as dependencies of the current bean.
+						if (logger.isInfoEnabled()) {
+							logger.info("Creating singleton bean '" + beanName + "' in thread \"" +
+									Thread.currentThread().getName() + "\" while other thread holds " +
+									"singleton lock for other beans " + this.singletonsCurrentlyInCreation);
+						}
 						this.lenientCreationLock.lock();
 						try {
-							if (logger.isInfoEnabled()) {
-								Set<String> lockedBeans = new HashSet<>(this.singletonsCurrentlyInCreation);
-								lockedBeans.removeAll(this.singletonsInLenientCreation);
-								logger.info("Obtaining singleton bean '" + beanName + "' in thread \"" +
-										currentThread.getName() + "\" while other thread holds singleton " +
-										"lock for other beans " + lockedBeans);
-							}
 							this.singletonsInLenientCreation.add(beanName);
 						}
 						finally {
@@ -315,27 +304,14 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 					this.lenientCreationLock.lock();
 					try {
 						while ((singletonObject = this.singletonObjects.get(beanName)) == null) {
-							Thread otherThread = this.currentCreationThreads.get(beanName);
-							if (otherThread != null && (otherThread == currentThread ||
-									checkDependentWaitingThreads(otherThread, currentThread))) {
-								throw ex;
-							}
 							if (!this.singletonsInLenientCreation.contains(beanName)) {
 								break;
 							}
-							if (otherThread != null) {
-								this.lenientWaitingThreads.put(currentThread, otherThread);
-							}
 							try {
 								this.lenientCreationFinished.await();
 							}
 							catch (InterruptedException ie) {
-								currentThread.interrupt();
-							}
-							finally {
-								if (otherThread != null) {
-									this.lenientWaitingThreads.remove(currentThread);
-								}
+								Thread.currentThread().interrupt();
 							}
 						}
 					}
@@ -368,13 +344,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 					// Leniently created singleton object could have appeared in the meantime.
 					singletonObject = this.singletonObjects.get(beanName);
 					if (singletonObject == null) {
-						this.currentCreationThreads.put(beanName, currentThread);
-						try {
-							singletonObject = singletonFactory.getObject();
-						}
-						finally {
-							this.currentCreationThreads.remove(beanName);
-						}
+						singletonObject = singletonFactory.getObject();
 						newSingleton = true;
 					}
 				}
@@ -423,8 +393,6 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 			this.lenientCreationLock.lock();
 			try {
 				this.singletonsInLenientCreation.remove(beanName);
-				this.lenientWaitingThreads.entrySet().removeIf(
-						entry -> entry.getValue() == currentThread);
 				this.lenientCreationFinished.signalAll();
 			}
 			finally {
@@ -433,28 +401,14 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 		}
 	}
 
-	private boolean checkDependentWaitingThreads(Thread waitingThread, Thread candidateThread) {
-		Thread threadToCheck = waitingThread;
-		while ((threadToCheck = this.lenientWaitingThreads.get(threadToCheck)) != null) {
-			if (threadToCheck == candidateThread) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Determine whether the current thread is allowed to hold the singleton lock.
-	 * <p>By default, all threads are forced to hold a full lock through {@code null}.
-	 * {@link DefaultListableBeanFactory} overrides this to specifically handle its
-	 * threads during the pre-instantiation phase: {@code true} for the main thread,
-	 * {@code false} for managed background threads, and configuration-dependent
-	 * behavior for unmanaged threads.
-	 * @return {@code true} if the current thread is explicitly allowed to hold the
-	 * lock but also accepts lenient fallback behavior, {@code false} if it is
-	 * explicitly not allowed to hold the lock and therefore forced to use lenient
-	 * fallback behavior, or {@code null} if there is no specific indication
-	 * (traditional behavior: forced to always hold a full lock)
+	 * <p>By default, any thread may acquire and hold the singleton lock, except
+	 * background threads from {@link DefaultListableBeanFactory#setBootstrapExecutor}.
+	 * @return {@code false} if the current thread is explicitly not allowed to hold
+	 * the lock, {@code true} if it is explicitly allowed to hold the lock but also
+	 * accepts lenient fallback behavior, or {@code null} if there is no specific
+	 * indication (traditional behavior: always holding a full lock)
 	 * @since 6.2
 	 */
 	@Nullable
@@ -753,19 +707,12 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 			// For an individual destruction, remove the registered instance now.
 			// As of 6.2, this happens after the current bean's destruction step,
 			// allowing for late bean retrieval by on-demand suppliers etc.
-			if (this.currentCreationThreads.get(beanName) == Thread.currentThread()) {
-				// Local remove after failed creation step -> without singleton lock
-				// since bean creation may have happened leniently without any lock.
+			this.singletonLock.lock();
+			try {
 				removeSingleton(beanName);
 			}
-			else {
-				this.singletonLock.lock();
-				try {
-					removeSingleton(beanName);
-				}
-				finally {
-					this.singletonLock.unlock();
-				}
+			finally {
+				this.singletonLock.unlock();
 			}
 		}
 	}

spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -118,15 +118,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 	 */
 	protected Object getObjectFromFactoryBean(FactoryBean<?> factory, String beanName, boolean shouldPostProcess) {
 		if (factory.isSingleton() && containsSingleton(beanName)) {
-			Boolean lockFlag = isCurrentThreadAllowedToHoldSingletonLock();
-			boolean locked;
-			if (lockFlag == null) {
-				this.singletonLock.lock();
-				locked = true;
-			}
-			else {
-				locked = (lockFlag && this.singletonLock.tryLock());
-			}
+			this.singletonLock.lock();
 			try {
 				Object object = this.factoryBeanObjectCache.get(beanName);
 				if (object == null) {
@@ -139,13 +131,11 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 					}
 					else {
 						if (shouldPostProcess) {
-							if (locked) {
-								if (isSingletonCurrentlyInCreation(beanName)) {
-									// Temporarily return non-post-processed object, not storing it yet
-									return object;
-								}
-								beforeSingletonCreation(beanName);
+							if (isSingletonCurrentlyInCreation(beanName)) {
+								// Temporarily return non-post-processed object, not storing it yet
+								return object;
 							}
+							beforeSingletonCreation(beanName);
 							try {
 								object = postProcessObjectFromFactoryBean(object, beanName);
 							}
@@ -154,9 +144,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 										"Post-processing of FactoryBean's singleton object failed", ex);
 							}
 							finally {
-								if (locked) {
-									afterSingletonCreation(beanName);
-								}
+								afterSingletonCreation(beanName);
 							}
 						}
 						if (containsSingleton(beanName)) {
@@ -167,9 +155,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 				return object;
 			}
 			finally {
-				if (locked) {
-					this.singletonLock.unlock();
-				}
+				this.singletonLock.unlock();
 			}
 		}
 		else {

spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -87,7 +87,7 @@ public class MethodOverrides {
 
 	/**
 	 * Return the override for the given method, if any.
-	 * @param method the method to check for overrides for
+	 * @param method method to check for overrides for
 	 * @return the method override, or {@code null} if none
 	 */
 	@Nullable

spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ public interface MethodReplacer {
 	 * @param obj the instance we're reimplementing the method for
 	 * @param method the method to reimplement
 	 * @param args arguments to the method
-	 * @return the return value for the method
+	 * @return return value for the method
 	 */
 	Object reimplement(Object obj, Method method, Object[] args) throws Throwable;
 

spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -405,10 +405,10 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	/**
 	 * Get all property values, given a prefix (which will be stripped)
 	 * and add the bean they define to the factory with the given name.
-	 * @param beanName the name of the bean to define
+	 * @param beanName name of the bean to define
 	 * @param map a Map containing string pairs
-	 * @param prefix the prefix of each entry, which will be stripped
-	 * @param resourceDescription the description of the resource that the
+	 * @param prefix prefix of each entry, which will be stripped
+	 * @param resourceDescription description of the resource that the
 	 * Map came from (for logging purposes)
 	 * @throws BeansException if the bean definition could not be parsed or registered
 	 */

spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java

@@ -66,40 +66,10 @@ public class SimpleAutowireCandidateResolver implements AutowireCandidateResolve
 	 * @see org.springframework.beans.factory.config.BeanDefinition#isAutowireCandidate()
 	 * @see AbstractBeanDefinition#isDefaultCandidate()
 	 */
-	public static <T> Map<String, T> resolveAutowireCandidates(ConfigurableListableBeanFactory lbf, Class<T> type) {
-		return resolveAutowireCandidates(lbf, type, true, true);
-	}
-
-	/**
-	 * Resolve a map of all beans of the given type, also picking up beans defined in
-	 * ancestor bean factories, with the specific condition that each bean actually
-	 * has autowire candidate status. This matches simple injection point resolution
-	 * as implemented by this {@link AutowireCandidateResolver} strategy, including
-	 * beans which are not marked as default candidates but excluding beans which
-	 * are not even marked as autowire candidates.
-	 * @param lbf the bean factory
-	 * @param type the type of bean to match
-	 * @param includeNonSingletons whether to include prototype or scoped beans too
-	 * or just singletons (also applies to FactoryBeans)
-	 * @param allowEagerInit whether to initialize <i>lazy-init singletons</i> and
-	 * <i>objects created by FactoryBeans</i> (or by factory methods with a
-	 * "factory-bean" reference) for the type check. Note that FactoryBeans need to be
-	 * eagerly initialized to determine their type: So be aware that passing in "true"
-	 * for this flag will initialize FactoryBeans and "factory-bean" references.
-	 * @return the Map of matching bean instances, or an empty Map if none
-	 * @throws BeansException if a bean could not be created
-	 * @since 6.2.5
-	 * @see BeanFactoryUtils#beansOfTypeIncludingAncestors(ListableBeanFactory, Class, boolean, boolean)
-	 * @see org.springframework.beans.factory.config.BeanDefinition#isAutowireCandidate()
-	 * @see AbstractBeanDefinition#isDefaultCandidate()
-	 */
 	@SuppressWarnings("unchecked")
-	public static <T> Map<String, T> resolveAutowireCandidates(ConfigurableListableBeanFactory lbf, Class<T> type,
-			boolean includeNonSingletons, boolean allowEagerInit) {
-
+	public static <T> Map<String, T> resolveAutowireCandidates(ConfigurableListableBeanFactory lbf, Class<T> type) {
 		Map<String, T> candidates = new LinkedHashMap<>();
-		for (String beanName : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(lbf, type,
-				includeNonSingletons, allowEagerInit)) {
+		for (String beanName : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(lbf, type)) {
 			if (AutowireUtils.isAutowireCandidate(lbf, beanName)) {
 				Object beanInstance = lbf.getBean(beanName);
 				if (!(beanInstance instanceof NullBean)) {

spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java

@@ -66,8 +66,8 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 				String id = resolveId(element, definition, parserContext);
 				if (!StringUtils.hasText(id)) {
 					parserContext.getReaderContext().error(
-							"Id is required for element '" + parserContext.getDelegate().getLocalName(element) +
-							"' when used as a top-level tag", element);
+							"Id is required for element '" + parserContext.getDelegate().getLocalName(element)
+									+ "' when used as a top-level tag", element);
 				}
 				String[] aliases = null;
 				if (shouldParseNameAsAliases()) {

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -76,6 +76,7 @@ import org.springframework.beans.testfixture.beans.NestedTestBean;
 import org.springframework.beans.testfixture.beans.SideEffectBean;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.beans.testfixture.beans.factory.DummyFactory;
+import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
@@ -262,32 +263,6 @@ class DefaultListableBeanFactoryTests {
 		assertThat(DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isFalse();
 	}
 
-	@Test
-	void nonInitializedFactoryBeanIgnoredByEagerTypeMatching() {
-		RootBeanDefinition bd = new RootBeanDefinition(DummyFactory.class);
-		bd.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE, String.class);
-		lbf.registerBeanDefinition("x1", bd);
-
-		assertBeanNamesForType(TestBean.class, false, true);
-		assertThat(lbf.getBeanNamesForAnnotation(SuppressWarnings.class)).isEmpty();
-
-		assertThat(lbf.containsSingleton("x1")).isFalse();
-		assertThat(lbf.containsBean("x1")).isTrue();
-		assertThat(lbf.containsBean("&x1")).isTrue();
-		assertThat(lbf.isSingleton("x1")).isTrue();
-		assertThat(lbf.isSingleton("&x1")).isTrue();
-		assertThat(lbf.isPrototype("x1")).isFalse();
-		assertThat(lbf.isPrototype("&x1")).isFalse();
-		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
-		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
-		assertThat(lbf.isTypeMatch("&x1", DummyFactory.class)).isTrue();
-		assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClass(DummyFactory.class))).isTrue();
-		assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClassWithGenerics(FactoryBean.class, Object.class))).isTrue();
-		assertThat(lbf.isTypeMatch("&x1", ResolvableType.forClassWithGenerics(FactoryBean.class, String.class))).isFalse();
-		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(DummyFactory.class);
-	}
-
 	@Test
 	void initializedFactoryBeanFoundByNonEagerTypeMatching() {
 		Properties p = new Properties();
@@ -1418,6 +1393,7 @@ class DefaultListableBeanFactoryTests {
 		lbf.registerBeanDefinition("rod", bd);
 		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
 		lbf.registerBeanDefinition("rod2", bd2);
+		lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
 
 		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
 				.isThrownBy(() -> lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false))
@@ -1488,6 +1464,7 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependenciesBean.class);
 		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		lbf.registerBeanDefinition("bean", bd);
+		lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
 
 		ConstructorDependenciesBean bean = lbf.getBean(ConstructorDependenciesBean.class);
 		Object spouse1 = lbf.getBean("spouse1");
@@ -1505,6 +1482,7 @@ class DefaultListableBeanFactoryTests {
 		bd.setAttribute(GenericBeanDefinition.PREFERRED_CONSTRUCTORS_ATTRIBUTE,
 				ConstructorDependenciesBean.class.getConstructors());
 		lbf.registerBeanDefinition("bean", bd);
+		lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
 
 		ConstructorDependenciesBean bean = lbf.getBean(ConstructorDependenciesBean.class);
 		Object spouse1 = lbf.getBean("spouse1");
@@ -1522,6 +1500,7 @@ class DefaultListableBeanFactoryTests {
 		bd.setAttribute(GenericBeanDefinition.PREFERRED_CONSTRUCTORS_ATTRIBUTE,
 				ConstructorDependenciesBean.class.getConstructor(TestBean.class));
 		lbf.registerBeanDefinition("bean", bd);
+		lbf.setParameterNameDiscoverer(new DefaultParameterNameDiscoverer());
 
 		ConstructorDependenciesBean bean = lbf.getBean(ConstructorDependenciesBean.class);
 		Object spouse = lbf.getBean("spouse1");
@@ -1540,34 +1519,34 @@ class DefaultListableBeanFactoryTests {
 		bd2.setBeanClass(DerivedTestBean.class);
 		bd2.setPropertyValues(new MutablePropertyValues(List.of(new PropertyValue("name", "highest"))));
 		bd2.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.HIGHEST_PRECEDENCE);
-		bd2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		lbf.registerBeanDefinition("bean2", bd2);
 		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream().map(TestBean::getName))
 				.containsExactly("highest", "lowest");
-		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(clazz -> !DerivedTestBean.class.isAssignableFrom(clazz))
-				.map(TestBean::getName)).containsExactly("lowest");
 		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(ObjectProvider.UNFILTERED).map(TestBean::getName))
 				.containsExactly("highest", "lowest");
-		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(ObjectProvider.UNFILTERED, false).map(TestBean::getName))
-				.containsExactly("lowest");
+		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(clazz -> !DerivedTestBean.class.isAssignableFrom(clazz))
+				.map(TestBean::getName)).containsExactly("lowest");
 	}
 
 	@Test
-	void orderFromAttributeOverridesAnnotation() {
+	void orderFromAttributeOverrideAnnotation() {
 		lbf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
 		RootBeanDefinition rbd1 = new RootBeanDefinition(LowestPrecedenceTestBeanFactoryBean.class);
 		rbd1.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.HIGHEST_PRECEDENCE);
 		lbf.registerBeanDefinition("lowestPrecedenceFactory", rbd1);
 		RootBeanDefinition rbd2 = new RootBeanDefinition(HighestPrecedenceTestBeanFactoryBean.class);
 		rbd2.setAttribute(AbstractBeanDefinition.ORDER_ATTRIBUTE, Ordered.LOWEST_PRECEDENCE);
-		rbd2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		lbf.registerBeanDefinition("highestPrecedenceFactory", rbd2);
+		GenericBeanDefinition bd1 = new GenericBeanDefinition();
+		bd1.setFactoryBeanName("highestPrecedenceFactory");
+		lbf.registerBeanDefinition("bean1", bd1);
+		GenericBeanDefinition bd2 = new GenericBeanDefinition();
+		bd2.setFactoryBeanName("lowestPrecedenceFactory");
+		lbf.registerBeanDefinition("bean2", bd2);
 		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream().map(TestBean::getName))
 				.containsExactly("fromLowestPrecedenceTestBeanFactoryBean", "fromHighestPrecedenceTestBeanFactoryBean");
 		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(ObjectProvider.UNFILTERED).map(TestBean::getName))
 				.containsExactly("fromLowestPrecedenceTestBeanFactoryBean", "fromHighestPrecedenceTestBeanFactoryBean");
-		assertThat(lbf.getBeanProvider(TestBean.class).orderedStream(ObjectProvider.UNFILTERED, false).map(TestBean::getName))
-				.containsExactly("fromLowestPrecedenceTestBeanFactoryBean");
 	}
 
 	@Test
@@ -2008,6 +1987,7 @@ class DefaultListableBeanFactoryTests {
 	void getBeanByTypeInstanceWithAmbiguity() {
 		RootBeanDefinition bd1 = createConstructorDependencyBeanDefinition(99);
 		RootBeanDefinition bd2 = new RootBeanDefinition(ConstructorDependency.class);
+		bd2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		bd2.getConstructorArgumentValues().addGenericArgumentValue("43");
 		lbf.registerBeanDefinition("bd1", bd1);
 		lbf.registerBeanDefinition("bd2", bd2);
@@ -2048,10 +2028,6 @@ class DefaultListableBeanFactoryTests {
 		assertThat(resolved).hasSize(2);
 		assertThat(resolved).contains(lbf.getBean("bd1"));
 		assertThat(resolved).contains(lbf.getBean("bd2"));
-
-		resolved = provider.stream(ObjectProvider.UNFILTERED, false).collect(Collectors.toSet());
-		assertThat(resolved).hasSize(1);
-		assertThat(resolved).contains(lbf.getBean("bd2"));
 	}
 
 	@Test
@@ -2106,9 +2082,6 @@ class DefaultListableBeanFactoryTests {
 		assertThat(resolved).hasSize(2);
 		assertThat(resolved).contains(lbf.getBean("bd1"));
 		assertThat(resolved).contains(lbf.getBean("bd2"));
-
-		resolved = provider.stream(ObjectProvider.UNFILTERED, false).collect(Collectors.toSet());
-		assertThat(resolved).isEmpty();
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@@ -1614,10 +1614,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(testBeans).containsExactly(bf.getBean("testBean1", TestBean.class), bf.getBean("testBean2", TestBean.class));
 		testBeans = bean.allTestBeansInOrder();
 		assertThat(testBeans).containsExactly(bf.getBean("testBean1", TestBean.class), bf.getBean("testBean2", TestBean.class));
-		testBeans = bean.allSingletonBeans();
-		assertThat(testBeans).isEmpty();
-		testBeans = bean.allSingletonBeansInOrder();
-		assertThat(testBeans).isEmpty();
 	}
 
 	@Test
@@ -1652,12 +1648,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		testBeans = bean.allTestBeansInOrder();
 		assertThat(testBeans).hasSize(1);
 		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
-		testBeans = bean.allSingletonBeans();
-		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
-		testBeans = bean.allSingletonBeansInOrder();
-		assertThat(testBeans).hasSize(1);
-		assertThat(testBeans).contains(bf.getBean("testBean", TestBean.class));
 	}
 
 	@Test
@@ -1685,10 +1675,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(testBeans).isEmpty();
 		testBeans = bean.allTestBeansInOrder();
 		assertThat(testBeans).isEmpty();
-		testBeans = bean.allSingletonBeans();
-		assertThat(testBeans).isEmpty();
-		testBeans = bean.allSingletonBeansInOrder();
-		assertThat(testBeans).isEmpty();
 	}
 
 	@Test
@@ -1712,8 +1698,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.streamTestBeansInOrder()).containsExactly(testBean1, testBean2);
 		assertThat(bean.allTestBeans()).containsExactly(testBean1, testBean2);
 		assertThat(bean.allTestBeansInOrder()).containsExactly(testBean1, testBean2);
-		assertThat(bean.allSingletonBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.allSingletonBeansInOrder()).containsExactly(testBean1, testBean2);
 	}
 
 	@Test
@@ -1727,7 +1711,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		tb2.setFactoryMethodName("newTestBean2");
 		tb2.setLazyInit(true);
 		bf.registerBeanDefinition("testBean2", tb2);
-		bf.registerAlias("testBean2", "testBean");
 
 		ObjectProviderInjectionBean bean = bf.getBean("annotatedBean", ObjectProviderInjectionBean.class);
 		TestBean testBean1 = bf.getBean("testBean1", TestBean.class);
@@ -1745,41 +1728,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.streamTestBeansInOrder()).containsExactly(testBean2, testBean1);
 		assertThat(bean.allTestBeans()).containsExactly(testBean1, testBean2);
 		assertThat(bean.allTestBeansInOrder()).containsExactly(testBean2, testBean1);
-		assertThat(bean.allSingletonBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.allSingletonBeansInOrder()).containsExactly(testBean2, testBean1);
-	}
-
-	@Test
-	void objectProviderInjectionWithLateMarkedTargetPrimary() {
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectProviderInjectionBean.class));
-		RootBeanDefinition tb1 = new RootBeanDefinition(TestBeanFactory.class);
-		tb1.setFactoryMethodName("newTestBean1");
-		bf.registerBeanDefinition("testBean1", tb1);
-		RootBeanDefinition tb2 = new RootBeanDefinition(TestBeanFactory.class);
-		tb2.setFactoryMethodName("newTestBean2");
-		tb2.setLazyInit(true);
-		bf.registerBeanDefinition("testBean2", tb2);
-		bf.registerAlias("testBean2", "testBean");
-		tb1.setPrimary(true);
-
-		ObjectProviderInjectionBean bean = bf.getBean("annotatedBean", ObjectProviderInjectionBean.class);
-		TestBean testBean1 = bf.getBean("testBean1", TestBean.class);
-		assertThat(bean.getTestBean()).isSameAs(testBean1);
-		assertThat(bean.getOptionalTestBean()).isSameAs(testBean1);
-		assertThat(bean.consumeOptionalTestBean()).isSameAs(testBean1);
-		assertThat(bean.getUniqueTestBean()).isSameAs(testBean1);
-		assertThat(bean.consumeUniqueTestBean()).isSameAs(testBean1);
-		assertThat(bf.containsSingleton("testBean2")).isFalse();
-
-		TestBean testBean2 = bf.getBean("testBean2", TestBean.class);
-		assertThat(bean.iterateTestBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.forEachTestBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.streamTestBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.streamTestBeansInOrder()).containsExactly(testBean2, testBean1);
-		assertThat(bean.allTestBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.allTestBeansInOrder()).containsExactly(testBean2, testBean1);
-		assertThat(bean.allSingletonBeans()).containsExactly(testBean1, testBean2);
-		assertThat(bean.allSingletonBeansInOrder()).containsExactly(testBean2, testBean1);
 	}
 
 	@Test
@@ -1791,7 +1739,7 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		bf.registerBeanDefinition("testBean1", tb1);
 		RootBeanDefinition tb2 = new RootBeanDefinition(TestBeanFactory.class);
 		tb2.setFactoryMethodName("newTestBean2");
-		tb2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		tb2.setLazyInit(true);
 		bf.registerBeanDefinition("testBean2", tb2);
 
 		ObjectProviderInjectionBean bean = bf.getBean("annotatedBean", ObjectProviderInjectionBean.class);
@@ -1799,7 +1747,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 				bf.getBean("testBean1", TestBean.class));
 		assertThat(bean.allTestBeansInOrder()).containsExactly(bf.getBean("testBean2", TestBean.class),
 				bf.getBean("testBean1", TestBean.class));
-		assertThat(bean.allSingletonBeansInOrder()).containsExactly(bf.getBean("testBean1", TestBean.class));
 	}
 
 	@Test
@@ -1810,7 +1757,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		bf.registerBeanDefinition("testBean1", tb1);
 		RootBeanDefinition tb2 = new RootBeanDefinition(TestBeanFactory.class);
 		tb2.setFactoryMethodName("newTestBean2");
-		tb2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		bf.registerBeanDefinition("testBean2", tb2);
 
 		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
@@ -1843,10 +1789,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 				bf.getBean("testBean2", TestBean.class), bf.getBean("testBean4", TestBean.class));
 		assertThat(bean.allTestBeansInOrder()).containsExactly(bf.getBean("testBean2", TestBean.class),
 				bf.getBean("testBean1", TestBean.class), bf.getBean("testBean4", TestBean.class));
-		assertThat(bean.allSingletonBeans()).containsExactly(bf.getBean("testBean1", TestBean.class),
-				bf.getBean("testBean4", TestBean.class));
-		assertThat(bean.allSingletonBeansInOrder()).containsExactly(bf.getBean("testBean1", TestBean.class),
-				bf.getBean("testBean4", TestBean.class));
 
 		Map<String, TestBean> typeMatches = BeanFactoryUtils.beansOfTypeIncludingAncestors(bf, TestBean.class);
 		assertThat(typeMatches.remove("testBean3")).isNotNull();
@@ -2428,7 +2370,7 @@ class AutowiredAnnotationBeanPostProcessorTests {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	void genericsBasedConstructorInjectionWithNonTypedTarget() {
 		RootBeanDefinition bd = new RootBeanDefinition(RepositoryConstructorInjectionBean.class);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -3451,14 +3393,6 @@ class AutowiredAnnotationBeanPostProcessorTests {
 		public List<TestBean> allTestBeansInOrder() {
 			return this.testBean.orderedStream(ObjectProvider.UNFILTERED).toList();
 		}
-
-		public List<TestBean> allSingletonBeans() {
-			return this.testBean.stream(ObjectProvider.UNFILTERED, false).toList();
-		}
-
-		public List<TestBean> allSingletonBeansInOrder() {
-			return this.testBean.orderedStream(ObjectProvider.UNFILTERED, false).toList();
-		}
 	}
 
 

spring-beans/src/test/java/org/springframework/beans/factory/annotation/ParameterResolutionTests.java

@@ -71,8 +71,8 @@ class ParameterResolutionTests {
 	}
 
 	private void assertAutowirableParameters(Executable executable) {
-		int startIndex = (executable instanceof Constructor) &&
-				ClassUtils.isInnerClass(executable.getDeclaringClass()) ? 1 : 0;
+		int startIndex = (executable instanceof Constructor)
+				&& ClassUtils.isInnerClass(executable.getDeclaringClass()) ? 1 : 0;
 		Parameter[] parameters = executable.getParameters();
 		for (int parameterIndex = startIndex; parameterIndex < parameters.length; parameterIndex++) {
 			Parameter parameter = parameters[parameterIndex];

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorDelegatesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 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.
@@ -18,7 +18,6 @@ package org.springframework.beans.factory.aot;
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.temporal.ChronoUnit;
@@ -29,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import java.util.function.Supplier;
 
 import javax.lang.model.element.Modifier;
 
@@ -54,7 +54,7 @@ import org.springframework.core.testfixture.aot.generate.value.ExampleClass;
 import org.springframework.core.testfixture.aot.generate.value.ExampleClass$$GeneratedBy;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
-import org.springframework.util.ReflectionUtils;
+import org.springframework.javapoet.ParameterizedTypeName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -83,23 +83,14 @@ class BeanDefinitionPropertyValueCodeGeneratorDelegatesTests {
 		CodeBlock generatedCode = createValueCodeGenerator(generatedClass).generateCode(value);
 		typeBuilder.set(type -> {
 			type.addModifiers(Modifier.PUBLIC);
-			type.addMethod(MethodSpec.methodBuilder("get").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+			type.addSuperinterface(
+					ParameterizedTypeName.get(Supplier.class, Object.class));
+			type.addMethod(MethodSpec.methodBuilder("get").addModifiers(Modifier.PUBLIC)
 					.returns(Object.class).addStatement("return $L", generatedCode).build());
 		});
 		generationContext.writeGeneratedContent();
 		TestCompiler.forSystem().with(generationContext).compile(compiled ->
-				result.accept(getGeneratedCodeReturnValue(compiled, generatedClass), compiled));
-	}
-
-	private static Object getGeneratedCodeReturnValue(Compiled compiled, GeneratedClass generatedClass) {
-		try {
-			Object instance = compiled.getInstance(Object.class, generatedClass.getName().reflectionName());
-			Method get = ReflectionUtils.findMethod(instance.getClass(), "get");
-			return get.invoke(null);
-		}
-		catch (Exception ex) {
-			throw new RuntimeException("Failed to invoke generated code '%s':".formatted(generatedClass.getName()), ex);
-		}
+				result.accept(compiled.getInstance(Supplier.class).get(), compiled));
 	}
 
 	@Nested

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanInstanceSupplierTests.java

@@ -103,8 +103,8 @@ class BeanInstanceSupplierTests {
 		RegisteredBean registerBean = source.registerBean(this.beanFactory);
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> resolver.get(registerBean)).withMessage(
-						"Constructor with parameter types [java.io.InputStream] cannot be found on " +
-								SingleArgConstructor.class.getName());
+						"Constructor with parameter types [java.io.InputStream] cannot be found on "
+								+ SingleArgConstructor.class.getName());
 	}
 
 	@Test
@@ -151,8 +151,8 @@ class BeanInstanceSupplierTests {
 		RegisteredBean registerBean = source.registerBean(this.beanFactory);
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> resolver.get(registerBean)).withMessage(
-						"Factory method 'single' with parameter types [java.io.InputStream] declared on class " +
-								SingleArgFactory.class.getName() + " cannot be found");
+						"Factory method 'single' with parameter types [java.io.InputStream] declared on class "
+								+ SingleArgFactory.class.getName() + " cannot be found");
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java

@@ -86,8 +86,8 @@ class DefaultBeanRegistrationCodeFragmentsTests {
 		BeanRegistrationCodeFragments codeFragments = createInstance(registeredBean);
 		assertThatExceptionOfType(AotBeanProcessingException.class)
 				.isThrownBy(() -> codeFragments.getTarget(registeredBean))
-				.withMessageContaining("Error processing bean with name 'testBean' defined in my test resource: " +
-						"instance supplier is not supported");
+				.withMessageContaining("Error processing bean with name 'testBean' defined in my test resource: "
+						+ "instance supplier is not supported");
 	}
 
 	@Test

spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2024 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,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.DependencyDescriptor;
-import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.util.ClassUtils;
@@ -44,17 +43,14 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 
 	private static final String MARK = "mark";
 
-	private final DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-
-
 
 	@Test
 	void testAutowireCandidateDefaultWithIrrelevantDescriptor() throws Exception {
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null);
 		lbf.registerBeanDefinition(JUERGEN, rbd);
-
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), false))).isTrue();
@@ -64,12 +60,12 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 
 	@Test
 	void testAutowireCandidateExplicitlyFalseWithIrrelevantDescriptor() throws Exception {
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null);
 		rbd.setAutowireCandidate(false);
 		lbf.registerBeanDefinition(JUERGEN, rbd);
-
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isFalse();
 		assertThat(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), false))).isFalse();
@@ -77,46 +73,44 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), true))).isFalse();
 	}
 
+	@Disabled
 	@Test
 	void testAutowireCandidateWithFieldDescriptor() throws Exception {
-		lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
 		person1.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(JUERGEN, person1);
-
 		ConstructorArgumentValues cavs2 = new ConstructorArgumentValues();
 		cavs2.addGenericArgumentValue(MARK);
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		lbf.registerBeanDefinition(MARK, person2);
-
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("qualified"), false);
 		DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
-
+		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
+		assertThat(lbf.isAutowireCandidate(MARK, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
 	}
 
 	@Test
 	void testAutowireCandidateExplicitlyFalseWithFieldDescriptor() throws Exception {
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.setAutowireCandidate(false);
 		person.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(JUERGEN, person);
-
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("qualified"), false);
 		DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
-
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isFalse();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isFalse();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isFalse();
@@ -124,61 +118,56 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 
 	@Test
 	void testAutowireCandidateWithShortClassName() throws Exception {
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.addQualifier(new AutowireCandidateQualifier(ClassUtils.getShortName(TestQualifier.class)));
 		lbf.registerBeanDefinition(JUERGEN, person);
-
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("qualified"), false);
 		DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(
 				QualifiedTestBean.class.getDeclaredField("nonqualified"), false);
-
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
 	}
 
+	@Disabled
 	@Test
 	void testAutowireCandidateWithConstructorDescriptor() throws Exception {
-		lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
 		person1.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(JUERGEN, person1);
-
 		ConstructorArgumentValues cavs2 = new ConstructorArgumentValues();
 		cavs2.addGenericArgumentValue(MARK);
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		lbf.registerBeanDefinition(MARK, person2);
-
 		MethodParameter param = new MethodParameter(QualifiedTestBean.class.getDeclaredConstructor(Person.class), 0);
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(param, false);
 		param.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
-
 		assertThat(param.getParameterName()).isEqualTo("tpb");
+		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
 	}
 
+	@Disabled
 	@Test
 	void testAutowireCandidateWithMethodDescriptor() throws Exception {
-		lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
 		person1.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(JUERGEN, person1);
-
 		ConstructorArgumentValues cavs2 = new ConstructorArgumentValues();
 		cavs2.addGenericArgumentValue(MARK);
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		lbf.registerBeanDefinition(MARK, person2);
-
 		MethodParameter qualifiedParam =
 				new MethodParameter(QualifiedTestBean.class.getDeclaredMethod("autowireQualified", Person.class), 0);
 		MethodParameter nonqualifiedParam =
@@ -186,70 +175,37 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(qualifiedParam, false);
 		DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(nonqualifiedParam, false);
 		qualifiedParam.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
-		nonqualifiedParam.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
-
 		assertThat(qualifiedParam.getParameterName()).isEqualTo("tpb");
+		nonqualifiedParam.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
 		assertThat(nonqualifiedParam.getParameterName()).isEqualTo("tpb");
+		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
+		assertThat(lbf.isAutowireCandidate(MARK, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, nonqualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isFalse();
 	}
 
 	@Test
 	void testAutowireCandidateWithMultipleCandidatesDescriptor() throws Exception {
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
 		person1.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(JUERGEN, person1);
-
 		ConstructorArgumentValues cavs2 = new ConstructorArgumentValues();
 		cavs2.addGenericArgumentValue(MARK);
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		person2.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		lbf.registerBeanDefinition(MARK, person2);
-
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(
 				new MethodParameter(QualifiedTestBean.class.getDeclaredConstructor(Person.class), 0),
 				false);
-
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
 		assertThat(lbf.isAutowireCandidate(MARK, qualifiedDescriptor)).isTrue();
 	}
 
-	@Test
-	void autowireBeanByTypeWithQualifierPrecedence() throws Exception {
-		lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
-		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
-		lbf.registerBeanDefinition("testBean", bd);
-		lbf.registerBeanDefinition("spouse", bd2);
-		lbf.registerAlias("test", "testBean");
-
-		assertThat(lbf.resolveDependency(new DependencyDescriptor(getClass().getDeclaredField("testBean"), true), null))
-				.isSameAs(lbf.getBean("spouse"));
-	}
-
-	@Test
-	void autowireBeanByTypeWithQualifierPrecedenceInAncestor() throws Exception {
-		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
-		parent.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
-		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
-		parent.registerBeanDefinition("test", bd);
-		parent.registerBeanDefinition("spouse", bd2);
-		parent.registerAlias("test", "testBean");
-
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(parent);
-		lbf.setAutowireCandidateResolver(new QualifierAnnotationAutowireCandidateResolver());
-
-		assertThat(lbf.resolveDependency(new DependencyDescriptor(getClass().getDeclaredField("testBean"), true), null))
-				.isSameAs(lbf.getBean("spouse"));
-	}
-
 
 	@SuppressWarnings("unused")
 	private static class QualifiedTestBean {
@@ -291,8 +247,4 @@ class QualifierAnnotationAutowireBeanFactoryTests {
 	private @interface TestQualifier {
 	}
 
-
-	@Qualifier("spouse")
-	private TestBean testBean;
-
 }

spring-context-indexer/src/main/java/org/springframework/context/index/processor/MetadataCollector.java

@@ -93,8 +93,8 @@ class MetadataCollector {
 
 	private boolean shouldBeMerged(ItemMetadata itemMetadata) {
 		String sourceType = itemMetadata.getType();
-		return (sourceType != null && !deletedInCurrentBuild(sourceType) &&
-				!processedInCurrentBuild(sourceType));
+		return (sourceType != null && !deletedInCurrentBuild(sourceType)
+				&& !processedInCurrentBuild(sourceType));
 	}
 
 	private boolean deletedInCurrentBuild(String sourceType) {

spring-context-indexer/src/test/java/org/springframework/context/index/processor/Metadata.java

@@ -42,8 +42,8 @@ class Metadata {
 			ItemMetadata itemMetadata = metadata.getItems().stream()
 					.filter(item -> item.getType().equals(type))
 					.findFirst().orElse(null);
-			return (itemMetadata != null && itemMetadata.getStereotypes().size() == stereotypes.size() &&
-					itemMetadata.getStereotypes().containsAll(stereotypes));
+			return itemMetadata != null && itemMetadata.getStereotypes().size() == stereotypes.size()
+					&& itemMetadata.getStereotypes().containsAll(stereotypes);
 		}, "Candidates with type %s and stereotypes %s", type, stereotypes);
 	}