Release v6.1.16

2026-06-08 17:33:33 +00:00 · 2024-12-12 09:16:30 +01:00
105 changed files with 643 additions and 1794 deletions
@@ -11,7 +11,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 }}
@@ -15,7 +15,7 @@ permissions:
 jobs:
  build:
    name: Dispatch docs deployment
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
+    if: github.repository_owner == 'spring-projects'
    runs-on: ubuntu-latest
    steps:
    - name: Check out code
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.13-librca
+java=17.0.12-librca
@@ -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.
@@ -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.22.0");
+			checkstyle.setToolVersion("10.20.2");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
@@ -64,7 +64,7 @@ public class CheckstyleConventions {
 		NoHttpExtension noHttp = project.getExtensions().getByType(NoHttpExtension.class);
 		noHttp.setAllowlistFile(project.file("src/nohttp/allowlist.lines"));
 		noHttp.getSource().exclude("**/test-output/**", "**/.settings/**",
-				"**/.classpath", "**/.project", "**/.gradle/**", "**/node_modules/**", "buildSrc/build/**");
+				"**/.classpath", "**/.project", "**/.gradle/**", "**/node_modules/**");
 		List<String> buildFolders = List.of("bin", "build", "out");
 		project.allprojects(subproject -> {
 			Path rootPath = project.getRootDir().toPath();
@@ -120,6 +120,8 @@ dynamically generate a subclass that overrides the method.
  subclasses cannot be `final`, and the method to be overridden cannot be `final`, either.
 * Unit-testing a class that has an `abstract` method requires you to subclass the class
  yourself and to supply a stub implementation of the `abstract` method.
+* Concrete methods are also necessary for component scanning, which requires concrete
+  classes to pick up.
 * A further key limitation is that lookup methods do not work with factory methods and
  in particular not with `@Bean` methods in configuration classes, since, in that case,
  the container is not in charge of creating the instance and therefore cannot create
@@ -291,6 +293,11 @@ Kotlin::
 ----
 ======

+Note that you should typically declare such annotated lookup methods with a concrete
+stub implementation, in order for them to be compatible with Spring's component
+scanning rules where abstract classes get ignored by default. This limitation does not
+apply to explicitly registered or explicitly imported bean classes.
+
 [TIP]
 ====
 Another way of accessing differently scoped target beans is an `ObjectFactory`/
@@ -193,7 +193,7 @@ Kotlin::
 [[webtestclient-fn-config]]
 === Bind to Router Function

-This setup allows you to test xref:web/webflux-functional.adoc[functional endpoints] via
+This setup allows you to test <<web-reactive.adoc#webflux-fn, functional endpoints>> via
 mock request and response objects, without a running server.

 For WebFlux, use the following which delegates to `RouterFunctions.toWebHandler` to
@@ -1,6 +1,5 @@
 [[webflux-cors]]
 = CORS
-
 [.small]#xref:web/webmvc-cors.adoc[See equivalent in the Servlet stack]#

 Spring WebFlux lets you handle CORS (Cross-Origin Resource Sharing). This section
@@ -365,7 +364,7 @@ Kotlin::

 You can apply CORS support through the built-in
 {spring-framework-api}/web/cors/reactive/CorsWebFilter.html[`CorsWebFilter`], which is a
-good fit with xref:web/webflux-functional.adoc[functional endpoints].
+good fit with <<webflux-fn, functional endpoints>>.

 NOTE: If you try to use the `CorsFilter` with Spring Security, keep in mind that Spring
 Security has {docs-spring-security}/servlet/integrations/cors.html[built-in support] for
@@ -1,6 +1,5 @@
 [[webflux-fn]]
 = Functional Endpoints
-
 [.small]#xref:web/webmvc-functional.adoc[See equivalent in the Servlet stack]#

 Spring WebFlux includes WebFlux.fn, a lightweight functional programming model in which functions
@@ -1,6 +1,5 @@
 [[webflux-websocket]]
 = WebSockets
-
 [.small]#xref:web/websocket.adoc[See equivalent in the Servlet stack]#

 This part of the reference documentation covers support for reactive-stack WebSocket
@@ -101,7 +101,7 @@ On that foundation, Spring WebFlux provides a choice of two programming models:
 from the `spring-web` module. Both Spring MVC and WebFlux controllers support reactive
 (Reactor and RxJava) return types, and, as a result, it is not easy to tell them apart. One notable
 difference is that WebFlux also supports reactive `@RequestBody` arguments.
-* xref:web/webflux-functional.adoc[Functional Endpoints]: Lambda-based, lightweight, and functional programming model. You can think of
+* <<webflux-fn>>: Lambda-based, lightweight, and functional programming model. You can think of
 this as a small library or a set of utilities that an application can use to route and
 handle requests. The big difference with annotated controllers is that the application
 is in charge of request handling from start to finish versus declaring intent through
@@ -1,6 +1,5 @@
 [[mvc-cors]]
 = CORS
-
 [.small]#xref:web/webflux-cors.adoc[See equivalent in the Reactive stack]#

 Spring MVC lets you handle CORS (Cross-Origin Resource Sharing). This section
@@ -1,7 +1,6 @@
 [[webmvc-fn]]
 = Functional Endpoints
-
-[.small]#xref:web/webflux-functional.adoc[See equivalent in the Reactive stack]#
+[.small]#<<web-reactive.adoc#webflux-fn, See equivalent in the Reactive stack>>#

 Spring Web MVC includes WebMvc.fn, a lightweight functional programming model in which functions
 are used to route and handle requests and contracts are designed for immutability.
@@ -1,7 +1,6 @@
 [[websocket]]
 = WebSockets
 :page-section-summary-toc: 1
-
 [.small]#xref:web/webflux-websocket.adoc[See equivalent in the Reactive stack]#

 This part of the reference documentation covers support for Servlet stack, WebSocket
@@ -5,7 +5,6 @@
    "@antora/collector-extension": "1.0.0-alpha.3",
    "@asciidoctor/tabs": "1.0.0-beta.6",
    "@springio/antora-extensions": "1.11.1",
-    "fast-xml-parser": "4.5.2",
    "@springio/asciidoctor-extensions": "1.0.0-alpha.10"
  }
 }
@@ -9,15 +9,15 @@ javaPlatform {
 dependencies {
 	api(platform("com.fasterxml.jackson:jackson-bom:2.15.4"))
 	api(platform("io.micrometer:micrometer-bom:1.12.12"))
-	api(platform("io.netty:netty-bom:4.1.119.Final"))
+	api(platform("io.netty:netty-bom:4.1.115.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
-	api(platform("io.projectreactor:reactor-bom:2023.0.16"))
-	api(platform("io.rsocket:rsocket-bom:1.1.5"))
-	api(platform("org.apache.groovy:groovy-bom:4.0.26"))
+	api(platform("io.projectreactor:reactor-bom:2023.0.13"))
+	api(platform("io.rsocket:rsocket-bom:1.1.4"))
+	api(platform("org.apache.groovy:groovy-bom:4.0.24"))
 	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.18"))
-	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.18"))
+	api(platform("org.assertj:assertj-bom:3.26.3"))
+	api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
+	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
 	api(platform("org.junit:junit-bom:5.10.5"))
@@ -44,7 +44,7 @@ dependencies {
 		api("com.sun.xml.bind:jaxb-impl:3.0.2")
 		api("com.sun.xml.bind:jaxb-xjc:3.0.2")
 		api("com.thoughtworks.qdox:qdox:2.1.0")
-		api("com.thoughtworks.xstream:xstream:1.4.21")
+		api("com.thoughtworks.xstream:xstream:1.4.20")
 		api("commons-io:commons-io:2.15.0")
 		api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
 		api("io.micrometer:context-propagation:1.1.1")
@@ -101,8 +101,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.3")
-		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.4")
+		api("org.apache.httpcomponents.client5:httpclient5:5.4.1")
+		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.1")
 		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")
@@ -116,7 +116,7 @@ dependencies {
 		api("org.codehaus.jettison:jettison:1.5.4")
 		api("org.crac:crac:1.4.0")
 		api("org.dom4j:dom4j:2.1.4")
-		api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.9")
+		api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.8")
 		api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
 		api("org.eclipse:yasson:2.0.4")
 		api("org.ehcache:ehcache:3.10.8")
@@ -1,4 +1,4 @@
-version=6.1.19
+version=6.1.16

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
@@ -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.
@@ -276,18 +276,14 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		}
 		if (this.aspectJAdviceMethod.getParameterCount() == this.argumentNames.length + 1) {
 			// May need to add implicit join point arg name...
-			for (int i = 0; i < this.aspectJAdviceMethod.getParameterCount(); i++) {
-				Class<?> argType = this.aspectJAdviceMethod.getParameterTypes()[i];
-				if (argType == JoinPoint.class ||
-						argType == ProceedingJoinPoint.class ||
-						argType == JoinPoint.StaticPart.class) {
-					String[] oldNames = this.argumentNames;
-					this.argumentNames = new String[oldNames.length + 1];
-					System.arraycopy(oldNames, 0, this.argumentNames, 0, i);
-					this.argumentNames[i] = "THIS_JOIN_POINT";
-					System.arraycopy(oldNames, i, this.argumentNames, i + 1, oldNames.length - i);
-					break;
-				}
+			Class<?> firstArgType = this.aspectJAdviceMethod.getParameterTypes()[0];
+			if (firstArgType == JoinPoint.class ||
+					firstArgType == ProceedingJoinPoint.class ||
+					firstArgType == JoinPoint.StaticPart.class) {
+				String[] oldNames = this.argumentNames;
+				this.argumentNames = new String[oldNames.length + 1];
+				this.argumentNames[0] = "THIS_JOIN_POINT";
+				System.arraycopy(oldNames, 0, this.argumentNames, 1, oldNames.length);
 			}
 		}
 	}
@@ -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
@@ -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.SpringNamingPolicy;
@@ -202,7 +201,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(new ClassLoaderAwareGeneratorStrategy(classLoader));

 			Callback[] callbacks = getCallbacks(rootClass);
@@ -1,135 +0,0 @@
-/*
- * Copyright 2002-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.aop.aspectj;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.function.Consumer;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.assertj.core.api.InstanceOfAssertFactories;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-/**
- * Tests for {@link AbstractAspectJAdvice}.
- *
- * @author Joshua Chen
- * @author Stephane Nicoll
- */
-class AbstractAspectJAdviceTests {
-
-	@Test
-	void setArgumentNamesFromStringArray_withoutJoinPointParameter() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithNoJoinPoint");
-		assertThat(advice).satisfies(hasArgumentNames("arg1", "arg2"));
-	}
-
-	@Test
-	void setArgumentNamesFromStringArray_withJoinPointAsFirstParameter() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithJoinPointAsFirstParameter");
-		assertThat(advice).satisfies(hasArgumentNames("THIS_JOIN_POINT", "arg1", "arg2"));
-	}
-
-	@Test
-	void setArgumentNamesFromStringArray_withJoinPointAsLastParameter() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithJoinPointAsLastParameter");
-		assertThat(advice).satisfies(hasArgumentNames("arg1", "arg2", "THIS_JOIN_POINT"));
-	}
-
-	@Test
-	void setArgumentNamesFromStringArray_withJoinPointAsMiddleParameter() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithJoinPointAsMiddleParameter");
-		assertThat(advice).satisfies(hasArgumentNames("arg1", "THIS_JOIN_POINT", "arg2"));
-	}
-
-	@Test
-	void setArgumentNamesFromStringArray_withProceedingJoinPoint() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithProceedingJoinPoint");
-		assertThat(advice).satisfies(hasArgumentNames("THIS_JOIN_POINT", "arg1", "arg2"));
-	}
-
-	@Test
-	void setArgumentNamesFromStringArray_withStaticPart() {
-		AbstractAspectJAdvice advice = getAspectJAdvice("methodWithStaticPart");
-		assertThat(advice).satisfies(hasArgumentNames("THIS_JOIN_POINT", "arg1", "arg2"));
-	}
-
-	private Consumer<AbstractAspectJAdvice> hasArgumentNames(String... argumentNames) {
-		return advice -> assertThat(advice).extracting("argumentNames")
-				.asInstanceOf(InstanceOfAssertFactories.array(String[].class))
-				.containsExactly(argumentNames);
-	}
-
-	private AbstractAspectJAdvice getAspectJAdvice(final String methodName) {
-		AbstractAspectJAdvice advice = new TestAspectJAdvice(getMethod(methodName),
-				mock(AspectJExpressionPointcut.class), mock(AspectInstanceFactory.class));
-		advice.setArgumentNamesFromStringArray("arg1", "arg2");
-		return advice;
-	}
-
-	private Method getMethod(final String methodName) {
-		return Arrays.stream(Sample.class.getDeclaredMethods())
-				.filter(method -> method.getName().equals(methodName)).findFirst()
-				.orElseThrow();
-	}
-
-	@SuppressWarnings("serial")
-	public static class TestAspectJAdvice extends AbstractAspectJAdvice {
-
-		public TestAspectJAdvice(Method aspectJAdviceMethod, AspectJExpressionPointcut pointcut,
-				AspectInstanceFactory aspectInstanceFactory) {
-			super(aspectJAdviceMethod, pointcut, aspectInstanceFactory);
-		}
-
-		@Override
-		public boolean isBeforeAdvice() {
-			return false;
-		}
-
-		@Override
-		public boolean isAfterAdvice() {
-			return false;
-		}
-	}
-
-	@SuppressWarnings("unused")
-	static class Sample {
-
-		void methodWithNoJoinPoint(String arg1, String arg2) {
-		}
-
-		void methodWithJoinPointAsFirstParameter(JoinPoint joinPoint, String arg1, String arg2) {
-		}
-
-		void methodWithJoinPointAsLastParameter(String arg1, String arg2, JoinPoint joinPoint) {
-		}
-
-		void methodWithJoinPointAsMiddleParameter(String arg1, JoinPoint joinPoint, String arg2) {
-		}
-
-		void methodWithProceedingJoinPoint(ProceedingJoinPoint joinPoint, String arg1, String arg2) {
-		}
-
-		void methodWithStaticPart(JoinPoint.StaticPart staticPart, String arg1, String arg2) {
-		}
-	}
-
-}
@@ -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;

 }
@@ -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.
@@ -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('[');
@@ -657,14 +658,6 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 						growCollectionIfNecessary(list, index, indexedPropertyName.toString(), ph, i + 1);
 						value = list.get(index);
 					}
-					else if (value instanceof Map map) {
-						Class<?> mapKeyType = ph.getResolvableType().getNested(i + 1).asMap().resolveGeneric(0);
-						// IMPORTANT: Do not pass full property name in here - property editors
-						// must not kick in for map keys but rather only for map values.
-						TypeDescriptor typeDescriptor = TypeDescriptor.valueOf(mapKeyType);
-						Object convertedMapKey = convertIfNecessary(null, null, key, mapKeyType, typeDescriptor);
-						value = map.get(convertedMapKey);
-					}
 					else if (value instanceof Iterable iterable) {
 						// Apply index to Iterator in case of a Set/Collection/Iterable.
 						int index = Integer.parseInt(key);
@@ -692,6 +685,14 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 											currIndex + ", accessed using property path '" + propertyName + "'");
 						}
 					}
+					else if (value instanceof Map map) {
+						Class<?> mapKeyType = ph.getResolvableType().getNested(i + 1).asMap().resolveGeneric(0);
+						// IMPORTANT: Do not pass full property name in here - property editors
+						// must not kick in for map keys but rather only for map values.
+						TypeDescriptor typeDescriptor = TypeDescriptor.valueOf(mapKeyType);
+						Object convertedMapKey = convertIfNecessary(null, null, key, mapKeyType, typeDescriptor);
+						value = map.get(convertedMapKey);
+					}
 					else {
 						throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 								"Property referenced in indexed property path '" + propertyName +
@@ -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
@@ -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)
@@ -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.
@@ -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());
@@ -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.
@@ -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));
@@ -266,7 +265,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt

 	/**
 	 * CGLIB MethodInterceptor to override methods, replacing them with a call
-	 * to a generic {@link MethodReplacer}.
+	 * to a generic MethodReplacer.
 	 */
 	private static class ReplaceOverrideMethodInterceptor extends CglibIdentitySupport implements MethodInterceptor {

@@ -278,10 +277,10 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		}

 		@Override
-		@Nullable
 		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 mr.reimplement(obj, method, args);
 		}
@@ -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.
@@ -178,13 +178,13 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	 */
 	@Nullable
 	protected Object getSingleton(String beanName, boolean allowEarlyReference) {
-		// Quick check for existing instance without full singleton lock.
+		// Quick check for existing instance without full singleton lock
 		Object singletonObject = this.singletonObjects.get(beanName);
 		if (singletonObject == null && isSingletonCurrentlyInCreation(beanName)) {
 			singletonObject = this.earlySingletonObjects.get(beanName);
 			if (singletonObject == null && allowEarlyReference) {
 				synchronized (this.singletonObjects) {
-					// Consistent creation of early reference within full singleton lock.
+					// Consistent creation of early reference within full singleton lock
 					singletonObject = this.singletonObjects.get(beanName);
 					if (singletonObject == null) {
 						singletonObject = this.earlySingletonObjects.get(beanName);
@@ -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.
@@ -139,7 +139,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.isReadableProperty("list")).isTrue();
 		assertThat(accessor.isReadableProperty("set")).isTrue();
 		assertThat(accessor.isReadableProperty("map")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap")).isTrue();
 		assertThat(accessor.isReadableProperty("myTestBeans")).isTrue();
 		assertThat(accessor.isReadableProperty("xxx")).isFalse();

@@ -147,7 +146,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.isWritableProperty("list")).isTrue();
 		assertThat(accessor.isWritableProperty("set")).isTrue();
 		assertThat(accessor.isWritableProperty("map")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap")).isTrue();
 		assertThat(accessor.isWritableProperty("myTestBeans")).isTrue();
 		assertThat(accessor.isWritableProperty("xxx")).isFalse();

@@ -163,14 +161,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.isReadableProperty("map[key4][0].name")).isTrue();
 		assertThat(accessor.isReadableProperty("map[key4][1]")).isTrue();
 		assertThat(accessor.isReadableProperty("map[key4][1].name")).isTrue();
-		assertThat(accessor.isReadableProperty("map[key999]")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key1]")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key1].name")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key2][0]")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key2][0].name")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key2][1]")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key2][1].name")).isTrue();
-		assertThat(accessor.isReadableProperty("iterableMap[key999]")).isTrue();
 		assertThat(accessor.isReadableProperty("myTestBeans[0]")).isTrue();
 		assertThat(accessor.isReadableProperty("myTestBeans[1]")).isFalse();
 		assertThat(accessor.isReadableProperty("array[key1]")).isFalse();
@@ -187,14 +177,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.isWritableProperty("map[key4][0].name")).isTrue();
 		assertThat(accessor.isWritableProperty("map[key4][1]")).isTrue();
 		assertThat(accessor.isWritableProperty("map[key4][1].name")).isTrue();
-		assertThat(accessor.isWritableProperty("map[key999]")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key1]")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key1].name")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key2][0]")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key2][0].name")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key2][1]")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key2][1].name")).isTrue();
-		assertThat(accessor.isWritableProperty("iterableMap[key999]")).isTrue();
 		assertThat(accessor.isReadableProperty("myTestBeans[0]")).isTrue();
 		assertThat(accessor.isReadableProperty("myTestBeans[1]")).isFalse();
 		assertThat(accessor.isWritableProperty("array[key1]")).isFalse();
@@ -1412,9 +1394,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.getPropertyValue("map[key5[foo]].name")).isEqualTo("name8");
 		assertThat(accessor.getPropertyValue("map['key5[foo]'].name")).isEqualTo("name8");
 		assertThat(accessor.getPropertyValue("map[\"key5[foo]\"].name")).isEqualTo("name8");
-		assertThat(accessor.getPropertyValue("iterableMap[key1].name")).isEqualTo("nameC");
-		assertThat(accessor.getPropertyValue("iterableMap[key2][0].name")).isEqualTo("nameA");
-		assertThat(accessor.getPropertyValue("iterableMap[key2][1].name")).isEqualTo("nameB");
 		assertThat(accessor.getPropertyValue("myTestBeans[0].name")).isEqualTo("nameZ");

 		MutablePropertyValues pvs = new MutablePropertyValues();
@@ -1429,9 +1408,6 @@ abstract class AbstractPropertyAccessorTests {
 		pvs.add("map[key4][0].name", "nameA");
 		pvs.add("map[key4][1].name", "nameB");
 		pvs.add("map[key5[foo]].name", "name10");
-		pvs.add("iterableMap[key1].name", "newName1");
-		pvs.add("iterableMap[key2][0].name", "newName2A");
-		pvs.add("iterableMap[key2][1].name", "newName2B");
 		pvs.add("myTestBeans[0].name", "nameZZ");
 		accessor.setPropertyValues(pvs);
 		assertThat(tb0.getName()).isEqualTo("name5");
@@ -1451,9 +1427,6 @@ abstract class AbstractPropertyAccessorTests {
 		assertThat(accessor.getPropertyValue("map[key4][0].name")).isEqualTo("nameA");
 		assertThat(accessor.getPropertyValue("map[key4][1].name")).isEqualTo("nameB");
 		assertThat(accessor.getPropertyValue("map[key5[foo]].name")).isEqualTo("name10");
-		assertThat(accessor.getPropertyValue("iterableMap[key1].name")).isEqualTo("newName1");
-		assertThat(accessor.getPropertyValue("iterableMap[key2][0].name")).isEqualTo("newName2A");
-		assertThat(accessor.getPropertyValue("iterableMap[key2][1].name")).isEqualTo("newName2B");
 		assertThat(accessor.getPropertyValue("myTestBeans[0].name")).isEqualTo("nameZZ");
 	}

@@ -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
@@ -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;
-
 }
@@ -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.
@@ -21,7 +21,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -50,8 +49,6 @@ public class IndexedTestBean {

 	private SortedMap sortedMap;

-	private IterableMap iterableMap;
-
 	private MyTestBeans myTestBeans;


@@ -76,9 +73,6 @@ public class IndexedTestBean {
 		TestBean tb6 = new TestBean("name6", 0);
 		TestBean tb7 = new TestBean("name7", 0);
 		TestBean tb8 = new TestBean("name8", 0);
-		TestBean tbA = new TestBean("nameA", 0);
-		TestBean tbB = new TestBean("nameB", 0);
-		TestBean tbC = new TestBean("nameC", 0);
 		TestBean tbX = new TestBean("nameX", 0);
 		TestBean tbY = new TestBean("nameY", 0);
 		TestBean tbZ = new TestBean("nameZ", 0);
@@ -94,12 +88,6 @@ public class IndexedTestBean {
 		this.map.put("key2", tb5);
 		this.map.put("key.3", tb5);
 		List list = new ArrayList();
-		list.add(tbA);
-		list.add(tbB);
-		this.iterableMap = new IterableMap<>();
-		this.iterableMap.put("key1", tbC);
-		this.iterableMap.put("key2", list);
-		list = new ArrayList();
 		list.add(tbX);
 		list.add(tbY);
 		this.map.put("key4", list);
@@ -164,14 +152,6 @@ public class IndexedTestBean {
 		this.sortedMap = sortedMap;
 	}

-	public IterableMap getIterableMap() {
-		return this.iterableMap;
-	}
-
-	public void setIterableMap(IterableMap iterableMap) {
-		this.iterableMap = iterableMap;
-	}
-
 	public MyTestBeans getMyTestBeans() {
 		return myTestBeans;
 	}
@@ -181,15 +161,6 @@ public class IndexedTestBean {
 	}


-	@SuppressWarnings("serial")
-	public static class IterableMap<K,V> extends LinkedHashMap<K,V> implements Iterable<V> {
-
-		@Override
-		public Iterator<V> iterator() {
-			return values().iterator();
-		}
-	}
-
 	public static class MyTestBeans implements Iterable<TestBean> {

 		private final Collection<TestBean> testBeans;
@@ -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.
@@ -17,7 +17,6 @@
 package org.springframework.context.annotation;

 import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -34,7 +33,6 @@ import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
-import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotation.Adapt;
@@ -43,7 +41,6 @@ import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -150,26 +147,16 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 				Set<String> metaAnnotationTypes = this.metaAnnotationTypesCache.computeIfAbsent(annotationType,
 						key -> getMetaAnnotationTypes(mergedAnnotation));
 				if (isStereotypeWithNameValue(annotationType, metaAnnotationTypes, attributes)) {
-					Object value = attributes.get(MergedAnnotation.VALUE);
+					Object value = attributes.get("value");
 					if (value instanceof String currentName && !currentName.isBlank()) {
 						if (conventionBasedStereotypeCheckCache.add(annotationType) &&
 								metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME) && logger.isWarnEnabled()) {
-							if (hasExplicitlyAliasedValueAttribute(mergedAnnotation.getType())) {
-								logger.warn("""
-										Although the 'value' attribute in @%s declares @AliasFor for an attribute \
-										other than @Component's 'value' attribute, the value is still used as the \
-										@Component name based on convention. As of Spring Framework 7.0, such a \
-										'value' attribute will no longer be used as the @Component name."""
-											.formatted(annotationType));
-							}
-							else {
-								logger.warn("""
-										Support for convention-based @Component names is deprecated and will \
-										be removed in a future version of the framework. Please annotate the \
-										'value' attribute in @%s with @AliasFor(annotation=Component.class) \
-										to declare an explicit alias for @Component's 'value' attribute."""
-											.formatted(annotationType));
-							}
+							logger.warn("""
+									Support for convention-based stereotype names is deprecated and will \
+									be removed in a future version of the framework. Please annotate the \
+									'value' attribute in @%s with @AliasFor(annotation=Component.class) \
+									to declare an explicit alias for @Component's 'value' attribute."""
+										.formatted(annotationType));
 						}
 						if (beanName != null && !currentName.equals(beanName)) {
 							throw new IllegalStateException("Stereotype annotations suggest inconsistent " +
@@ -237,7 +224,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 				annotationType.equals("jakarta.inject.Named") ||
 				annotationType.equals("javax.inject.Named");

-		return (isStereotype && attributes.containsKey(MergedAnnotation.VALUE));
+		return (isStereotype && attributes.containsKey("value"));
 	}

 	/**
@@ -268,14 +255,4 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 		return StringUtils.uncapitalizeAsProperty(shortClassName);
 	}

-	/**
-	 * Determine if the supplied annotation type declares a {@code value()} attribute
-	 * with an explicit alias configured via {@link AliasFor @AliasFor}.
-	 * @since 6.2.3
-	 */
-	private static boolean hasExplicitlyAliasedValueAttribute(Class<? extends Annotation> annotationType) {
-		Method valueAttribute = ReflectionUtils.findMethod(annotationType, MergedAnnotation.VALUE);
-		return (valueAttribute != null && valueAttribute.isAnnotationPresent(AliasFor.class));
-	}
-
 }
@@ -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.
@@ -565,10 +565,9 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 	}

 	/**
-	 * Determine whether the given bean definition qualifies as a candidate component.
-	 * <p>The default implementation checks whether the class is not dependent on an
-	 * enclosing class as well as whether the class is either concrete (and therefore
-	 * not an interface) or has {@link Lookup @Lookup} methods.
+	 * Determine whether the given bean definition qualifies as candidate.
+	 * <p>The default implementation checks whether the class is not an interface
+	 * and not dependent on an enclosing class.
 	 * <p>Can be overridden in subclasses.
 	 * @param beanDefinition the bean definition to check
 	 * @return whether the bean definition qualifies as a candidate component
@@ -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.
@@ -191,15 +191,6 @@ final class ConfigurationClass {
 		return this.beanMethods;
 	}

-	boolean hasNonStaticBeanMethods() {
-		for (BeanMethod beanMethod : this.beanMethods) {
-			if (!beanMethod.getMetadata().isStatic()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	void addImportedResource(String importedResource, Class<? extends BeanDefinitionReader> readerClass) {
 		this.importedResources.put(importedResource, readerClass);
 	}
@@ -221,7 +212,7 @@ final class ConfigurationClass {

 		// A configuration class may not be final (CGLIB limitation) unless it declares proxyBeanMethods=false
 		if (attributes != null && (Boolean) attributes.get("proxyBeanMethods")) {
-			if (hasNonStaticBeanMethods() && this.metadata.isFinal()) {
+			if (this.metadata.isFinal()) {
 				problemReporter.error(new FinalConfigurationProblem());
 			}
 			for (BeanMethod beanMethod : this.beanMethods) {
@@ -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.
@@ -26,7 +26,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

 import org.springframework.aop.scope.ScopedProxyFactoryBean;
-import org.springframework.aot.AotDetector;
 import org.springframework.asm.Opcodes;
 import org.springframework.asm.Type;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
@@ -110,21 +109,8 @@ class ConfigurationClassEnhancer {
 			}
 			return configClass;
 		}
-
 		try {
-			// Use original ClassLoader if config class not locally loaded in overriding class loader
-			boolean classLoaderMismatch = (classLoader != null && classLoader != configClass.getClassLoader());
-			if (classLoaderMismatch && classLoader instanceof SmartClassLoader smartClassLoader) {
-				classLoader = smartClassLoader.getOriginalClassLoader();
-				classLoaderMismatch = (classLoader != configClass.getClassLoader());
-			}
-			// Use original ClassLoader if config class relies on package visibility
-			if (classLoaderMismatch && reliesOnPackageVisibility(configClass)) {
-				classLoader = configClass.getClassLoader();
-				classLoaderMismatch = false;
-			}
-			Enhancer enhancer = newEnhancer(configClass, classLoader);
-			Class<?> enhancedClass = createClass(enhancer, classLoaderMismatch);
+			Class<?> enhancedClass = createClass(newEnhancer(configClass, classLoader));
 			if (logger.isTraceEnabled()) {
 				logger.trace(String.format("Successfully enhanced %s; enhanced class name is: %s",
 						configClass.getName(), enhancedClass.getName()));
@@ -138,68 +124,36 @@ class ConfigurationClassEnhancer {
 		}
 	}

-	/**
-	 * Checks whether the given config class relies on package visibility,
-	 * either for the class itself or for any of its {@code @Bean} methods.
-	 */
-	private boolean reliesOnPackageVisibility(Class<?> configSuperClass) {
-		int mod = configSuperClass.getModifiers();
-		if (!Modifier.isPublic(mod) && !Modifier.isProtected(mod)) {
-			return true;
-		}
-		for (Method method : ReflectionUtils.getDeclaredMethods(configSuperClass)) {
-			if (BeanAnnotationHelper.isBeanAnnotated(method)) {
-				mod = method.getModifiers();
-				if (!Modifier.isPublic(mod) && !Modifier.isProtected(mod)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Creates a new CGLIB {@link Enhancer} instance.
 	 */
 	private Enhancer newEnhancer(Class<?> configSuperClass, @Nullable ClassLoader classLoader) {
 		Enhancer enhancer = new Enhancer();
-		if (classLoader != null) {
-			enhancer.setClassLoader(classLoader);
-			if (classLoader instanceof SmartClassLoader smartClassLoader &&
-					smartClassLoader.isClassReloadable(configSuperClass)) {
-				enhancer.setUseCache(false);
-			}
-		}
 		enhancer.setSuperclass(configSuperClass);
 		enhancer.setInterfaces(new Class<?>[] {EnhancedConfiguration.class});
 		enhancer.setUseFactory(false);
 		enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
-		enhancer.setAttemptLoad(enhancer.getUseCache() && AotDetector.useGeneratedArtifacts());
+		enhancer.setAttemptLoad(!isClassReloadable(configSuperClass, classLoader));
 		enhancer.setStrategy(new BeanFactoryAwareGeneratorStrategy(classLoader));
 		enhancer.setCallbackFilter(CALLBACK_FILTER);
 		enhancer.setCallbackTypes(CALLBACK_FILTER.getCallbackTypes());
 		return enhancer;
 	}

+	/**
+	 * Checks whether the given configuration class is reloadable.
+	 */
+	private boolean isClassReloadable(Class<?> configSuperClass, @Nullable ClassLoader classLoader) {
+		return (classLoader instanceof SmartClassLoader smartClassLoader &&
+				smartClassLoader.isClassReloadable(configSuperClass));
+	}
+
 	/**
 	 * Uses enhancer to generate a subclass of superclass,
 	 * ensuring that callbacks are registered for the new subclass.
 	 */
-	private Class<?> createClass(Enhancer enhancer, boolean fallback) {
-		Class<?> subclass;
-		try {
-			subclass = enhancer.createClass();
-		}
-		catch (Throwable ex) {
-			if (!fallback) {
-				throw (ex instanceof CodeGenerationException cgex ? cgex : new CodeGenerationException(ex));
-			}
-			// Possibly a package-visible @Bean method declaration not accessible
-			// in the given ClassLoader -> retry with original ClassLoader
-			enhancer.setClassLoader(null);
-			subclass = enhancer.createClass();
-		}
-
+	private Class<?> createClass(Enhancer enhancer) {
+		Class<?> subclass = enhancer.createClass();
 		// Registering callbacks statically (as opposed to thread-local)
 		// is critical for usage in an OSGi environment (SPR-5932)...
 		Enhancer.registerStaticCallbacks(subclass, CALLBACKS);
@@ -210,7 +164,8 @@ class ConfigurationClassEnhancer {
 	/**
 	 * Marker interface to be implemented by all @Configuration CGLIB subclasses.
 	 * Facilitates idempotent behavior for {@link ConfigurationClassEnhancer#enhance}
-	 * through checking to see if candidate classes are already assignable to it.
+	 * through checking to see if candidate classes are already assignable to it, e.g.
+	 * have already been enhanced.
 	 * <p>Also extends {@link BeanFactoryAware}, as all enhanced {@code @Configuration}
 	 * classes require access to the {@link BeanFactory} that created them.
 	 * <p>Note that this interface is intended for framework-internal use only, however
@@ -571,7 +526,7 @@ class ConfigurationClassEnhancer {
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(factoryBean.getClass());
 			enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
-			enhancer.setAttemptLoad(AotDetector.useGeneratedArtifacts());
+			enhancer.setAttemptLoad(true);
 			enhancer.setCallbackType(MethodInterceptor.class);

 			// Ideally create enhanced FactoryBean proxy without constructor side effects,
@@ -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.
@@ -81,9 +81,10 @@ import org.springframework.util.MultiValueMap;
 * any number of ConfigurationClass objects because one Configuration class may import
 * another using the {@link Import} annotation).
 *
- * <p>This class helps separate the concern of parsing the structure of a Configuration class
- * from the concern of registering BeanDefinition objects based on the content of that model
- * (except {@code @ComponentScan} annotations which need to be registered immediately).
+ * <p>This class helps separate the concern of parsing the structure of a Configuration
+ * class from the concern of registering BeanDefinition objects based on the content of
+ * that model (with the exception of {@code @ComponentScan} annotations which need to be
+ * registered immediately).
 *
 * <p>This ASM-based implementation avoids reflection and eager class loading in order to
 * interoperate effectively with lazy class loading in a Spring ApplicationContext.
@@ -160,23 +161,14 @@ class ConfigurationClassParser {
 		for (BeanDefinitionHolder holder : configCandidates) {
 			BeanDefinition bd = holder.getBeanDefinition();
 			try {
-				ConfigurationClass configClass;
 				if (bd instanceof AnnotatedBeanDefinition annotatedBeanDef) {
-					configClass = parse(annotatedBeanDef.getMetadata(), holder.getBeanName());
+					parse(annotatedBeanDef.getMetadata(), holder.getBeanName());
 				}
 				else if (bd instanceof AbstractBeanDefinition abstractBeanDef && abstractBeanDef.hasBeanClass()) {
-					configClass = parse(abstractBeanDef.getBeanClass(), holder.getBeanName());
+					parse(abstractBeanDef.getBeanClass(), holder.getBeanName());
 				}
 				else {
-					configClass = parse(bd.getBeanClassName(), holder.getBeanName());
-				}
-
-				// Downgrade to lite (no enhancement) in case of no instance-level @Bean methods.
-				if (!configClass.getMetadata().isAbstract() && !configClass.hasNonStaticBeanMethods() &&
-						ConfigurationClassUtils.CONFIGURATION_CLASS_FULL.equals(
-								bd.getAttribute(ConfigurationClassUtils.CONFIGURATION_CLASS_ATTRIBUTE))) {
-					bd.setAttribute(ConfigurationClassUtils.CONFIGURATION_CLASS_ATTRIBUTE,
-							ConfigurationClassUtils.CONFIGURATION_CLASS_LITE);
+					parse(bd.getBeanClassName(), holder.getBeanName());
 				}
 			}
 			catch (BeanDefinitionStoreException ex) {
@@ -191,37 +183,31 @@ class ConfigurationClassParser {
 		this.deferredImportSelectorHandler.process();
 	}

-	final ConfigurationClass parse(AnnotationMetadata metadata, String beanName) {
-		ConfigurationClass configClass = new ConfigurationClass(metadata, beanName);
-		processConfigurationClass(configClass, DEFAULT_EXCLUSION_FILTER);
-		return configClass;
-	}
-
-	final ConfigurationClass parse(Class<?> clazz, String beanName) {
-		ConfigurationClass configClass = new ConfigurationClass(clazz, beanName);
-		processConfigurationClass(configClass, DEFAULT_EXCLUSION_FILTER);
-		return configClass;
-	}
-
-	final ConfigurationClass parse(@Nullable String className, String beanName) throws IOException {
+	protected final void parse(@Nullable String className, String beanName) throws IOException {
 		Assert.notNull(className, "No bean class name for configuration class bean definition");
 		MetadataReader reader = this.metadataReaderFactory.getMetadataReader(className);
-		ConfigurationClass configClass = new ConfigurationClass(reader, beanName);
-		processConfigurationClass(configClass, DEFAULT_EXCLUSION_FILTER);
-		return configClass;
+		processConfigurationClass(new ConfigurationClass(reader, beanName), DEFAULT_EXCLUSION_FILTER);
+	}
+
+	protected final void parse(Class<?> clazz, String beanName) throws IOException {
+		processConfigurationClass(new ConfigurationClass(clazz, beanName), DEFAULT_EXCLUSION_FILTER);
+	}
+
+	protected final void parse(AnnotationMetadata metadata, String beanName) throws IOException {
+		processConfigurationClass(new ConfigurationClass(metadata, beanName), DEFAULT_EXCLUSION_FILTER);
 	}

 	/**
 	 * Validate each {@link ConfigurationClass} object.
 	 * @see ConfigurationClass#validate
 	 */
-	void validate() {
+	public void validate() {
 		for (ConfigurationClass configClass : this.configurationClasses.keySet()) {
 			configClass.validate(this.problemReporter);
 		}
 	}

-	Set<ConfigurationClass> getConfigurationClasses() {
+	public Set<ConfigurationClass> getConfigurationClasses() {
 		return this.configurationClasses.keySet();
 	}

@@ -230,7 +216,7 @@ class ConfigurationClassParser {
 				Collections.emptyList());
 	}

-	protected void processConfigurationClass(ConfigurationClass configClass, Predicate<String> filter) {
+	protected void processConfigurationClass(ConfigurationClass configClass, Predicate<String> filter) throws IOException {
 		if (this.conditionEvaluator.shouldSkip(configClass.getMetadata(), ConfigurationPhase.PARSE_CONFIGURATION)) {
 			return;
 		}
@@ -462,7 +448,7 @@ class ConfigurationClassParser {


 	/**
-	 * Returns {@code @Import} classes, considering all meta-annotations.
+	 * Returns {@code @Import} class, considering all meta-annotations.
 	 */
 	private Set<SourceClass> getImports(SourceClass sourceClass) throws IOException {
 		Set<SourceClass> imports = new LinkedHashSet<>();
@@ -650,7 +636,7 @@ class ConfigurationClassParser {

 		private final MultiValueMap<String, AnnotationMetadata> imports = new LinkedMultiValueMap<>();

-		void registerImport(AnnotationMetadata importingClass, String importedClass) {
+		public void registerImport(AnnotationMetadata importingClass, String importedClass) {
 			this.imports.add(importedClass, importingClass);
 		}

@@ -705,7 +691,7 @@ class ConfigurationClassParser {
 		 * @param configClass the source configuration class
 		 * @param importSelector the selector to handle
 		 */
-		void handle(ConfigurationClass configClass, DeferredImportSelector importSelector) {
+		public void handle(ConfigurationClass configClass, DeferredImportSelector importSelector) {
 			DeferredImportSelectorHolder holder = new DeferredImportSelectorHolder(configClass, importSelector);
 			if (this.deferredImportSelectors == null) {
 				DeferredImportSelectorGroupingHandler handler = new DeferredImportSelectorGroupingHandler();
@@ -717,7 +703,7 @@ class ConfigurationClassParser {
 			}
 		}

-		void process() {
+		public void process() {
 			List<DeferredImportSelectorHolder> deferredImports = this.deferredImportSelectors;
 			this.deferredImportSelectors = null;
 			try {
@@ -741,7 +727,7 @@ class ConfigurationClassParser {

 		private final Map<AnnotationMetadata, ConfigurationClass> configurationClasses = new HashMap<>();

-		void register(DeferredImportSelectorHolder deferredImport) {
+		public void register(DeferredImportSelectorHolder deferredImport) {
 			Class<? extends Group> group = deferredImport.getImportSelector().getImportGroup();
 			DeferredImportSelectorGrouping grouping = this.groupings.computeIfAbsent(
 					(group != null ? group : deferredImport),
@@ -751,7 +737,7 @@ class ConfigurationClassParser {
 					deferredImport.getConfigurationClass());
 		}

-		void processGroupImports() {
+		public void processGroupImports() {
 			for (DeferredImportSelectorGrouping grouping : this.groupings.values()) {
 				Predicate<String> exclusionFilter = grouping.getCandidateFilter();
 				grouping.getImports().forEach(entry -> {
@@ -789,16 +775,16 @@ class ConfigurationClassParser {

 		private final DeferredImportSelector importSelector;

-		DeferredImportSelectorHolder(ConfigurationClass configClass, DeferredImportSelector selector) {
+		public DeferredImportSelectorHolder(ConfigurationClass configClass, DeferredImportSelector selector) {
 			this.configurationClass = configClass;
 			this.importSelector = selector;
 		}

-		ConfigurationClass getConfigurationClass() {
+		public ConfigurationClass getConfigurationClass() {
 			return this.configurationClass;
 		}

-		DeferredImportSelector getImportSelector() {
+		public DeferredImportSelector getImportSelector() {
 			return this.importSelector;
 		}
 	}
@@ -814,7 +800,7 @@ class ConfigurationClassParser {
 			this.group = group;
 		}

-		void add(DeferredImportSelectorHolder deferredImport) {
+		public void add(DeferredImportSelectorHolder deferredImport) {
 			this.deferredImports.add(deferredImport);
 		}

@@ -822,7 +808,7 @@ class ConfigurationClassParser {
 		 * Return the imports defined by the group.
 		 * @return each import with its associated configuration class
 		 */
-		Iterable<Group.Entry> getImports() {
+		public Iterable<Group.Entry> getImports() {
 			for (DeferredImportSelectorHolder deferredImport : this.deferredImports) {
 				this.group.process(deferredImport.getConfigurationClass().getMetadata(),
 						deferredImport.getImportSelector());
@@ -830,7 +816,7 @@ class ConfigurationClassParser {
 			return this.group.selectImports();
 		}

-		Predicate<String> getCandidateFilter() {
+		public Predicate<String> getCandidateFilter() {
 			Predicate<String> mergedFilter = DEFAULT_EXCLUSION_FILTER;
 			for (DeferredImportSelectorHolder deferredImport : this.deferredImports) {
 				Predicate<String> selectorFilter = deferredImport.getImportSelector().getExclusionFilter();
@@ -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.
@@ -61,8 +61,7 @@ import org.springframework.util.ClassUtils;
 * interactions on a {@link org.springframework.context.ConfigurableApplicationContext}.
 *
 * <p>As of 6.1, this also includes support for JVM checkpoint/restore (Project CRaC)
- * when the {@code org.crac:crac} dependency is on the classpath. All running beans
- * will get stopped and restarted according to the CRaC checkpoint/restore callbacks.
+ * when the {@code org.crac:crac} dependency on the classpath.
 *
 * @author Mark Fisher
 * @author Juergen Hoeller
@@ -380,7 +379,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 	}


-	// Overridable hooks
+	// overridable hooks

 	/**
 	 * Retrieve all applicable Lifecycle beans: all singletons that have already been created,
@@ -494,13 +493,11 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 				}
 			}
 			try {
-				if (!latch.await(this.timeout, TimeUnit.MILLISECONDS)) {
-					// Count is still >0 after timeout
-					if (!countDownBeanNames.isEmpty() && logger.isInfoEnabled()) {
-						logger.info("Shutdown phase " + this.phase + " ends with " + countDownBeanNames.size() +
-								" bean" + (countDownBeanNames.size() > 1 ? "s" : "") +
-								" still running after timeout of " + this.timeout + "ms: " + countDownBeanNames);
-					}
+				latch.await(this.timeout, TimeUnit.MILLISECONDS);
+				if (latch.getCount() > 0 && !countDownBeanNames.isEmpty() && logger.isInfoEnabled()) {
+					logger.info("Shutdown phase " + this.phase + " ends with " + countDownBeanNames.size() +
+							" bean" + (countDownBeanNames.size() > 1 ? "s" : "") +
+							" still running after timeout of " + this.timeout + "ms: " + countDownBeanNames);
 				}
 			}
 			catch (InterruptedException ex) {
@@ -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.scheduling.config;

 import org.w3c.dom.Element;

-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
@@ -54,7 +53,6 @@ public class ExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionPa
 		if (StringUtils.hasText(poolSize)) {
 			builder.addPropertyValue("poolSize", poolSize);
 		}
-		builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 	}

 	private void configureRejectionPolicy(Element element, BeanDefinitionBuilder builder) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-2012 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.scheduling.config;

 import org.w3c.dom.Element;

-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.util.StringUtils;
@@ -42,7 +41,6 @@ public class SchedulerBeanDefinitionParser extends AbstractSingleBeanDefinitionP
 		if (StringUtils.hasText(poolSize)) {
 			builder.addPropertyValue("poolSize", poolSize);
 		}
-		builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 	}

 }
@@ -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.
@@ -317,16 +317,8 @@ final class QuartzCronField extends CronField {
 	private static TemporalAdjuster dayOfWeekInMonth(int ordinal, DayOfWeek dayOfWeek) {
 		TemporalAdjuster adjuster = TemporalAdjusters.dayOfWeekInMonth(ordinal, dayOfWeek);
 		return temporal -> {
-			// TemporalAdjusters can overflow to a different month
-			// in this case, attempt the same adjustment with the next/previous month
-			for (int i = 0; i < 12; i++) {
-				Temporal result = adjuster.adjustInto(temporal);
-				if (result.get(ChronoField.MONTH_OF_YEAR) == temporal.get(ChronoField.MONTH_OF_YEAR)) {
-					return rollbackToMidnight(temporal, result);
-				}
-				temporal = result;
-			}
-			return null;
+			Temporal result = adjuster.adjustInto(temporal);
+			return rollbackToMidnight(temporal, result);
 		};
 	}

@@ -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.
@@ -168,25 +168,6 @@ class AnnotationBeanNameGeneratorTests {
 		assertGeneratedName(RestControllerAdviceClass.class, "myRestControllerAdvice");
 	}

-	@Test  // gh-34317
-	void generateBeanNameFromStereotypeAnnotationWithStringValueAsExplicitAliasForMetaAnnotationOtherThanComponent() {
-		// As of Spring Framework 6.2, "enigma" is incorrectly used as the @Component name.
-		// As of Spring Framework 7.0, the generated name will be "annotationBeanNameGeneratorTests.StereotypeWithoutExplicitName".
-		assertGeneratedName(StereotypeWithoutExplicitName.class, "enigma");
-	}
-
-	@Test  // gh-34317
-	void generateBeanNameFromStereotypeAnnotationWithStringValueAndExplicitAliasForComponentNameWithBlankName() {
-		// As of Spring Framework 6.2, "enigma" is incorrectly used as the @Component name.
-		// As of Spring Framework 7.0, the generated name will be "annotationBeanNameGeneratorTests.StereotypeWithGeneratedName".
-		assertGeneratedName(StereotypeWithGeneratedName.class, "enigma");
-	}
-
-	@Test  // gh-34317
-	void generateBeanNameFromStereotypeAnnotationWithStringValueAndExplicitAliasForComponentName() {
-		assertGeneratedName(StereotypeWithExplicitName.class, "explicitName");
-	}
-

 	private void assertGeneratedName(Class<?> clazz, String expectedName) {
 		BeanDefinition bd = annotatedBeanDef(clazz);
@@ -229,7 +210,7 @@ class AnnotationBeanNameGeneratorTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Component
 	@interface ConventionBasedComponent1 {
-		// This is intentionally convention-based. Please do not add @AliasFor.
+		// This intentionally convention-based. Please do not add @AliasFor.
 		// See gh-31093.
 		String value() default "";
 	}
@@ -237,7 +218,7 @@ class AnnotationBeanNameGeneratorTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Component
 	@interface ConventionBasedComponent2 {
-		// This is intentionally convention-based. Please do not add @AliasFor.
+		// This intentionally convention-based. Please do not add @AliasFor.
 		// See gh-31093.
 		String value() default "";
 	}
@@ -279,7 +260,7 @@ class AnnotationBeanNameGeneratorTests {
 	@Target(ElementType.TYPE)
 	@Controller
 	@interface TestRestController {
-		// This is intentionally convention-based. Please do not add @AliasFor.
+		// This intentionally convention-based. Please do not add @AliasFor.
 		// See gh-31093.
 		String value() default "";
 	}
@@ -338,6 +319,7 @@ class AnnotationBeanNameGeneratorTests {
 		String[] basePackages() default {};
 	}

+
 	@TestControllerAdvice(basePackages = "com.example", name = "myControllerAdvice")
 	static class ControllerAdviceClass {
 	}
@@ -346,56 +328,4 @@ class AnnotationBeanNameGeneratorTests {
 	static class RestControllerAdviceClass {
 	}

-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.ANNOTATION_TYPE)
-	@interface MetaAnnotationWithStringAttribute {
-
-		String attribute() default "";
-	}
-
-	/**
-	 * Custom stereotype annotation which has a {@code String value} attribute that
-	 * is explicitly declared as an alias for an attribute in a meta-annotation
-	 * other than {@link Component @Component}.
-	 */
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Component
-	@MetaAnnotationWithStringAttribute
-	@interface MyStereotype {
-
-		@AliasFor(annotation = MetaAnnotationWithStringAttribute.class, attribute = "attribute")
-		String value() default "";
-	}
-
-	@MyStereotype("enigma")
-	static class StereotypeWithoutExplicitName {
-	}
-
-	/**
-	 * Custom stereotype annotation which is identical to {@link MyStereotype @MyStereotype}
-	 * except that it has a {@link #name} attribute that is an explicit alias for
-	 * {@link Component#value}.
-	 */
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	@Component
-	@MetaAnnotationWithStringAttribute
-	@interface MyNamedStereotype {
-
-		@AliasFor(annotation = MetaAnnotationWithStringAttribute.class, attribute = "attribute")
-		String value() default "";
-
-		@AliasFor(annotation = Component.class, attribute = "value")
-		String name() default "";
-	}
-
-	@MyNamedStereotype(value = "enigma", name ="explicitName")
-	static class StereotypeWithExplicitName {
-	}
-
-	@MyNamedStereotype(value = "enigma")
-	static class StereotypeWithGeneratedName {
-	}
-
 }
@@ -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.
@@ -18,16 +18,11 @@ package org.springframework.context.annotation;

 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.ProtectionDomain;
 import java.security.SecureClassLoader;

 import org.junit.jupiter.api.Test;

-import org.springframework.core.OverridingClassLoader;
 import org.springframework.core.SmartClassLoader;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StreamUtils;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,108 +36,19 @@ class ConfigurationClassEnhancerTests {
 	@Test
 	void enhanceReloadedClass() throws Exception {
 		ConfigurationClassEnhancer configurationClassEnhancer = new ConfigurationClassEnhancer();
-
 		ClassLoader parentClassLoader = getClass().getClassLoader();
-		ClassLoader classLoader = new CustomSmartClassLoader(parentClassLoader);
+		CustomClassLoader classLoader = new CustomClassLoader(parentClassLoader);
 		Class<?> myClass = parentClassLoader.loadClass(MyConfig.class.getName());
-		Class<?> enhancedClass = configurationClassEnhancer.enhance(myClass, parentClassLoader);
-		assertThat(myClass).isAssignableFrom(enhancedClass);
-
-		myClass = classLoader.loadClass(MyConfig.class.getName());
-		enhancedClass = configurationClassEnhancer.enhance(myClass, classLoader);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader);
-		assertThat(myClass).isAssignableFrom(enhancedClass);
-	}
-
-	@Test
-	void withPublicClass() {
-		ConfigurationClassEnhancer configurationClassEnhancer = new ConfigurationClassEnhancer();
-
-		ClassLoader classLoader = new URLClassLoader(new URL[0], getClass().getClassLoader());
-		Class<?> enhancedClass = configurationClassEnhancer.enhance(MyConfigWithPublicClass.class, classLoader);
-		assertThat(MyConfigWithPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader);
-
-		classLoader = new OverridingClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithPublicClass.class, classLoader);
-		assertThat(MyConfigWithPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new CustomSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithPublicClass.class, classLoader);
-		assertThat(MyConfigWithPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new BasicSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithPublicClass.class, classLoader);
-		assertThat(MyConfigWithPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader);
-	}
-
-	@Test
-	void withNonPublicClass() {
-		ConfigurationClassEnhancer configurationClassEnhancer = new ConfigurationClassEnhancer();
-
-		ClassLoader classLoader = new URLClassLoader(new URL[0], getClass().getClassLoader());
-		Class<?> enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicClass.class, classLoader);
-		assertThat(MyConfigWithNonPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new OverridingClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicClass.class, classLoader);
-		assertThat(MyConfigWithNonPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new CustomSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicClass.class, classLoader);
-		assertThat(MyConfigWithNonPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new BasicSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicClass.class, classLoader);
-		assertThat(MyConfigWithNonPublicClass.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-	}
-
-	@Test
-	void withNonPublicMethod() {
-		ConfigurationClassEnhancer configurationClassEnhancer = new ConfigurationClassEnhancer();
-
-		ClassLoader classLoader = new URLClassLoader(new URL[0], getClass().getClassLoader());
-		Class<?> enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicMethod.class, classLoader);
-		assertThat(MyConfigWithNonPublicMethod.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new OverridingClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicMethod.class, classLoader);
-		assertThat(MyConfigWithNonPublicMethod.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new CustomSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicMethod.class, classLoader);
-		assertThat(MyConfigWithNonPublicMethod.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
-
-		classLoader = new BasicSmartClassLoader(getClass().getClassLoader());
-		enhancedClass = configurationClassEnhancer.enhance(MyConfigWithNonPublicMethod.class, classLoader);
-		assertThat(MyConfigWithNonPublicMethod.class).isAssignableFrom(enhancedClass);
-		assertThat(enhancedClass.getClassLoader()).isEqualTo(classLoader.getParent());
+		configurationClassEnhancer.enhance(myClass, parentClassLoader);
+		Class<?> myReloadedClass = classLoader.loadClass(MyConfig.class.getName());
+		Class<?> enhancedReloadedClass = configurationClassEnhancer.enhance(myReloadedClass, classLoader);
+		assertThat(enhancedReloadedClass.getClassLoader()).isEqualTo(classLoader);
 	}


 	@Configuration
 	static class MyConfig {

-		@Bean
-		String myBean() {
-			return "bean";
-		}
-	}
-
-
-	@Configuration
-	public static class MyConfigWithPublicClass {
-
 		@Bean
 		public String myBean() {
 			return "bean";
@@ -150,29 +56,9 @@ class ConfigurationClassEnhancerTests {
 	}


-	@Configuration
-	static class MyConfigWithNonPublicClass {
+	static class CustomClassLoader extends SecureClassLoader implements SmartClassLoader {

-		@Bean
-		public String myBean() {
-			return "bean";
-		}
-	}
-
-
-	@Configuration
-	public static class MyConfigWithNonPublicMethod {
-
-		@Bean
-		String myBean() {
-			return "bean";
-		}
-	}
-
-
-	static class CustomSmartClassLoader extends SecureClassLoader implements SmartClassLoader {
-
-		CustomSmartClassLoader(ClassLoader parent) {
+		CustomClassLoader(ClassLoader parent) {
 			super(parent);
 		}

@@ -196,29 +82,6 @@ class ConfigurationClassEnhancerTests {
 		public boolean isClassReloadable(Class<?> clazz) {
 			return clazz.getName().contains("MyConfig");
 		}
-
-		@Override
-		public ClassLoader getOriginalClassLoader() {
-			return getParent();
-		}
-
-		@Override
-		public Class<?> publicDefineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
-			return defineClass(name, b, 0, b.length, protectionDomain);
-		}
-	}
-
-
-	static class BasicSmartClassLoader extends SecureClassLoader implements SmartClassLoader {
-
-		BasicSmartClassLoader(ClassLoader parent) {
-			super(parent);
-		}
-
-		@Override
-		public Class<?> publicDefineClass(String name, byte[] b, @Nullable ProtectionDomain protectionDomain) {
-			return defineClass(name, b, 0, b.length, protectionDomain);
-		}
 	}

 }
@@ -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.
@@ -67,7 +67,6 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -105,7 +104,6 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).contains(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		Foo foo = beanFactory.getBean("foo", Foo.class);
 		Bar bar = beanFactory.getBean("bar", Bar.class);
 		assertThat(bar.foo).isSameAs(foo);
@@ -120,7 +118,6 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).contains(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		Foo foo = beanFactory.getBean("foo", Foo.class);
 		Bar bar = beanFactory.getBean("bar", Bar.class);
 		assertThat(bar.foo).isSameAs(foo);
@@ -129,29 +126,12 @@ class ConfigurationClassPostProcessorTests {
 		assertThat(beanFactory.getDependentBeans("config")).contains("bar");
 	}

-	@Test  // gh-34663
-	void enhancementIsPresentForAbstractConfigClassWithoutBeanMethods() {
-		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(AbstractConfigWithoutBeanMethods.class));
-		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
-		pp.postProcessBeanFactory(beanFactory);
-		RootBeanDefinition beanDefinition = (RootBeanDefinition) beanFactory.getBeanDefinition("config");
-		assertThat(beanDefinition.hasBeanClass()).isTrue();
-		assertThat(beanDefinition.getBeanClass().getName()).contains(ClassUtils.CGLIB_CLASS_SEPARATOR);
-		Foo foo = beanFactory.getBean("foo", Foo.class);
-		Bar bar = beanFactory.getBean("bar", Bar.class);
-		assertThat(bar.foo).isSameAs(foo);
-		assertThat(beanFactory.getDependentBeans("foo")).contains("bar");
-		String[] dependentsOfSingletonBeanConfig = beanFactory.getDependentBeans(SingletonBeanConfig.class.getName());
-		assertThat(dependentsOfSingletonBeanConfig).containsOnly("foo", "bar");
-	}
-
 	@Test
 	void enhancementIsNotPresentForProxyBeanMethodsFlagSetToFalse() {
 		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(NonEnhancedSingletonBeanConfig.class));
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).doesNotContain(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		Foo foo = beanFactory.getBean("foo", Foo.class);
 		Bar bar = beanFactory.getBean("bar", Bar.class);
 		assertThat(bar.foo).isNotSameAs(foo);
@@ -163,7 +143,6 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).doesNotContain(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		Foo foo = beanFactory.getBean("foo", Foo.class);
 		Bar bar = beanFactory.getBean("bar", Bar.class);
 		assertThat(bar.foo).isNotSameAs(foo);
@@ -175,7 +154,6 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).doesNotContain(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("foo")).hasBeanClass()).isTrue();
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("bar")).hasBeanClass()).isTrue();
 		Foo foo = beanFactory.getBean("foo", Foo.class);
@@ -189,7 +167,6 @@ class ConfigurationClassPostProcessorTests {
 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
 		pp.postProcessBeanFactory(beanFactory);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).doesNotContain(ClassUtils.CGLIB_CLASS_SEPARATOR);
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("foo")).hasBeanClass()).isTrue();
 		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("bar")).hasBeanClass()).isTrue();
 		Foo foo = beanFactory.getBean("foo", Foo.class);
@@ -197,15 +174,6 @@ class ConfigurationClassPostProcessorTests {
 		assertThat(bar.foo).isNotSameAs(foo);
 	}

-	@Test  // gh-34486
-	void enhancementIsNotPresentWithEmptyConfig() {
-		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(EmptyConfig.class));
-		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
-		pp.postProcessBeanFactory(beanFactory);
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).hasBeanClass()).isTrue();
-		assertThat(((RootBeanDefinition) beanFactory.getBeanDefinition("config")).getBeanClass().getName()).doesNotContain(ClassUtils.CGLIB_CLASS_SEPARATOR);
-	}
-
 	@Test
 	void configurationIntrospectionOfInnerClassesWorksWithDotNameSyntax() {
 		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(getClass().getName() + ".SingletonBeanConfig"));
@@ -1190,7 +1158,7 @@ class ConfigurationClassPostProcessorTests {
 	}

 	@Configuration
-	static final class StaticSingletonBeanConfig {
+	static class StaticSingletonBeanConfig {

 		@Bean
 		public static Foo foo() {
@@ -1203,16 +1171,6 @@ class ConfigurationClassPostProcessorTests {
 		}
 	}

-	@Configuration
-	@Import(SingletonBeanConfig.class)
-	abstract static class AbstractConfigWithoutBeanMethods {
-		// This class intentionally does NOT declare @Bean methods.
-	}
-
-	@Configuration
-	static final class EmptyConfig {
-	}
-
 	@Configuration
 	@Order(2)
 	static class OverridingSingletonBeanConfig {
@@ -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.
@@ -37,18 +37,16 @@ class InvalidConfigurationClassDefinitionTests {
 	@Test
 	void configurationClassesMayNotBeFinal() {
 		@Configuration
-		final class Config {
-			@Bean String dummy() { return "dummy"; }
-		}
+		final class Config { }

 		BeanDefinition configBeanDef = rootBeanDefinition(Config.class).getBeanDefinition();
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerBeanDefinition("config", configBeanDef);

 		ConfigurationClassPostProcessor pp = new ConfigurationClassPostProcessor();
-		assertThatExceptionOfType(BeanDefinitionParsingException.class)
-				.isThrownBy(() -> pp.postProcessBeanFactory(beanFactory))
-				.withMessageContaining("Remove the final modifier");
+		assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(() ->
+				pp.postProcessBeanFactory(beanFactory))
+			.withMessageContaining("Remove the final modifier");
 	}

 }
@@ -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.
@@ -54,11 +54,10 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void customLifecycleProcessorInstance() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		BeanDefinition beanDefinition = new RootBeanDefinition(DefaultLifecycleProcessor.class);
 		beanDefinition.getPropertyValues().addPropertyValue("timeoutPerShutdownPhase", 1000);
-		context.registerBeanDefinition(StaticApplicationContext.LIFECYCLE_PROCESSOR_BEAN_NAME, beanDefinition);
-
+		StaticApplicationContext context = new StaticApplicationContext();
+		context.registerBeanDefinition("lifecycleProcessor", beanDefinition);
 		context.refresh();
 		LifecycleProcessor bean = context.getBean("lifecycleProcessor", LifecycleProcessor.class);
 		Object contextLifecycleProcessor = new DirectFieldAccessor(context).getPropertyValue("lifecycleProcessor");
@@ -71,12 +70,11 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void singleSmartLifecycleAutoStartup() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		bean.setAutoStartup(true);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
-
 		assertThat(bean.isRunning()).isFalse();
 		context.refresh();
 		assertThat(bean.isRunning()).isTrue();
@@ -116,13 +114,12 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void singleSmartLifecycleAutoStartupWithFailingLifecycleBean() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		bean.setAutoStartup(true);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
 		context.registerSingleton("failingBean", FailingLifecycleBean.class);
-
 		assertThat(bean.isRunning()).isFalse();
 		assertThatExceptionOfType(ApplicationContextException.class)
 				.isThrownBy(context::refresh).withCauseInstanceOf(IllegalStateException.class);
@@ -133,12 +130,11 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void singleSmartLifecycleWithoutAutoStartup() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		bean.setAutoStartup(false);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
-
 		assertThat(bean.isRunning()).isFalse();
 		context.refresh();
 		assertThat(bean.isRunning()).isFalse();
@@ -152,16 +148,15 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void singleSmartLifecycleAutoStartupWithNonAutoStartupDependency() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		bean.setAutoStartup(true);
 		TestSmartLifecycleBean dependency = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		dependency.setAutoStartup(false);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
 		context.getBeanFactory().registerSingleton("dependency", dependency);
 		context.getBeanFactory().registerDependentBean("dependency", "bean");
-
 		assertThat(bean.isRunning()).isFalse();
 		assertThat(dependency.isRunning()).isFalse();
 		context.refresh();
@@ -176,19 +171,18 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void smartLifecycleGroupStartup() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forStartupTests(Integer.MIN_VALUE, startedBeans);
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forStartupTests(1, startedBeans);
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forStartupTests(2, startedBeans);
 		TestSmartLifecycleBean bean3 = TestSmartLifecycleBean.forStartupTests(3, startedBeans);
 		TestSmartLifecycleBean beanMax = TestSmartLifecycleBean.forStartupTests(Integer.MAX_VALUE, startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean3", bean3);
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
 		context.getBeanFactory().registerSingleton("beanMax", beanMax);
 		context.getBeanFactory().registerSingleton("bean1", bean1);
-
 		assertThat(beanMin.isRunning()).isFalse();
 		assertThat(bean1.isRunning()).isFalse();
 		assertThat(bean2.isRunning()).isFalse();
@@ -208,17 +202,16 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void contextRefreshThenStartWithMixedBeans() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestLifecycleBean simpleBean1 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestLifecycleBean simpleBean2 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestSmartLifecycleBean smartBean1 = TestSmartLifecycleBean.forStartupTests(5, startedBeans);
 		TestSmartLifecycleBean smartBean2 = TestSmartLifecycleBean.forStartupTests(-3, startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("simpleBean1", simpleBean1);
 		context.getBeanFactory().registerSingleton("smartBean1", smartBean1);
 		context.getBeanFactory().registerSingleton("simpleBean2", simpleBean2);
 		context.getBeanFactory().registerSingleton("smartBean2", smartBean2);
-
 		assertThat(simpleBean1.isRunning()).isFalse();
 		assertThat(simpleBean2.isRunning()).isFalse();
 		assertThat(smartBean1.isRunning()).isFalse();
@@ -240,17 +233,16 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void contextRefreshThenStopAndRestartWithMixedBeans() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestLifecycleBean simpleBean1 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestLifecycleBean simpleBean2 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestSmartLifecycleBean smartBean1 = TestSmartLifecycleBean.forStartupTests(5, startedBeans);
 		TestSmartLifecycleBean smartBean2 = TestSmartLifecycleBean.forStartupTests(-3, startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("simpleBean1", simpleBean1);
 		context.getBeanFactory().registerSingleton("smartBean1", smartBean1);
 		context.getBeanFactory().registerSingleton("simpleBean2", simpleBean2);
 		context.getBeanFactory().registerSingleton("smartBean2", smartBean2);
-
 		assertThat(simpleBean1.isRunning()).isFalse();
 		assertThat(simpleBean2.isRunning()).isFalse();
 		assertThat(smartBean1.isRunning()).isFalse();
@@ -278,17 +270,16 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void contextRefreshThenStopForRestartWithMixedBeans() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestLifecycleBean simpleBean1 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestLifecycleBean simpleBean2 = TestLifecycleBean.forStartupTests(startedBeans);
 		TestSmartLifecycleBean smartBean1 = TestSmartLifecycleBean.forStartupTests(5, startedBeans);
 		TestSmartLifecycleBean smartBean2 = TestSmartLifecycleBean.forStartupTests(-3, startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("simpleBean1", simpleBean1);
 		context.getBeanFactory().registerSingleton("smartBean1", smartBean1);
 		context.getBeanFactory().registerSingleton("simpleBean2", simpleBean2);
 		context.getBeanFactory().registerSingleton("smartBean2", smartBean2);
-
 		assertThat(simpleBean1.isRunning()).isFalse();
 		assertThat(simpleBean2.isRunning()).isFalse();
 		assertThat(smartBean1.isRunning()).isFalse();
@@ -328,7 +319,6 @@ class DefaultLifecycleProcessorTests {
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
 	void smartLifecycleGroupShutdown() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 300, stoppedBeans);
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forShutdownTests(3, 100, stoppedBeans);
@@ -337,6 +327,7 @@ class DefaultLifecycleProcessorTests {
 		TestSmartLifecycleBean bean5 = TestSmartLifecycleBean.forShutdownTests(2, 700, stoppedBeans);
 		TestSmartLifecycleBean bean6 = TestSmartLifecycleBean.forShutdownTests(Integer.MAX_VALUE, 200, stoppedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forShutdownTests(3, 200, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean1", bean1);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
 		context.getBeanFactory().registerSingleton("bean3", bean3);
@@ -344,7 +335,6 @@ class DefaultLifecycleProcessorTests {
 		context.getBeanFactory().registerSingleton("bean5", bean5);
 		context.getBeanFactory().registerSingleton("bean6", bean6);
 		context.getBeanFactory().registerSingleton("bean7", bean7);
-
 		context.refresh();
 		context.stop();
 		assertThat(stoppedBeans).satisfiesExactly(hasPhase(Integer.MAX_VALUE), hasPhase(3),
@@ -355,12 +345,11 @@ class DefaultLifecycleProcessorTests {
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
 	void singleSmartLifecycleShutdown() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forShutdownTests(99, 300, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
 		context.refresh();
-
 		assertThat(bean.isRunning()).isTrue();
 		context.stop();
 		assertThat(bean.isRunning()).isFalse();
@@ -370,11 +359,10 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void singleLifecycleShutdown() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		Lifecycle bean = new TestLifecycleBean(null, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
-
 		context.refresh();
 		assertThat(bean.isRunning()).isFalse();
 		bean.start();
@@ -387,7 +375,6 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void mixedShutdown() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		Lifecycle bean1 = TestLifecycleBean.forShutdownTests(stoppedBeans);
 		Lifecycle bean2 = TestSmartLifecycleBean.forShutdownTests(500, 200, stoppedBeans);
@@ -396,6 +383,7 @@ class DefaultLifecycleProcessorTests {
 		Lifecycle bean5 = TestSmartLifecycleBean.forShutdownTests(1, 200, stoppedBeans);
 		Lifecycle bean6 = TestSmartLifecycleBean.forShutdownTests(-1, 100, stoppedBeans);
 		Lifecycle bean7 = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 300, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean1", bean1);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
 		context.getBeanFactory().registerSingleton("bean3", bean3);
@@ -403,7 +391,6 @@ class DefaultLifecycleProcessorTests {
 		context.getBeanFactory().registerSingleton("bean5", bean5);
 		context.getBeanFactory().registerSingleton("bean6", bean6);
 		context.getBeanFactory().registerSingleton("bean7", bean7);
-
 		context.refresh();
 		assertThat(bean2.isRunning()).isTrue();
 		assertThat(bean3.isRunning()).isTrue();
@@ -431,18 +418,17 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void dependencyStartedFirstEvenIfItsPhaseIsHigher() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forStartupTests(Integer.MIN_VALUE, startedBeans);
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forStartupTests(2, startedBeans);
 		TestSmartLifecycleBean bean99 = TestSmartLifecycleBean.forStartupTests(99, startedBeans);
 		TestSmartLifecycleBean beanMax = TestSmartLifecycleBean.forStartupTests(Integer.MAX_VALUE, startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
 		context.getBeanFactory().registerSingleton("bean99", bean99);
 		context.getBeanFactory().registerSingleton("beanMax", beanMax);
 		context.getBeanFactory().registerDependentBean("bean99", "bean2");
-
 		context.refresh();
 		assertThat(beanMin.isRunning()).isTrue();
 		assertThat(bean2.isRunning()).isTrue();
@@ -460,7 +446,6 @@ class DefaultLifecycleProcessorTests {
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
 	void dependentShutdownFirstEvenIfItsPhaseIsLower() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 100, stoppedBeans);
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 200, stoppedBeans);
@@ -468,6 +453,7 @@ class DefaultLifecycleProcessorTests {
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forShutdownTests(2, 300, stoppedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forShutdownTests(7, 400, stoppedBeans);
 		TestSmartLifecycleBean beanMax = TestSmartLifecycleBean.forShutdownTests(Integer.MAX_VALUE, 400, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("bean1", bean1);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
@@ -475,7 +461,6 @@ class DefaultLifecycleProcessorTests {
 		context.getBeanFactory().registerSingleton("bean99", bean99);
 		context.getBeanFactory().registerSingleton("beanMax", beanMax);
 		context.getBeanFactory().registerDependentBean("bean99", "bean2");
-
 		context.refresh();
 		assertThat(beanMin.isRunning()).isTrue();
 		assertThat(bean1.isRunning()).isTrue();
@@ -501,18 +486,17 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void dependencyStartedFirstAndIsSmartLifecycle() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanNegative = TestSmartLifecycleBean.forStartupTests(-99, startedBeans);
 		TestSmartLifecycleBean bean99 = TestSmartLifecycleBean.forStartupTests(99, startedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forStartupTests(7, startedBeans);
 		TestLifecycleBean simpleBean = TestLifecycleBean.forStartupTests(startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanNegative", beanNegative);
 		context.getBeanFactory().registerSingleton("bean7", bean7);
 		context.getBeanFactory().registerSingleton("bean99", bean99);
 		context.getBeanFactory().registerSingleton("simpleBean", simpleBean);
 		context.getBeanFactory().registerDependentBean("bean7", "simpleBean");
-
 		context.refresh();
 		context.stop();
 		startedBeans.clear();
@@ -530,7 +514,6 @@ class DefaultLifecycleProcessorTests {
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
 	void dependentShutdownFirstAndIsSmartLifecycle() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 400, stoppedBeans);
 		TestSmartLifecycleBean beanNegative = TestSmartLifecycleBean.forShutdownTests(-99, 100, stoppedBeans);
@@ -538,6 +521,7 @@ class DefaultLifecycleProcessorTests {
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forShutdownTests(2, 300, stoppedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forShutdownTests(7, 400, stoppedBeans);
 		TestLifecycleBean simpleBean = TestLifecycleBean.forShutdownTests(stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("beanNegative", beanNegative);
 		context.getBeanFactory().registerSingleton("bean1", bean1);
@@ -545,7 +529,6 @@ class DefaultLifecycleProcessorTests {
 		context.getBeanFactory().registerSingleton("bean7", bean7);
 		context.getBeanFactory().registerSingleton("simpleBean", simpleBean);
 		context.getBeanFactory().registerDependentBean("simpleBean", "beanNegative");
-
 		context.refresh();
 		assertThat(beanMin.isRunning()).isTrue();
 		assertThat(beanNegative.isRunning()).isTrue();
@@ -568,16 +551,15 @@ class DefaultLifecycleProcessorTests {

 	@Test
 	void dependencyStartedFirstButNotSmartLifecycle() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> startedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forStartupTests(Integer.MIN_VALUE, startedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forStartupTests(7, startedBeans);
 		TestLifecycleBean simpleBean = TestLifecycleBean.forStartupTests(startedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("bean7", bean7);
 		context.getBeanFactory().registerSingleton("simpleBean", simpleBean);
 		context.getBeanFactory().registerDependentBean("simpleBean", "beanMin");
-
 		context.refresh();
 		assertThat(beanMin.isRunning()).isTrue();
 		assertThat(bean7.isRunning()).isTrue();
@@ -590,20 +572,19 @@ class DefaultLifecycleProcessorTests {
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
 	void dependentShutdownFirstButNotSmartLifecycle() {
-		StaticApplicationContext context = new StaticApplicationContext();
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<>();
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 200, stoppedBeans);
 		TestLifecycleBean simpleBean = TestLifecycleBean.forShutdownTests(stoppedBeans);
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forShutdownTests(2, 300, stoppedBeans);
 		TestSmartLifecycleBean bean7 = TestSmartLifecycleBean.forShutdownTests(7, 400, stoppedBeans);
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 400, stoppedBeans);
+		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("beanMin", beanMin);
 		context.getBeanFactory().registerSingleton("bean1", bean1);
 		context.getBeanFactory().registerSingleton("bean2", bean2);
 		context.getBeanFactory().registerSingleton("bean7", bean7);
 		context.getBeanFactory().registerSingleton("simpleBean", simpleBean);
 		context.getBeanFactory().registerDependentBean("bean2", "simpleBean");
-
 		context.refresh();
 		assertThat(beanMin.isRunning()).isTrue();
 		assertThat(bean1.isRunning()).isTrue();
@@ -630,7 +611,6 @@ class DefaultLifecycleProcessorTests {
 		};
 	}

-
 	private static class TestLifecycleBean implements Lifecycle {

 		private final CopyOnWriteArrayList<Lifecycle> startedBeans;
@@ -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.
@@ -39,7 +39,6 @@ import static java.time.temporal.TemporalAdjusters.next;
 import static org.assertj.core.api.Assertions.assertThat;

 /**
- * Tests for {@link CronExpression}.
 * @author Arjen Poutsma
 */
 class CronExpressionTests {
@@ -1093,20 +1092,6 @@ class CronExpressionTests {
 		assertThat(actual.getDayOfWeek()).isEqualTo(FRIDAY);
 	}

-	@Test
-	void quartz5thMondayOfTheMonthDayName() {
-		CronExpression expression = CronExpression.parse("0 0 0 ? * MON#5");
-
-		LocalDateTime last = LocalDateTime.of(2025, 1, 1, 0, 0, 0);
-
-		// first occurrence of 5 mondays in a month from last
-		LocalDateTime expected = LocalDateTime.of(2025, 3, 31, 0, 0, 0);
-		LocalDateTime actual = expression.next(last);
-		assertThat(actual).isNotNull();
-		assertThat(actual).isEqualTo(expected);
-		assertThat(actual.getDayOfWeek()).isEqualTo(MONDAY);
-	}
-
 	@Test
 	void quartzFifthWednesdayOfTheMonth() {
 		CronExpression expression = CronExpression.parse("0 0 0 ? * 3#5");
@@ -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.
@@ -27,7 +27,6 @@ import java.util.stream.Stream;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ClassUtils;

 /**
 * Gather the need for resources available at runtime.
@@ -51,14 +50,14 @@ public class ResourceHints {
 		this.resourceBundleHints = new LinkedHashSet<>();
 	}

-
 	/**
 	 * Return the resources that should be made available at runtime.
 	 * @return a stream of {@link ResourcePatternHints}
 	 */
 	public Stream<ResourcePatternHints> resourcePatternHints() {
 		Stream<ResourcePatternHints> patterns = this.resourcePatternHints.stream();
-		return (this.types.isEmpty() ? patterns : Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
+		return (this.types.isEmpty() ? patterns
+				: Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
 	}

 	/**
@@ -71,18 +70,18 @@ public class ResourceHints {

 	/**
 	 * Register a pattern if the given {@code location} is available on the
-	 * classpath. This delegates to {@link ClassLoader#getResource(String)} which
-	 * validates directories as well. The location is not included in the hint.
-	 * @param classLoader the ClassLoader to use, or {@code null} for the default
+	 * classpath. This delegates to {@link ClassLoader#getResource(String)}
+	 * which validates directories as well. The location is not included in
+	 * the hint.
+	 * @param classLoader the classloader to use
 	 * @param location a '/'-separated path name that should exist
 	 * @param resourceHint a builder to customize the resource pattern
 	 * @return {@code this}, to facilitate method chaining
 	 */
 	public ResourceHints registerPatternIfPresent(@Nullable ClassLoader classLoader, String location,
 			Consumer<ResourcePatternHints.Builder> resourceHint) {
-
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
-		if (classLoaderToUse != null && classLoaderToUse.getResource(location) != null) {
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader());
+		if (classLoaderToUse.getResource(location) != null) {
 			registerPattern(resourceHint);
 		}
 		return this;
@@ -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.
@@ -25,9 +25,8 @@ import org.springframework.lang.Nullable;
 *
 * <p>Implementations of this interface can be registered dynamically by using
 * {@link org.springframework.context.annotation.ImportRuntimeHints @ImportRuntimeHints}
- * or statically in {@code META-INF/spring/aot.factories} by using the fully-qualified
- * class name of this interface as the key. A standard no-arg constructor is required
- * for implementations.
+ * or statically in {@code META-INF/spring/aot.factories} by using the FQN of this
+ * interface as the key. A standard no-arg constructor is required for implementations.
 *
 * @author Brian Clozel
 * @author Stephane Nicoll
@@ -39,7 +38,7 @@ public interface RuntimeHintsRegistrar {
 	/**
 	 * Contribute hints to the given {@link RuntimeHints} instance.
 	 * @param hints the hints contributed so far for the deployment unit
-	 * @param classLoader the ClassLoader to use, or {@code null} for the default
+	 * @param classLoader the classloader, or {@code null} if even the system ClassLoader isn't accessible
 	 */
 	void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader);

@@ -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.
@@ -23,7 +23,6 @@ import java.util.List;
 import org.springframework.aot.hint.ResourceHints;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ResourceUtils;

 /**
@@ -67,21 +66,19 @@ public class FilePatternResourceHintsRegistrar {

 	@Deprecated(since = "6.0.12", forRemoval = true)
 	public void registerHints(ResourceHints hints, @Nullable ClassLoader classLoader) {
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
-		if (classLoaderToUse != null) {
-			List<String> includes = new ArrayList<>();
-			for (String location : this.classpathLocations) {
-				if (classLoaderToUse.getResource(location) != null) {
-					for (String filePrefix : this.filePrefixes) {
-						for (String fileExtension : this.fileExtensions) {
-							includes.add(location + filePrefix + "*" + fileExtension);
-						}
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader());
+		List<String> includes = new ArrayList<>();
+		for (String location : this.classpathLocations) {
+			if (classLoaderToUse.getResource(location) != null) {
+				for (String filePrefix : this.filePrefixes) {
+					for (String fileExtension : this.fileExtensions) {
+						includes.add(location + filePrefix + "*" + fileExtension);
 					}
 				}
 			}
-			if (!includes.isEmpty()) {
-				hints.registerPattern(hint -> hint.includes(includes.toArray(String[]::new)));
-			}
+		}
+		if (!includes.isEmpty()) {
+			hints.registerPattern(hint -> hint.includes(includes.toArray(String[]::new)));
 		}
 	}

@@ -249,7 +246,8 @@ public class FilePatternResourceHintsRegistrar {
 		 * classpath location that resolves against the {@code ClassLoader}, files
 		 * with the configured file prefixes and extensions are registered.
 		 * @param hints the hints contributed so far for the deployment unit
-		 * @param classLoader the ClassLoader to use, or {@code null} for the default
+		 * @param classLoader the classloader, or {@code null} if even the system
+		 * ClassLoader isn't accessible
 		 */
 		public void registerHints(ResourceHints hints, @Nullable ClassLoader classLoader) {
 			build().registerHints(hints, classLoader);
@@ -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.
@@ -48,11 +48,10 @@ class SpringFactoriesLoaderRuntimeHints implements RuntimeHintsRegistrar {

 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
-		ClassLoader classLoaderToUse = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
-		if (classLoaderToUse != null) {
-			for (String resourceLocation : RESOURCE_LOCATIONS) {
-				registerHints(hints, classLoaderToUse, resourceLocation);
-			}
+		ClassLoader classLoaderToUse = (classLoader != null ? classLoader :
+				SpringFactoriesLoaderRuntimeHints.class.getClassLoader());
+		for (String resourceLocation : RESOURCE_LOCATIONS) {
+			registerHints(hints, classLoaderToUse, resourceLocation);
 		}
 	}

@@ -123,17 +123,13 @@ abstract public class AbstractClassGenerator<T> implements ClassGenerator {
 		}

 		public Object get(AbstractClassGenerator gen, boolean useCache) {
-			// SPRING PATCH BEGIN
-			Object value = null;
-			if (useCache) {
+			if (!useCache) {
+				return gen.generate(ClassLoaderData.this);
+			}
+			else {
 				Object cachedValue = generatedClasses.get(gen);
-				value = gen.unwrapCachedValue(cachedValue);
+				return gen.unwrapCachedValue(cachedValue);
 			}
-			if (value == null) {  // fallback when cached WeakReference returns null
-				value = gen.generate(ClassLoaderData.this);
-			}
-			return value;
-			// SPRING PATCH END
 		}
 	}

@@ -527,26 +527,15 @@ public class ReflectUtils {
 				c = lookup.defineClass(b);
 			}
 			catch (LinkageError | IllegalAccessException ex) {
-				if (ex instanceof LinkageError) {
-					// Could be a ClassLoader mismatch with the class pre-existing in a
-					// parent ClassLoader -> try loadClass before giving up completely.
-					try {
-						c = contextClass.getClassLoader().loadClass(className);
+				throw new CodeGenerationException(ex) {
+					@Override
+					public String getMessage() {
+						return "ClassLoader mismatch for [" + contextClass.getName() +
+								"]: JVM should be started with --add-opens=java.base/java.lang=ALL-UNNAMED " +
+								"for ClassLoader.defineClass to be accessible on " + loader.getClass().getName() +
+								"; consider co-locating the affected class in that target ClassLoader instead.";
 					}
-					catch (ClassNotFoundException cnfe) {
-					}
-				}
-				if (c == null) {
-					throw new CodeGenerationException(ex) {
-						@Override
-						public String getMessage() {
-							return "ClassLoader mismatch for [" + contextClass.getName() +
-									"]: JVM should be started with --add-opens=java.base/java.lang=ALL-UNNAMED " +
-									"for ClassLoader.defineClass to be accessible on " + loader.getClass().getName() +
-									"; consider co-locating the affected class in that target ClassLoader instead.";
-						}
-					};
-				}
+				};
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);
@@ -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.
@@ -117,7 +117,7 @@ public final class SpringProperties {
 	 * @param key the property key
 	 */
 	public static void setFlag(String key) {
-		localProperties.setProperty(key, Boolean.TRUE.toString());
+		localProperties.put(key, Boolean.TRUE.toString());
 	}

 	/**
@@ -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.
@@ -206,8 +206,6 @@ import org.springframework.util.StringUtils;
 */
 public class PathMatchingResourcePatternResolver implements ResourcePatternResolver {

-	private static final Resource[] EMPTY_RESOURCE_ARRAY = {};
-
 	private static final Log logger = LogFactory.getLog(PathMatchingResourcePatternResolver.class);

 	/**
@@ -250,8 +248,6 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol

 	private PathMatcher pathMatcher = new AntPathMatcher();

-	private boolean useCaches = true;
-

 	/**
 	 * Create a {@code PathMatchingResourcePatternResolver} with a
@@ -319,21 +315,6 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 		return this.pathMatcher;
 	}

-	/**
-	 * Specify whether this resolver should use jar caches. Default is {@code true}.
-	 * <p>Switch this flag to {@code false} in order to avoid jar caching at the
-	 * {@link JarURLConnection} level.
-	 * <p>Note that {@link JarURLConnection#setDefaultUseCaches} can be turned off
-	 * independently. This resolver-level setting is designed to only enforce
-	 * {@code JarURLConnection#setUseCaches(false)} if necessary but otherwise
-	 * leaves the JVM-level default in place.
-	 * @since 6.1.19
-	 * @see JarURLConnection#setUseCaches
-	 */
-	public void setUseCaches(boolean useCaches) {
-		this.useCaches = useCaches;
-	}
-

 	@Override
 	public Resource getResource(String location) {
@@ -357,7 +338,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 				// all class path resources with the given name
 				Collections.addAll(resources, findAllClassPathResources(locationPatternWithoutPrefix));
 			}
-			return resources.toArray(EMPTY_RESOURCE_ARRAY);
+			return resources.toArray(new Resource[0]);
 		}
 		else {
 			// Generally only look for a pattern after a prefix here,
@@ -390,7 +371,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 		if (logger.isTraceEnabled()) {
 			logger.trace("Resolved class path location [" + path + "] to resources " + result);
 		}
-		return result.toArray(EMPTY_RESOURCE_ARRAY);
+		return result.toArray(new Resource[0]);
 	}

 	/**
@@ -626,7 +607,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 		if (logger.isTraceEnabled()) {
 			logger.trace("Resolved location pattern [" + locationPattern + "] to resources " + result);
 		}
-		return result.toArray(EMPTY_RESOURCE_ARRAY);
+		return result.toArray(new Resource[0]);
 	}

 	/**
@@ -714,9 +695,6 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol

 		if (con instanceof JarURLConnection jarCon) {
 			// Should usually be the case for traditional JAR files.
-			if (!this.useCaches) {
-				jarCon.setUseCaches(false);
-			}
 			jarFile = jarCon.getJarFile();
 			jarFileUrl = jarCon.getJarFileURL().toExternalForm();
 			JarEntry jarEntry = jarCon.getJarEntry();
@@ -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.
@@ -51,11 +51,10 @@ public class FlightRecorderApplicationStartup implements ApplicationStartup {

 	@Override
 	public StartupStep start(String name) {
-		Long parentId = this.currentSteps.getFirst();
 		long sequenceId = this.currentSequenceId.incrementAndGet();
 		this.currentSteps.offerFirst(sequenceId);
 		return new FlightRecorderStartupStep(sequenceId, name,
-				parentId, committedStep -> this.currentSteps.removeFirstOccurrence(sequenceId));
+				this.currentSteps.getFirst(), committedStep -> this.currentSteps.removeFirstOccurrence(sequenceId));
 	}

 }
@@ -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.
@@ -69,13 +69,7 @@ public class TaskRejectedException extends RejectedExecutionException {

 	private static String executorDescription(Executor executor) {
 		if (executor instanceof ExecutorService executorService) {
-			try {
-				return "ExecutorService in " + (executorService.isShutdown() ? "shutdown" : "active") + " state";
-			}
-			catch (Exception ex) {
-				// UnsupportedOperationException/IllegalStateException from ManagedExecutorService.isShutdown()
-				// Falling back to toString() below.
-			}
+			return "ExecutorService in " + (executorService.isShutdown() ? "shutdown" : "active") + " state";
 		}
 		return executor.toString();
 	}
@@ -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.
@@ -69,7 +69,7 @@ public class SpringObjenesis implements Objenesis {
 		this.strategy = (strategy != null ? strategy : new StdInstantiatorStrategy());

 		// Evaluate the "spring.objenesis.ignore" property upfront...
-		if (SpringProperties.getFlag(IGNORE_OBJENESIS_PROPERTY_NAME)) {
+		if (SpringProperties.getFlag(SpringObjenesis.IGNORE_OBJENESIS_PROPERTY_NAME)) {
 			this.worthTrying = Boolean.FALSE;
 		}
 	}
@@ -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.
@@ -108,11 +108,9 @@ class PathMatchingResourcePatternResolverTests {
 			Path rootDir = Paths.get("src/test/resources/custom%23root").toAbsolutePath();
 			URL root = new URL("file:" + rootDir + "/");
 			resolver = new PathMatchingResourcePatternResolver(new DefaultResourceLoader(new URLClassLoader(new URL[] {root})));
-			resolver.setUseCaches(false);
 			assertExactFilenames("classpath*:scanned/*.txt", "resource#test1.txt", "resource#test2.txt");
 		}

-
 		@Nested
 		class WithHashtagsInTheirFilenames {

@@ -334,7 +332,7 @@ class PathMatchingResourcePatternResolverTests {
 		// Tests fail if we use resource.getURL().getPath(). They would also fail on macOS when
 		// using resource.getURI().getPath() if the resource paths are not Unicode normalized.
 		//
-		// On the JVM, all tests should pass when using resource.getFile().getPath(); however,
+		// On the JVM, all tests should pass when using resouce.getFile().getPath(); however,
 		// we use FileSystemResource#getPath since this test class is sometimes run within a
 		// GraalVM native image which cannot support Path#toFile.
 		//
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -156,23 +156,6 @@ class PropertyPlaceholderHelperTests {
 			);
 		}

-		@ParameterizedTest(name = "{0} -> {1}")
-		@MethodSource("exactMatchPlaceholders")
-		void placeholdersWithExactMatchAreConsidered(String text, String expected) {
-			Properties properties = new Properties();
-			properties.setProperty("prefix://my-service", "example-service");
-			properties.setProperty("px", "prefix");
-			properties.setProperty("p1", "${prefix://my-service}");
-			assertThat(this.helper.replacePlaceholders(text, properties)).isEqualTo(expected);
-		}
-
-		static Stream<Arguments> exactMatchPlaceholders() {
-			return Stream.of(
-					Arguments.of("${prefix://my-service}", "example-service"),
-					Arguments.of("${p1}", "example-service")
-			);
-		}
-
 	}

 	PlaceholderResolver mockPlaceholderResolver(String... pairs) {
@@ -226,9 +226,8 @@ public class FunctionReference extends SpelNodeImpl {
 		ReflectionHelper.convertAllMethodHandleArguments(converter, functionArgs, methodHandle, varArgPosition);

 		if (isSuspectedVarargs) {
-			if (declaredParamCount == 1 && !methodHandle.isVarargsCollector()) {
-				// We only repackage the arguments if the MethodHandle accepts a single
-				// argument AND the MethodHandle is not a "varargs collector" -- for example,
+			if (declaredParamCount == 1) {
+				// We only repackage the varargs if it is the ONLY argument -- for example,
 				// when we are dealing with a bound MethodHandle.
 				functionArgs = ReflectionHelper.setupArgumentsForVarargsInvocation(
 						methodHandle.type().parameterArray(), functionArgs);
@@ -108,16 +108,11 @@ class TestScenarioCreator {
 				"formatObjectVarargs", MethodType.methodType(String.class, String.class, Object[].class));
 		testContext.registerFunction("formatObjectVarargs", formatObjectVarargs);

-		// #formatPrimitiveVarargs(format, args...)
+		// #formatObjectVarargs(format, args...)
 		MethodHandle formatPrimitiveVarargs = MethodHandles.lookup().findStatic(TestScenarioCreator.class,
 				"formatPrimitiveVarargs", MethodType.methodType(String.class, String.class, int[].class));
 		testContext.registerFunction("formatPrimitiveVarargs", formatPrimitiveVarargs);

-		// #varargsFunctionHandle(args...)
-		MethodHandle varargsFunctionHandle = MethodHandles.lookup().findStatic(TestScenarioCreator.class,
-				"varargsFunction", MethodType.methodType(String.class, String[].class));
-		testContext.registerFunction("varargsFunctionHandle", varargsFunctionHandle);
-
 		// #add(int, int)
 		MethodHandle add = MethodHandles.lookup().findStatic(TestScenarioCreator.class,
 				"add", MethodType.methodType(int.class, int.class, int.class));
@@ -79,8 +79,6 @@ class VariableAndFunctionTests extends AbstractExpressionTests {

 	@Test
 	void functionWithVarargs() {
-		// static String varargsFunction(String... strings) -> Arrays.toString(strings)
-
 		evaluate("#varargsFunction()", "[]", String.class);
 		evaluate("#varargsFunction(new String[0])", "[]", String.class);
 		evaluate("#varargsFunction('a')", "[a]", String.class);
@@ -243,27 +241,6 @@ class VariableAndFunctionTests extends AbstractExpressionTests {
 		evaluate("#formatObjectVarargs('x -> %s %s %s', {'a', 'b', 'c'})", expected, String.class);
 	}

-	@Test  // gh-34109
-	void functionViaMethodHandleForStaticMethodThatAcceptsOnlyVarargs() {
-		// #varargsFunctionHandle: static String varargsFunction(String... strings) -> Arrays.toString(strings)
-
-		evaluate("#varargsFunctionHandle()", "[]", String.class);
-		evaluate("#varargsFunctionHandle(new String[0])", "[]", String.class);
-		evaluate("#varargsFunctionHandle('a')", "[a]", String.class);
-		evaluate("#varargsFunctionHandle('a','b','c')", "[a, b, c]", String.class);
-		evaluate("#varargsFunctionHandle(new String[]{'a','b','c'})", "[a, b, c]", String.class);
-		// Conversion from int to String
-		evaluate("#varargsFunctionHandle(25)", "[25]", String.class);
-		evaluate("#varargsFunctionHandle('b',25)", "[b, 25]", String.class);
-		evaluate("#varargsFunctionHandle(new int[]{1, 2, 3})", "[1, 2, 3]", String.class);
-		// Strings that contain a comma
-		evaluate("#varargsFunctionHandle('a,b')", "[a,b]", String.class);
-		evaluate("#varargsFunctionHandle('a', 'x,y', 'd')", "[a, x,y, d]", String.class);
-		// null values
-		evaluate("#varargsFunctionHandle(null)", "[null]", String.class);
-		evaluate("#varargsFunctionHandle('a',null,'b')", "[a, null, b]", String.class);
-	}
-
 	@Test
 	void functionMethodMustBeStatic() throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
@@ -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.
@@ -85,13 +85,12 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	 * Set a {@link ConversionService} for converting a fetched value.
 	 * <p>Default is the {@link DefaultConversionService}.
 	 * @since 5.0.4
-	 * @see DefaultConversionService#getSharedInstance()
+	 * @see DefaultConversionService#getSharedInstance
 	 */
 	public void setConversionService(@Nullable ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}

-
 	/**
 	 * Extract a value for the single column in the current row.
 	 * <p>Validates that there is only one column selected,
@@ -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.
@@ -439,11 +439,7 @@ public abstract class DataSourceUtils {
 	public static Connection getTargetConnection(Connection con) {
 		Connection conToUse = con;
 		while (conToUse instanceof ConnectionProxy connectionProxy) {
-			Connection targetCon = connectionProxy.getTargetConnection();
-			if (targetCon == conToUse) {
-				break;
-			}
-			conToUse = targetCon;
+			conToUse = connectionProxy.getTargetConnection();
 		}
 		return conToUse;
 	}
@@ -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.
@@ -210,23 +210,13 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource {
 						sb.append('[').append(this.target).append(']');
 					}
 					else {
-						sb.append("from DataSource [").append(this.targetDataSource).append(']');
+						sb.append(" from DataSource [").append(this.targetDataSource).append(']');
 					}
 					return sb.toString();
 				}
 				case "close" -> {
 					// Handle close method: only close if not within a transaction.
-					if (this.target != null) {
-						ConnectionHolder conHolder = (ConnectionHolder)
-								TransactionSynchronizationManager.getResource(this.targetDataSource);
-						if (conHolder != null && conHolder.hasConnection() && conHolder.getConnection() == this.target) {
-							// It's the transactional Connection: Don't close it.
-							conHolder.released();
-						}
-						else {
-							DataSourceUtils.doCloseConnection(this.target, this.targetDataSource);
-						}
-					}
+					DataSourceUtils.doReleaseConnection(this.target, this.targetDataSource);
 					this.closed = true;
 					return null;
 				}
@@ -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.
@@ -72,7 +72,7 @@ public class DataSourceTransactionManagerTests {

 	protected DataSource ds = mock();

-	protected ConnectionProxy con = mock();
+	protected Connection con = mock();

 	protected DataSourceTransactionManager tm;

@@ -81,7 +81,6 @@ public class DataSourceTransactionManagerTests {
 	void setup() throws Exception {
 		tm = createTransactionManager(ds);
 		given(ds.getConnection()).willReturn(con);
-		given(con.getTargetConnection()).willThrow(new UnsupportedOperationException());
 	}

 	protected DataSourceTransactionManager createTransactionManager(DataSource ds) {
@@ -1075,9 +1074,9 @@ public class DataSourceTransactionManagerTests {
 					Connection tCon = dsProxy.getConnection();
 					tCon.getWarnings();
 					tCon.clearWarnings();
-					assertThat(((ConnectionProxy) tCon).getTargetConnection()).isEqualTo(con);
+					assertThat(((ConnectionProxy) dsProxy.getConnection()).getTargetConnection()).isEqualTo(con);
 					// should be ignored
-					tCon.close();
+					dsProxy.getConnection().close();
 				}
 				catch (SQLException ex) {
 					throw new UncategorizedSQLException("", "", ex);
@@ -1111,9 +1110,9 @@ public class DataSourceTransactionManagerTests {
 					Connection tCon = dsProxy.getConnection();
 					assertThatExceptionOfType(SQLException.class).isThrownBy(tCon::getWarnings);
 					tCon.clearWarnings();
-					assertThat(((ConnectionProxy) tCon).getTargetConnection()).isEqualTo(con);
+					assertThat(((ConnectionProxy) dsProxy.getConnection()).getTargetConnection()).isEqualTo(con);
 					// should be ignored
-					tCon.close();
+					dsProxy.getConnection().close();
 				}
 				catch (SQLException ex) {
 					throw new UncategorizedSQLException("", "", ex);
@@ -1129,42 +1128,6 @@ public class DataSourceTransactionManagerTests {
 		verify(con).close();
 	}

-	@Test
-	void testTransactionAwareDataSourceProxyWithEarlyConnection() throws Exception {
-		given(ds.getConnection()).willReturn(mock(Connection.class), con);
-		given(con.getAutoCommit()).willReturn(true);
-		given(con.getWarnings()).willThrow(new SQLException());
-
-		TransactionAwareDataSourceProxy dsProxy = new TransactionAwareDataSourceProxy(ds);
-		dsProxy.setLazyTransactionalConnections(false);
-		Connection tCon = dsProxy.getConnection();
-
-		TransactionTemplate tt = new TransactionTemplate(tm);
-		assertThat(TransactionSynchronizationManager.hasResource(ds)).isFalse();
-		tt.execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus status) {
-				// something transactional
-				assertThat(DataSourceUtils.getConnection(ds)).isEqualTo(con);
-				try {
-					// should close the early Connection obtained before the transaction
-					tCon.close();
-				}
-				catch (SQLException ex) {
-					throw new UncategorizedSQLException("", "", ex);
-				}
-			}
-		});
-
-		assertThat(TransactionSynchronizationManager.hasResource(ds)).isFalse();
-
-		InOrder ordered = inOrder(con);
-		ordered.verify(con).setAutoCommit(false);
-		ordered.verify(con).commit();
-		ordered.verify(con).setAutoCommit(true);
-		verify(con).close();
-	}
-
 	@Test
 	void testTransactionAwareDataSourceProxyWithSuspension() throws Exception {
 		given(con.getAutoCommit()).willReturn(true);
@@ -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.
@@ -209,7 +209,6 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 		this.observationRegistry = observationRegistry;
 	}

-
 	@Override
 	public C createListenerContainer(JmsListenerEndpoint endpoint) {
 		C instance = createContainerInstance();
@@ -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.
@@ -102,7 +102,7 @@ import org.springframework.util.ErrorHandler;
 * (i.e. after your business logic executed but before the JMS part got committed),
 * so duplicate message detection is just there to cover a corner case.
 * <li>Or wrap your <i>entire processing with an XA transaction</i>, covering the
- * receipt of the JMS message as well as the execution of the business logic in
+ * reception of the JMS message as well as the execution of the business logic in
 * your message listener (including database operations etc). This is only
 * supported by {@link DefaultMessageListenerContainer}, through specifying
 * an external "transactionManager" (typically a
@@ -152,8 +152,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 		implements MessageListenerContainer {

 	private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
-			"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation",
-			AbstractMessageListenerContainer.class.getClassLoader());
+			"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader());

 	@Nullable
 	private volatile Object destination;
@@ -171,14 +170,14 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	@Nullable
 	private String subscriptionName;

-	private boolean pubSubNoLocal = false;
-
 	@Nullable
 	private Boolean replyPubSubDomain;

 	@Nullable
 	private QosSettings replyQosSettings;

+	private boolean pubSubNoLocal = false;
+
 	@Nullable
 	private MessageConverter messageConverter;

@@ -501,7 +500,12 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	 */
 	@Override
 	public boolean isReplyPubSubDomain() {
-		return (this.replyPubSubDomain != null ? this.replyPubSubDomain : isPubSubDomain());
+		if (this.replyPubSubDomain != null) {
+			return this.replyPubSubDomain;
+		}
+		else {
+			return isPubSubDomain();
+		}
 	}

 	/**
@@ -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.
@@ -48,8 +48,8 @@ public class DestinationVariableArgumentResolver implements RSocketServiceArgume
 				collection.forEach(requestValues::addRouteVariable);
 				return true;
 			}
-			else if (argument instanceof Object[] arguments) {
-				for (Object variable : arguments) {
+			else if (argument.getClass().isArray()) {
+				for (Object variable : (Object[]) argument) {
 					requestValues.addRouteVariable(variable);
 				}
 				return true;
@@ -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,6 +20,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 import org.apache.commons.logging.Log;
@@ -279,10 +280,12 @@ public class UserDestinationMessageHandler implements MessageHandler, SmartLifec
 			return this.messagingTemplate;
 		}

-		public void send(UserDestinationResult result, Message<?> message) throws MessagingException {
-			Iterator<String> itr = result.getSessionIds().iterator();
-			for (String target : result.getTargetDestinations()) {
-				String sessionId = (itr.hasNext() ? itr.next() : null);
+		public void send(UserDestinationResult destinationResult, Message<?> message) throws MessagingException {
+			Set<String> sessionIds = destinationResult.getSessionIds();
+			Iterator<String> itr = (sessionIds != null ? sessionIds.iterator() : null);
+
+			for (String target : destinationResult.getTargetDestinations()) {
+				String sessionId = (itr != null ? itr.next() : null);
 				getTemplateToUse(sessionId).send(target, message);
 			}
 		}
@@ -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.
@@ -44,11 +44,7 @@ public class UserDestinationResult {
 	private final Set<String> sessionIds;


-	/**
-	 * Main constructor.
-	 */
-	public UserDestinationResult(
-			String sourceDestination, Set<String> targetDestinations,
+	public UserDestinationResult(String sourceDestination, Set<String> targetDestinations,
 			String subscribeDestination, @Nullable String user) {

 		this(sourceDestination, targetDestinations, subscribeDestination, user, null);
@@ -118,6 +114,7 @@ public class UserDestinationResult {
 	/**
 	 * Return the session id for the targetDestination.
 	 */
+	@Nullable
 	public Set<String> getSessionIds() {
 		return this.sessionIds;
 	}
@@ -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.
@@ -17,7 +17,6 @@
 package org.springframework.messaging.simp.user;

 import java.nio.charset.StandardCharsets;
-import java.util.Set;

 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -99,26 +98,6 @@ class UserDestinationMessageHandlerTests {
 		assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo");
 	}

-	@Test
-	@SuppressWarnings("rawtypes")
-	void handleMessageWithoutSessionIds() {
-		UserDestinationResolver resolver = mock();
-		Message message = createWith(SimpMessageType.MESSAGE, "joe", null, "/user/joe/queue/foo");
-		UserDestinationResult result = new UserDestinationResult("/queue/foo-user123", Set.of("/queue/foo-user123"), "/user/queue/foo", "joe");
-		given(resolver.resolveDestination(message)).willReturn(result);
-
-		given(this.brokerChannel.send(Mockito.any(Message.class))).willReturn(true);
-		UserDestinationMessageHandler handler = new UserDestinationMessageHandler(new StubMessageChannel(), this.brokerChannel, resolver);
-		handler.handleMessage(message);
-
-		ArgumentCaptor<Message> captor = ArgumentCaptor.forClass(Message.class);
-		Mockito.verify(this.brokerChannel).send(captor.capture());
-
-		SimpMessageHeaderAccessor accessor = SimpMessageHeaderAccessor.wrap(captor.getValue());
-		assertThat(accessor.getDestination()).isEqualTo("/queue/foo-user123");
-		assertThat(accessor.getFirstNativeHeader(ORIGINAL_DESTINATION)).isEqualTo("/user/queue/foo");
-	}
-
 	@Test
 	@SuppressWarnings("rawtypes")
 	void handleMessageWithoutActiveSession() {
@@ -185,7 +185,7 @@ public abstract class SharedEntityManagerCreator {
 	@SuppressWarnings("serial")
 	private static class SharedEntityManagerInvocationHandler implements InvocationHandler, Serializable {

-		private static final Log logger = LogFactory.getLog(SharedEntityManagerInvocationHandler.class);
+		private final Log logger = LogFactory.getLog(getClass());

 		private final EntityManagerFactory targetFactory;

@@ -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.
@@ -19,7 +19,6 @@ package org.springframework.orm.jpa;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.OptimisticLockException;
-import jakarta.persistence.PersistenceException;
 import org.junit.jupiter.api.Test;

 import org.springframework.transaction.TransactionDefinition;
@@ -34,37 +33,33 @@ import static org.mockito.Mockito.mock;
 /**
 * @author Costin Leau
 * @author Phillip Webb
- * @author Juergen Hoeller
 */
 class DefaultJpaDialectTests {

-	private final JpaDialect dialect = new DefaultJpaDialect();
+	private JpaDialect dialect = new DefaultJpaDialect();

+	@Test
+	void testDefaultTransactionDefinition() {
+		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+		definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
+		assertThatExceptionOfType(TransactionException.class).isThrownBy(() ->
+				dialect.beginTransaction(null, definition));
+	}

 	@Test
 	void testDefaultBeginTransaction() throws Exception {
 		TransactionDefinition definition = new DefaultTransactionDefinition();
 		EntityManager entityManager = mock();
 		EntityTransaction entityTx = mock();
+
 		given(entityManager.getTransaction()).willReturn(entityTx);

 		dialect.beginTransaction(entityManager, definition);
 	}

-	@Test
-	void testCustomIsolationLevel() {
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
-
-		assertThatExceptionOfType(TransactionException.class).isThrownBy(() ->
-				dialect.beginTransaction(null, definition));
-	}
-
 	@Test
 	void testTranslateException() {
-		PersistenceException ex = new OptimisticLockException();
-		assertThat(dialect.translateExceptionIfPossible(ex))
-				.isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex);
+		OptimisticLockException ex = new OptimisticLockException();
+		assertThat(dialect.translateExceptionIfPossible(ex).getCause()).isEqualTo(EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex).getCause());
 	}
-
 }
@@ -23,7 +23,6 @@ import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.IsolationLevel;
 import io.r2dbc.spi.R2dbcBadGrammarException;
-import io.r2dbc.spi.R2dbcTransientResourceException;
 import io.r2dbc.spi.Statement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,7 +32,6 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;

-import org.springframework.dao.TransientDataAccessResourceException;
 import org.springframework.r2dbc.BadSqlGrammarException;
 import org.springframework.transaction.CannotCreateTransactionException;
 import org.springframework.transaction.IllegalTransactionStateException;
@@ -317,31 +315,6 @@ class R2dbcTransactionManagerTests {
 		verify(connectionMock).close();
 	}

-	@Test
-	void testCommitAndRollbackFails() {
-		when(connectionMock.isAutoCommit()).thenReturn(false);
-		when(connectionMock.commitTransaction()).thenReturn(Mono.defer(() ->
-				Mono.error(new R2dbcBadGrammarException("Commit should fail"))));
-		when(connectionMock.rollbackTransaction()).thenReturn(Mono.defer(() ->
-				Mono.error(new R2dbcTransientResourceException("Rollback should also fail"))));
-
-		TransactionalOperator operator = TransactionalOperator.create(tm);
-
-		ConnectionFactoryUtils.getConnection(connectionFactoryMock)
-				.doOnNext(connection -> connection.createStatement("foo")).then()
-				.as(operator::transactional)
-				.as(StepVerifier::create)
-				.verifyError(TransientDataAccessResourceException.class);
-
-		verify(connectionMock).isAutoCommit();
-		verify(connectionMock).beginTransaction(any(io.r2dbc.spi.TransactionDefinition.class));
-		verify(connectionMock).createStatement("foo");
-		verify(connectionMock).commitTransaction();
-		verify(connectionMock).rollbackTransaction();
-		verify(connectionMock).close();
-		verifyNoMoreInteractions(connectionMock);
-	}
-
 	@Test
 	void testTransactionSetRollbackOnly() {
 		when(connectionMock.isAutoCommit()).thenReturn(false);
@@ -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.
@@ -671,12 +671,7 @@ public class MockHttpServletResponse implements HttpServletResponse {

 	@Override
 	public void setHeader(String name, @Nullable String value) {
-		if (value == null) {
-			this.headers.remove(name);
-		}
-		else {
-			setHeaderValue(name, value);
-		}
+		setHeaderValue(name, value);
 	}

 	@Override
@@ -728,17 +723,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 		else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
 			String contentLanguages = value.toString();
-			// only set the locale if we replace the header or if there was none before
-			if (replaceHeader || !this.headers.containsKey(HttpHeaders.CONTENT_LANGUAGE)) {
-				HttpHeaders headers = new HttpHeaders();
-				headers.add(HttpHeaders.CONTENT_LANGUAGE, contentLanguages);
-				Locale language = headers.getContentLanguage();
-				this.locale = language != null ? language : Locale.getDefault();
-				doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, replaceHeader);
-			}
-			else {
-				doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, false);
-			}
+			HttpHeaders headers = new HttpHeaders();
+			headers.add(HttpHeaders.CONTENT_LANGUAGE, contentLanguages);
+			Locale language = headers.getContentLanguage();
+			setLocale(language != null ? language : Locale.getDefault());
+			// Since setLocale() sets the Content-Language header to the given
+			// single Locale, we have to explicitly set the Content-Language header
+			// to the user-provided value.
+			doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, true);
 			return true;
 		}
 		else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {
@@ -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.
@@ -389,8 +389,8 @@ public class TestContextManager {
 	 * have executed, the first caught exception will be rethrown with any
 	 * subsequent exceptions {@linkplain Throwable#addSuppressed suppressed} in
 	 * the first exception.
-	 * <p>Note that listeners will be executed in the opposite order in which they
-	 * were registered.
+	 * <p>Note that registered listeners will be executed in the opposite
+	 * order in which they were registered.
 	 * @param testInstance the current test instance
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
@@ -459,8 +459,7 @@ public class TestContextManager {
 	 * have executed, the first caught exception will be rethrown with any
 	 * subsequent exceptions {@linkplain Throwable#addSuppressed suppressed} in
 	 * the first exception.
-	 * <p>Note that listeners will be executed in the opposite order in which they
-	 * were registered.
+	 * <p>Note that registered listeners will be executed in the opposite
 	 * @param testInstance the current test instance
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
@@ -518,8 +517,7 @@ public class TestContextManager {
 	 * have executed, the first caught exception will be rethrown with any
 	 * subsequent exceptions {@linkplain Throwable#addSuppressed suppressed} in
 	 * the first exception.
-	 * <p>Note that listeners will be executed in the opposite order in which they
-	 * were registered.
+	 * <p>Note that registered listeners will be executed in the opposite
 	 * @throws Exception if a registered TestExecutionListener throws an exception
 	 * @since 3.0
 	 * @see #getTestExecutionListeners()
@@ -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.
@@ -87,18 +87,6 @@ class MockHttpServletResponseTests {
 		assertThat(response.containsHeader(headerName)).isFalse();
 	}

-	@ParameterizedTest
-	@ValueSource(strings = {
-			CONTENT_TYPE,
-			CONTENT_LANGUAGE,
-			"X-Test-Header"
-	})
-	void removeHeaderIfNullValue(String headerName) {
-		response.addHeader(headerName, "test");
-		response.setHeader(headerName, null);
-		assertThat(response.containsHeader(headerName)).isFalse();
-	}
-
 	@Test  // gh-26493
 	void setLocaleWithNullValue() {
 		assertThat(response.getLocale()).isEqualTo(Locale.getDefault());
@@ -631,12 +619,4 @@ class MockHttpServletResponseTests {
 		assertThat(contentTypeHeader).isEqualTo("text/plain");
 	}

-	@Test // gh-34488
-	void shouldAddMultipleContentLanguage() {
-		response.addHeader("Content-Language", "en");
-		response.addHeader("Content-Language", "fr");
-		assertThat(response.getHeaders("Content-Language")).contains("en", "fr");
-		assertThat(response.getLocale()).isEqualTo(Locale.ENGLISH);
-	}
-
 }
@@ -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.
@@ -494,17 +494,21 @@ public abstract class AbstractReactiveTransactionManager
 								}));
 					}
 					else if (ErrorPredicates.RUNTIME_OR_ERROR.test(ex)) {
-						Mono<Void> mono = Mono.empty();
+						Mono<Void> mono;
 						if (!beforeCompletionInvoked.get()) {
 							mono = triggerBeforeCompletion(synchronizationManager, status);
 						}
+						else {
+							mono = Mono.empty();
+						}
 						result = mono.then(doRollbackOnCommitException(synchronizationManager, status, ex))
 								.then(propagateException);
 					}
+
 					return result;
 				})
 				.then(Mono.defer(() -> triggerAfterCommit(synchronizationManager, status).onErrorResume(ex ->
-								triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_COMMITTED).then(Mono.error(ex)))
+						triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_COMMITTED).then(Mono.error(ex)))
 						.then(triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_COMMITTED))
 						.then(Mono.defer(() -> {
 							if (status.isNewTransaction()) {
@@ -514,8 +518,8 @@ public abstract class AbstractReactiveTransactionManager
 						}))));

 		return commit
-				.onErrorResume(ex -> cleanupAfterCompletion(synchronizationManager, status).then(Mono.error(ex)))
-				.then(cleanupAfterCompletion(synchronizationManager, status));
+				.onErrorResume(ex -> cleanupAfterCompletion(synchronizationManager, status)
+						.then(Mono.error(ex))).then(cleanupAfterCompletion(synchronizationManager, status));
 	}

 	/**
@@ -567,8 +571,8 @@ public abstract class AbstractReactiveTransactionManager
 				}
 				return beforeCompletion;
 			}
-		})).onErrorResume(ErrorPredicates.RUNTIME_OR_ERROR, ex ->
-						triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_UNKNOWN)
+		})).onErrorResume(ErrorPredicates.RUNTIME_OR_ERROR, ex -> triggerAfterCompletion(
+				synchronizationManager, status, TransactionSynchronization.STATUS_UNKNOWN)
 						.then(Mono.defer(() -> {
 							if (status.isNewTransaction()) {
 								this.transactionExecutionListeners.forEach(listener -> listener.afterRollback(status, ex));
@@ -619,7 +623,7 @@ public abstract class AbstractReactiveTransactionManager
 						return Mono.empty();
 					}))
 					.then(Mono.error(rbex));
-		}).then(Mono.defer(() -> triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_ROLLED_BACK)))
+		}).then(triggerAfterCompletion(synchronizationManager, status, TransactionSynchronization.STATUS_ROLLED_BACK))
 				.then(Mono.defer(() -> {
 					this.transactionExecutionListeners.forEach(listener -> listener.afterRollback(status, null));
 					return Mono.empty();
@@ -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.
@@ -139,7 +139,6 @@ final class DefaultRestClient implements RestClient {
 		this.builder = builder;
 	}

-
 	@Override
 	public RequestHeadersUriSpec<?> get() {
 		return methodInternal(HttpMethod.GET);
@@ -273,6 +272,8 @@ final class DefaultRestClient implements RestClient {
 	}


+
+
 	private class DefaultRequestBodyUriSpec implements RequestBodyUriSpec {

 		private final HttpMethod httpMethod;
@@ -451,6 +452,7 @@ final class DefaultRestClient implements RestClient {
 			}
 		}

+
 		@Override
 		public ResponseSpec retrieve() {
 			ResponseSpec responseSpec = exchangeInternal(DefaultResponseSpec::new, false);
@@ -782,6 +784,8 @@ final class DefaultRestClient implements RestClient {
 			this.observationScope.close();
 			this.observation.stop();
 		}
+
 	}

+
 }
@@ -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.
@@ -288,8 +288,55 @@ public class DeferredResult<T> {
 	}


-	final DeferredResultProcessingInterceptor getLifecycleInterceptor() {
-		return new LifecycleInterceptor();
+	final DeferredResultProcessingInterceptor getInterceptor() {
+		return new DeferredResultProcessingInterceptor() {
+			@Override
+			public <S> boolean handleTimeout(NativeWebRequest request, DeferredResult<S> deferredResult) {
+				boolean continueProcessing = true;
+				try {
+					if (timeoutCallback != null) {
+						timeoutCallback.run();
+					}
+				}
+				finally {
+					Object value = timeoutResult.get();
+					if (value != RESULT_NONE) {
+						continueProcessing = false;
+						try {
+							setResultInternal(value);
+						}
+						catch (Throwable ex) {
+							logger.debug("Failed to handle timeout result", ex);
+						}
+					}
+				}
+				return continueProcessing;
+			}
+			@Override
+			public <S> boolean handleError(NativeWebRequest request, DeferredResult<S> deferredResult, Throwable t) {
+				try {
+					if (errorCallback != null) {
+						errorCallback.accept(t);
+					}
+				}
+				finally {
+					try {
+						setResultInternal(t);
+					}
+					catch (Throwable ex) {
+						logger.debug("Failed to handle error result", ex);
+					}
+				}
+				return false;
+			}
+			@Override
+			public <S> void afterCompletion(NativeWebRequest request, DeferredResult<S> deferredResult) {
+				expired = true;
+				if (completionCallback != null) {
+					completionCallback.run();
+				}
+			}
+		};
 	}


@@ -302,61 +349,4 @@ public class DeferredResult<T> {
 		void handleResult(@Nullable Object result);
 	}

-
-	/**
-	 * Instance interceptor to receive Servlet container notifications.
-	 */
-	private class LifecycleInterceptor implements DeferredResultProcessingInterceptor {
-
-		@Override
-		public <S> boolean handleTimeout(NativeWebRequest request, DeferredResult<S> result) {
-			boolean continueProcessing = true;
-			try {
-				if (timeoutCallback != null) {
-					timeoutCallback.run();
-				}
-			}
-			finally {
-				Object value = timeoutResult.get();
-				if (value != RESULT_NONE) {
-					continueProcessing = false;
-					try {
-						setResultInternal(value);
-					}
-					catch (Throwable ex) {
-						logger.debug("Failed to handle timeout result", ex);
-					}
-				}
-			}
-			return continueProcessing;
-		}
-
-		@Override
-		public <S> boolean handleError(NativeWebRequest request, DeferredResult<S> result, Throwable t) {
-			try {
-				if (errorCallback != null) {
-					errorCallback.accept(t);
-				}
-			}
-			finally {
-				try {
-					setResultInternal(t);
-				}
-				catch (Throwable ex) {
-					logger.debug("Failed to handle error result", ex);
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public <S> void afterCompletion(NativeWebRequest request, DeferredResult<S> result) {
-			expired = true;
-			if (completionCallback != null) {
-				completionCallback.run();
-			}
-		}
-
-	}
-
 }
@@ -382,6 +382,36 @@ public final class WebAsyncManager {
 		}
 	}

+	private void setConcurrentResultAndDispatch(@Nullable Object result) {
+		Assert.state(this.asyncWebRequest != null, "AsyncWebRequest must not be null");
+		synchronized (WebAsyncManager.this) {
+			if (!this.state.compareAndSet(State.ASYNC_PROCESSING, State.RESULT_SET)) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Async result already set: [" + this.state.get() +
+							"], ignored result for " + formatUri(this.asyncWebRequest));
+				}
+				return;
+			}
+
+			this.concurrentResult = result;
+			if (logger.isDebugEnabled()) {
+				logger.debug("Async result set for " + formatUri(this.asyncWebRequest));
+			}
+
+			if (this.asyncWebRequest.isAsyncComplete()) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Async request already completed for " + formatUri(this.asyncWebRequest));
+				}
+				return;
+			}
+
+			if (logger.isDebugEnabled()) {
+				logger.debug("Performing async dispatch for " + formatUri(this.asyncWebRequest));
+			}
+			this.asyncWebRequest.dispatch();
+		}
+	}
+
 	/**
 	 * Start concurrent request processing and initialize the given
 	 * {@link DeferredResult} with a {@link DeferredResultHandler} that saves
@@ -413,7 +443,7 @@ public final class WebAsyncManager {
 		}

 		List<DeferredResultProcessingInterceptor> interceptors = new ArrayList<>();
-		interceptors.add(deferredResult.getLifecycleInterceptor());
+		interceptors.add(deferredResult.getInterceptor());
 		interceptors.addAll(this.deferredResultInterceptors.values());
 		interceptors.add(timeoutDeferredResultInterceptor);

@@ -425,11 +455,6 @@ public final class WebAsyncManager {
 			}
 			try {
 				interceptorChain.triggerAfterTimeout(this.asyncWebRequest, deferredResult);
-				synchronized (WebAsyncManager.this) {
-					// If application thread set the DeferredResult first in a race,
-					// we must still not return until setConcurrentResultAndDispatch is done
-					return;
-				}
 			}
 			catch (Throwable ex) {
 				setConcurrentResultAndDispatch(ex);
@@ -441,12 +466,10 @@ public final class WebAsyncManager {
 				logger.debug("Servlet container error notification for " + formatUri(this.asyncWebRequest));
 			}
 			try {
-				interceptorChain.triggerAfterError(this.asyncWebRequest, deferredResult, ex);
-				synchronized (WebAsyncManager.this) {
-					// If application thread set the DeferredResult first in a race,
-					// we must still not return until setConcurrentResultAndDispatch is done
+				if (!interceptorChain.triggerAfterError(this.asyncWebRequest, deferredResult, ex)) {
 					return;
 				}
+				deferredResult.setErrorResult(ex);
 			}
 			catch (Throwable interceptorEx) {
 				setConcurrentResultAndDispatch(interceptorEx);
@@ -485,36 +508,6 @@ public final class WebAsyncManager {
 		this.asyncWebRequest.startAsync();
 	}

-	private void setConcurrentResultAndDispatch(@Nullable Object result) {
-		Assert.state(this.asyncWebRequest != null, "AsyncWebRequest must not be null");
-		synchronized (WebAsyncManager.this) {
-			if (!this.state.compareAndSet(State.ASYNC_PROCESSING, State.RESULT_SET)) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Async result already set: [" + this.state.get() + "], " +
-							"ignored result for " + formatUri(this.asyncWebRequest));
-				}
-				return;
-			}
-
-			this.concurrentResult = result;
-			if (logger.isDebugEnabled()) {
-				logger.debug("Async result set for " + formatUri(this.asyncWebRequest));
-			}
-
-			if (this.asyncWebRequest.isAsyncComplete()) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Async request already completed for " + formatUri(this.asyncWebRequest));
-				}
-				return;
-			}
-
-			if (logger.isDebugEnabled()) {
-				logger.debug("Performing async dispatch for " + formatUri(this.asyncWebRequest));
-			}
-			this.asyncWebRequest.dispatch();
-		}
-	}
-
 	private static String formatUri(AsyncWebRequest asyncWebRequest) {
 		HttpServletRequest request = asyncWebRequest.getNativeRequest(HttpServletRequest.class);
 		return (request != null ? "\"" + request.getRequestURI() + "\"" : "servlet container");
@@ -524,13 +517,13 @@ public final class WebAsyncManager {
 	/**
 	 * Represents a state for {@link WebAsyncManager} to be in.
 	 * <p><pre>
-	 *     +------> NOT_STARTED <------+
-	 *     |             |             |
-	 *     |             v             |
-	 *     |      ASYNC_PROCESSING     |
-	 *     |             |             |
-	 *     |             v             |
-	 *     <-------+ RESULT_SET -------+
+	 *        NOT_STARTED <------+
+	 *             |             |
+	 *             v             |
+	 *      ASYNC_PROCESSING     |
+	 *             |             |
+	 *             v             |
+	 *         RESULT_SET -------+
 	 * </pre>
 	 * @since 5.3.33
 	 */
@@ -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.
@@ -296,7 +296,14 @@ public class CorsConfiguration {
 	 * allowCredentials} is set to {@code true}, that combination is handled
 	 * by copying the method specified in the CORS preflight request.
 	 * <p>If not set, only {@code "GET"} and {@code "HEAD"} are allowed.
-	 * <p>By default, this is not set.
+	 * <p>By default this is not set.
+	 * <p><strong>Note:</strong> CORS checks use values from "Forwarded"
+	 * (<a href="https://tools.ietf.org/html/rfc7239">RFC 7239</a>),
+	 * "X-Forwarded-Host", "X-Forwarded-Port", and "X-Forwarded-Proto" headers,
+	 * if present, in order to reflect the client-originated address.
+	 * Consider using the {@code ForwardedHeaderFilter} in order to choose from a
+	 * central place whether to extract and use, or to discard such headers.
+	 * See the Spring Framework reference for more on this filter.
 	 */
 	public void setAllowedMethods(@Nullable List<String> allowedMethods) {
 		this.allowedMethods = (allowedMethods != null ? new ArrayList<>(allowedMethods) : null);
@@ -448,7 +455,7 @@ public class CorsConfiguration {
 	 * level of trust with the configured domains and also increases the surface
 	 * attack of the web application by exposing sensitive user-specific
 	 * information such as cookies and CSRF tokens.
-	 * <p>By default, this is not set (i.e. user credentials are not supported).
+	 * <p>By default this is not set (i.e. user credentials are not supported).
 	 */
 	public void setAllowCredentials(@Nullable Boolean allowCredentials) {
 		this.allowCredentials = allowCredentials;
@@ -472,7 +479,7 @@ public class CorsConfiguration {
 	 * <p>Setting this property has an impact on how {@link #setAllowedOrigins(List)
 	 * origins} and {@link #setAllowedOriginPatterns(List) originPatterns} are processed,
 	 * see related API documentation for more details.
-	 * <p>By default, this is not set (i.e. private network access is not supported).
+	 * <p>By default this is not set (i.e. private network access is not supported).
 	 * @since 5.3.32
 	 * @see <a href="https://wicg.github.io/private-network-access/">Private network access specifications</a>
 	 */
@@ -164,13 +164,7 @@ public class ContentCachingResponseWrapper extends HttpServletResponseWrapper {
 	@Override
 	public void setHeader(String name, String value) {
 		if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) {
-			if (value != null) {
-				this.contentLength = toContentLengthInt(Long.parseLong(value));
-			}
-			else {
-				this.contentLength = null;
-				super.setHeader(name, null);
-			}
+			this.contentLength = toContentLengthInt(Long.parseLong(value));
 		}
 		else {
 			super.setHeader(name, value);
@@ -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.
@@ -16,7 +16,6 @@

 package org.springframework.web.util;

-import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;

@@ -25,14 +24,12 @@ import org.apache.commons.logging.LogFactory;

 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;

 /**
- * Utility methods to assist with identifying and logging exceptions that
- * indicate the server response connection is lost, for example because the
- * client has gone away. This class helps to identify such exceptions and
- * minimize logging to a single line at DEBUG level, while making the full
- * error stacktrace at TRACE level.
+ * Utility methods to assist with identifying and logging exceptions that indicate
+ * the client has gone away. Such exceptions fill logs with unnecessary stack
+ * traces. The utility methods help to log a single line message at DEBUG level,
+ * and a full stacktrace at TRACE level.
 *
 * @author Rossen Stoyanchev
 * @since 6.1
@@ -40,28 +37,12 @@ import org.springframework.util.ClassUtils;
 public class DisconnectedClientHelper {

 	private static final Set<String> EXCEPTION_PHRASES =
-			Set.of("broken pipe", "connection reset by peer");
+			Set.of("broken pipe", "connection reset");

 	private static final Set<String> EXCEPTION_TYPE_NAMES =
 			Set.of("AbortedException", "ClientAbortException",
 					"EOFException", "EofException", "AsyncRequestNotUsableException");

-	private static final Set<Class<?>> CLIENT_EXCEPTION_TYPES = new HashSet<>(2);
-
-	static {
-		try {
-			ClassLoader classLoader = DisconnectedClientHelper.class.getClassLoader();
-			CLIENT_EXCEPTION_TYPES.add(ClassUtils.forName(
-					"org.springframework.web.client.RestClientException", classLoader));
-			CLIENT_EXCEPTION_TYPES.add(ClassUtils.forName(
-					"org.springframework.web.reactive.function.client.WebClientException", classLoader));
-		}
-		catch (ClassNotFoundException ex) {
-			// ignore
-		}
-	}
-
-
 	private final Log logger;


@@ -98,25 +79,10 @@ public class DisconnectedClientHelper {
 	 * <li>ClientAbortException or EOFException for Tomcat
 	 * <li>EofException for Jetty
 	 * <li>IOException "Broken pipe" or "connection reset by peer"
+	 * <li>SocketException "Connection reset"
 	 * </ul>
 	 */
 	public static boolean isClientDisconnectedException(Throwable ex) {
-		Throwable currentEx = ex;
-		Throwable lastEx = null;
-		while (currentEx != null && currentEx != lastEx) {
-			// Ignore onward connection issues to other servers (500 error)
-			for (Class<?> exceptionType : CLIENT_EXCEPTION_TYPES) {
-				if (exceptionType.isInstance(currentEx)) {
-					return false;
-				}
-			}
-			if (EXCEPTION_TYPE_NAMES.contains(currentEx.getClass().getSimpleName())) {
-				return true;
-			}
-			lastEx = currentEx;
-			currentEx = currentEx.getCause();
-		}
-
 		String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
 		if (message != null) {
 			String text = message.toLowerCase(Locale.ROOT);
@@ -126,8 +92,7 @@ public class DisconnectedClientHelper {
 				}
 			}
 		}
-
-		return false;
+		return EXCEPTION_TYPE_NAMES.contains(ex.getClass().getSimpleName());
 	}

 }
@@ -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.
@@ -93,7 +93,7 @@ class DeferredResultTests {
 		DeferredResult<String> result = new DeferredResult<>();
 		result.onCompletion(() -> sb.append("completion event"));

-		result.getLifecycleInterceptor().afterCompletion(null, null);
+		result.getInterceptor().afterCompletion(null, null);

 		assertThat(result.isSetOrExpired()).isTrue();
 		assertThat(sb.toString()).isEqualTo("completion event");
@@ -109,7 +109,7 @@ class DeferredResultTests {
 		result.setResultHandler(handler);
 		result.onTimeout(() -> sb.append("timeout event"));

-		result.getLifecycleInterceptor().handleTimeout(null, null);
+		result.getInterceptor().handleTimeout(null, null);

 		assertThat(sb.toString()).isEqualTo("timeout event");
 		assertThat(result.setResult("hello")).as("Should not be able to set result a second time").isFalse();
@@ -127,7 +127,7 @@ class DeferredResultTests {
 		Exception e = new Exception();
 		result.onError(t -> sb.append("error event"));

-		result.getLifecycleInterceptor().handleError(null, null, e);
+		result.getInterceptor().handleError(null, null, e);

 		assertThat(sb.toString()).isEqualTo("error event");
 		assertThat(result.setResult("hello")).as("Should not be able to set result a second time").isFalse();
@@ -270,17 +270,6 @@ class ContentCachingResponseWrapperTests {
 				.withMessageContaining(overflow);
 	}

-	@Test
-	void setContentLengthNull() {
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper(response);
-		responseWrapper.setContentLength(1024);
-		responseWrapper.setHeader(CONTENT_LENGTH, null);
-
-		assertThat(response.getHeaderNames()).doesNotContain(CONTENT_LENGTH);
-		assertThat(responseWrapper.getHeader(CONTENT_LENGTH)).isNull();
-	}
-

 	private void assertHeader(HttpServletResponse response, String header, int value) {
 		assertHeader(response, header, Integer.toString(value));
@@ -1,93 +0,0 @@
-/*
- * Copyright 2002-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.util;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.catalina.connector.ClientAbortException;
-import org.eclipse.jetty.io.EofException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
-import reactor.netty.channel.AbortedException;
-
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.web.client.ResourceAccessException;
-import org.springframework.web.context.request.async.AsyncRequestNotUsableException;
-import org.springframework.web.testfixture.http.MockHttpInputMessage;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Unit tests for {@link DisconnectedClientHelper}.
- * @author Rossen Stoyanchev
- */
-public class DisconnectedClientHelperTests {
-
-	@ParameterizedTest
-	@ValueSource(strings = {"broKen pipe", "connection reset By peer"})
-	void exceptionPhrases(String phrase) {
-		Exception ex = new IOException(phrase);
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isTrue();
-
-		ex = new IOException(ex);
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isTrue();
-	}
-
-	@Test
-	void connectionResetExcluded() {
-		Exception ex = new IOException("connection reset");
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isFalse();
-	}
-
-	@ParameterizedTest
-	@MethodSource("disconnectedExceptions")
-	void name(Exception ex) {
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isTrue();
-	}
-
-	static List<Exception> disconnectedExceptions() {
-		return List.of(
-				new AbortedException(""), new ClientAbortException(""),
-				new EOFException(), new EofException(), new AsyncRequestNotUsableException(""));
-	}
-
-	@Test // gh-33064
-	void nestedDisconnectedException() {
-		Exception ex = new HttpMessageNotReadableException(
-				"I/O error while reading input message", new ClientAbortException(),
-				new MockHttpInputMessage(new byte[0]));
-
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isTrue();
-	}
-
-	@Test // gh-34264
-	void onwardClientDisconnectedExceptionPhrase() {
-		Exception ex = new ResourceAccessException("I/O error", new EOFException("Connection reset by peer"));
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isFalse();
-	}
-
-	@Test
-	void onwardClientDisconnectedExceptionType() {
-		Exception ex = new ResourceAccessException("I/O error", new EOFException());
-		assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isFalse();
-	}
-
-}
@@ -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.
@@ -671,12 +671,7 @@ public class MockHttpServletResponse implements HttpServletResponse {

 	@Override
 	public void setHeader(String name, @Nullable String value) {
-		if (value == null) {
-			this.headers.remove(name);
-		}
-		else {
-			setHeaderValue(name, value);
-		}
+		setHeaderValue(name, value);
 	}

 	@Override
@@ -728,17 +723,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 		else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) {
 			String contentLanguages = value.toString();
-			// only set the locale if we replace the header or if there was none before
-			if (replaceHeader || !this.headers.containsKey(HttpHeaders.CONTENT_LANGUAGE)) {
-				HttpHeaders headers = new HttpHeaders();
-				headers.add(HttpHeaders.CONTENT_LANGUAGE, contentLanguages);
-				Locale language = headers.getContentLanguage();
-				this.locale = language != null ? language : Locale.getDefault();
-				doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, replaceHeader);
-			}
-			else {
-				doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, false);
-			}
+			HttpHeaders headers = new HttpHeaders();
+			headers.add(HttpHeaders.CONTENT_LANGUAGE, contentLanguages);
+			Locale language = headers.getContentLanguage();
+			setLocale(language != null ? language : Locale.getDefault());
+			// Since setLocale() sets the Content-Language header to the given
+			// single Locale, we have to explicitly set the Content-Language header
+			// to the user-provided value.
+			doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, contentLanguages, true);
 			return true;
 		}
 		else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {
@@ -28,6 +28,8 @@ import java.util.Map;
 import freemarker.template.Configuration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;

@@ -123,6 +125,12 @@ class FreeMarkerMacroTests {

 	}

+	@Test
+	@DisabledForJreRange(min = JRE.JAVA_21)
+	public void age() throws Exception {
+		testMacroOutput("AGE", "99");
+	}
+
 	@Test
 	void message() throws Exception {
 		testMacroOutput("MESSAGE", "Howdy Mundo");
@@ -6,6 +6,9 @@ test template for FreeMarker macro support
 NAME
 ${command.name}

+AGE
+${command.age}
+
 MESSAGE
 <@spring.message "hello"/> <@spring.message "world"/>

@@ -401,13 +401,16 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 			RootBeanDefinition handlerMappingDef, Element element, ParserContext context) {

 		Element pathMatchingElement = DomUtils.getChildElementByTagName(element, "path-matching");
-		Object source = context.extractSource(element);
 		if (pathMatchingElement != null) {
+			Object source = context.extractSource(element);
+
 			if (pathMatchingElement.hasAttribute("trailing-slash")) {
 				boolean useTrailingSlashMatch = Boolean.parseBoolean(pathMatchingElement.getAttribute("trailing-slash"));
 				handlerMappingDef.getPropertyValues().add("useTrailingSlashMatch", useTrailingSlashMatch);
 			}
+
 			boolean preferPathMatcher = false;
+
 			if (pathMatchingElement.hasAttribute("suffix-pattern")) {
 				boolean useSuffixPatternMatch = Boolean.parseBoolean(pathMatchingElement.getAttribute("suffix-pattern"));
 				handlerMappingDef.getPropertyValues().add("useSuffixPatternMatch", useSuffixPatternMatch);
@@ -432,20 +435,12 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 				pathMatcherRef = new RuntimeBeanReference(pathMatchingElement.getAttribute("path-matcher"));
 				preferPathMatcher = true;
 			}
+			pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(pathMatcherRef, context, source);
+			handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef);
+
 			if (preferPathMatcher) {
-				pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(pathMatcherRef, context, source);
-				handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef);
 				handlerMappingDef.getPropertyValues().add("patternParser", null);
 			}
-			else if (pathMatchingElement.hasAttribute("pattern-parser")) {
-				RuntimeBeanReference patternParserRef = new RuntimeBeanReference(pathMatchingElement.getAttribute("pattern-parser"));
-				patternParserRef = MvcNamespaceUtils.registerPatternParser(patternParserRef, context, source);
-				handlerMappingDef.getPropertyValues().add("patternParser", patternParserRef);
-			}
-		}
-		else {
-			RuntimeBeanReference pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(null, context, source);
-			handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef);
 		}

 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -28,11 +28,9 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.lang.Nullable;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.Assert;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.web.servlet.handler.AbstractHandlerMapping;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
 import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
 import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
@@ -41,7 +39,6 @@ import org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter;
 import org.springframework.web.servlet.support.SessionFlashMapManager;
 import org.springframework.web.servlet.view.DefaultRequestToViewNameTranslator;
 import org.springframework.web.util.UrlPathHelper;
-import org.springframework.web.util.pattern.PathPatternParser;

 /**
 * Convenience methods for use in MVC namespace BeanDefinitionParsers.
@@ -67,8 +64,6 @@ public abstract class MvcNamespaceUtils {

 	private static final String PATH_MATCHER_BEAN_NAME = "mvcPathMatcher";

-	private static final String PATTERN_PARSER_BEAN_NAME = "mvcPatternParser";
-
 	private static final String CORS_CONFIGURATION_BEAN_NAME = "mvcCorsConfigurations";

 	private static final String HANDLER_MAPPING_INTROSPECTOR_BEAN_NAME = "mvcHandlerMappingIntrospector";
@@ -110,18 +105,6 @@ public abstract class MvcNamespaceUtils {
 		return new RuntimeBeanReference(URL_PATH_HELPER_BEAN_NAME);
 	}

-	/**
-	 * Return the {@link PathMatcher} bean definition if it has been registered
-	 * in the context as an alias with its well-known name, or {@code null}.
-	 */
-	@Nullable
-	static RuntimeBeanReference getCustomPathMatcher(ParserContext context) {
-		if(context.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME)) {
-			return new RuntimeBeanReference(PATH_MATCHER_BEAN_NAME);
-		}
-		return null;
-	}
-
 	/**
 	 * Adds an alias to an existing well-known name or registers a new instance of a {@link PathMatcher}
 	 * under that well-known name, unless already registered.
@@ -134,9 +117,6 @@ public abstract class MvcNamespaceUtils {
 			if (context.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME)) {
 				context.getRegistry().removeAlias(PATH_MATCHER_BEAN_NAME);
 			}
-			if (context.getRegistry().containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
-				context.getRegistry().removeBeanDefinition(PATH_MATCHER_BEAN_NAME);
-			}
 			context.getRegistry().registerAlias(pathMatcherRef.getBeanName(), PATH_MATCHER_BEAN_NAME);
 		}
 		else if (!context.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME) &&
@@ -150,60 +130,6 @@ public abstract class MvcNamespaceUtils {
 		return new RuntimeBeanReference(PATH_MATCHER_BEAN_NAME);
 	}

-	/**
-	 * Return the {@link PathPatternParser} bean definition if it has been registered
-	 * in the context as an alias with its well-known name, or {@code null}.
-	 */
-	@Nullable
-	static RuntimeBeanReference getCustomPatternParser(ParserContext context) {
-		if (context.getRegistry().isAlias(PATTERN_PARSER_BEAN_NAME)) {
-			return new RuntimeBeanReference(PATTERN_PARSER_BEAN_NAME);
-		}
-		return null;
-	}
-
-	/**
-	 * Adds an alias to an existing well-known name or registers a new instance of a {@link PathPatternParser}
-	 * under that well-known name, unless already registered.
-	 * @return a RuntimeBeanReference to this {@link PathPatternParser} instance
-	 */
-	public static RuntimeBeanReference registerPatternParser(@Nullable RuntimeBeanReference patternParserRef,
-			ParserContext context, @Nullable Object source) {
-		if (patternParserRef != null) {
-			if (context.getRegistry().isAlias(PATTERN_PARSER_BEAN_NAME)) {
-				context.getRegistry().removeAlias(PATTERN_PARSER_BEAN_NAME);
-			}
-			context.getRegistry().registerAlias(patternParserRef.getBeanName(), PATTERN_PARSER_BEAN_NAME);
-		}
-		else if (!context.getRegistry().isAlias(PATTERN_PARSER_BEAN_NAME) &&
-				!context.getRegistry().containsBeanDefinition(PATTERN_PARSER_BEAN_NAME)) {
-			RootBeanDefinition pathMatcherDef = new RootBeanDefinition(PathPatternParser.class);
-			pathMatcherDef.setSource(source);
-			pathMatcherDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-			context.getRegistry().registerBeanDefinition(PATTERN_PARSER_BEAN_NAME, pathMatcherDef);
-			context.registerComponent(new BeanComponentDefinition(pathMatcherDef, PATTERN_PARSER_BEAN_NAME));
-		}
-		return new RuntimeBeanReference(PATTERN_PARSER_BEAN_NAME);
-	}
-
-	static void configurePathMatching(RootBeanDefinition handlerMappingDef, ParserContext context, @Nullable Object source) {
-		Assert.isTrue(AbstractHandlerMapping.class.isAssignableFrom(handlerMappingDef.getBeanClass()),
-				() -> "Handler mapping type [" + handlerMappingDef.getTargetType() + "] not supported");
-		RuntimeBeanReference customPathMatcherRef = MvcNamespaceUtils.getCustomPathMatcher(context);
-		RuntimeBeanReference customPatternParserRef = MvcNamespaceUtils.getCustomPatternParser(context);
-		if (customPathMatcherRef != null) {
-			handlerMappingDef.getPropertyValues().add("pathMatcher", customPathMatcherRef)
-					.add("patternParser", null);
-		}
-		else if (customPatternParserRef != null) {
-			handlerMappingDef.getPropertyValues().add("patternParser", customPatternParserRef);
-		}
-		else {
-			handlerMappingDef.getPropertyValues().add("pathMatcher",
-					MvcNamespaceUtils.registerPathMatcher(null, context, source));
-		}
-	}
-
 	/**
 	 * Registers an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
@@ -216,7 +142,6 @@ public abstract class MvcNamespaceUtils {
 			mappingDef.getPropertyValues().add("order", 2);	// consistent with WebMvcConfigurationSupport
 			RuntimeBeanReference corsRef = MvcNamespaceUtils.registerCorsConfigurations(null, context, source);
 			mappingDef.getPropertyValues().add("corsConfigurations", corsRef);
-			configurePathMatching(mappingDef, context, source);
 			context.getRegistry().registerBeanDefinition(BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME, mappingDef);
 			context.registerComponent(new BeanComponentDefinition(mappingDef, BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME));
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -92,6 +92,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser {

 		registerUrlProvider(context, source);

+		RuntimeBeanReference pathMatcherRef = MvcNamespaceUtils.registerPathMatcher(null, context, source);
 		RuntimeBeanReference pathHelperRef = MvcNamespaceUtils.registerUrlPathHelper(null, context, source);

 		String resourceHandlerName = registerResourceHandler(context, element, pathHelperRef, source);
@@ -110,8 +111,8 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser {
 		RootBeanDefinition handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
 		handlerMappingDef.setSource(source);
 		handlerMappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-		handlerMappingDef.getPropertyValues().add("urlMap", urlMap).add("urlPathHelper", pathHelperRef);
-		MvcNamespaceUtils.configurePathMatching(handlerMappingDef, context, source);
+		handlerMappingDef.getPropertyValues().add("urlMap", urlMap);
+		handlerMappingDef.getPropertyValues().add("pathMatcher", pathMatcherRef).add("urlPathHelper", pathHelperRef);

 		String orderValue = element.getAttribute("order");
 		// Use a default of near-lowest precedence, still allowing for even lower precedence in other mappings
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -123,7 +123,7 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {

 		beanDef.setSource(source);
 		beanDef.getPropertyValues().add("order", "1");
-		MvcNamespaceUtils.configurePathMatching(beanDef, context, source);
+		beanDef.getPropertyValues().add("pathMatcher", MvcNamespaceUtils.registerPathMatcher(null, context, source));
 		beanDef.getPropertyValues().add("urlPathHelper", MvcNamespaceUtils.registerUrlPathHelper(null, context, source));
 		RuntimeBeanReference corsConfigurationsRef = MvcNamespaceUtils.registerCorsConfigurations(null, context, source);
 		beanDef.getPropertyValues().add("corsConfigurations", corsConfigurationsRef);
@@ -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.
@@ -29,7 +29,6 @@ import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

-import org.springframework.aot.AotDetector;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.cglib.core.SpringNamingPolicy;
@@ -85,12 +84,13 @@ import org.springframework.web.util.pattern.PathPatternParser;
 * {@link #relativeTo(org.springframework.web.util.UriComponentsBuilder)}.
 * </ul>
 *
- * <p><strong>Note:</strong> As of 5.1, methods in this class do not extract
- * {@code "Forwarded"} and {@code "X-Forwarded-*"} headers that specify the
- * client-originated address. Please, use
- * {@link org.springframework.web.filter.ForwardedHeaderFilter
- * ForwardedHeaderFilter}, or similar from the underlying server, to extract
- * and use such headers, or to discard them.
+ * <p><strong>Note:</strong> This class uses values from "Forwarded"
+ * (<a href="https://tools.ietf.org/html/rfc7239">RFC 7239</a>),
+ * "X-Forwarded-Host", "X-Forwarded-Port", and "X-Forwarded-Proto" headers,
+ * if present, in order to reflect the client-originated protocol and address.
+ * Consider using the {@code ForwardedHeaderFilter} in order to choose from a
+ * central place whether to extract and use, or to discard such headers.
+ * See the Spring Framework reference for more on this filter.
 *
 * @author Oliver Gierke
 * @author Rossen Stoyanchev
@@ -140,7 +140,7 @@ public class MvcUriComponentsBuilder {

 	/**
 	 * Create an instance of this class with a base URL. After that calls to one
-	 * of the instance based {@code withXxx(...)} methods will create URLs relative
+	 * of the instance based {@code withXxx(...}} methods will create URLs relative
 	 * to the given base URL.
 	 */
 	public static MvcUriComponentsBuilder relativeTo(UriComponentsBuilder baseUrl) {
@@ -152,6 +152,8 @@ public class MvcUriComponentsBuilder {
 	 * Create a {@link UriComponentsBuilder} from the mapping of a controller class
 	 * and current request information including Servlet mapping. If the controller
 	 * contains multiple mappings, only the first one is used.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param controllerType the controller to build a URI for
 	 * @return a UriComponentsBuilder instance (never {@code null})
 	 */
@@ -164,6 +166,8 @@ public class MvcUriComponentsBuilder {
 	 * {@code UriComponentsBuilder} representing the base URL. This is useful
 	 * when using MvcUriComponentsBuilder outside the context of processing a
 	 * request or to apply a custom baseUrl not matching the current request.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param builder the builder for the base URL; the builder will be cloned
 	 * and therefore not modified and may be re-used for further calls.
 	 * @param controllerType the controller to build a URI for
@@ -189,6 +193,8 @@ public class MvcUriComponentsBuilder {
 	 * Create a {@link UriComponentsBuilder} from the mapping of a controller
 	 * method and an array of method argument values. This method delegates
 	 * to {@link #fromMethod(Class, Method, Object...)}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param controllerType the controller
 	 * @param methodName the method name
 	 * @param args the argument values
@@ -208,6 +214,8 @@ public class MvcUriComponentsBuilder {
 	 * accepts a {@code UriComponentsBuilder} representing the base URL. This is
 	 * useful when using MvcUriComponentsBuilder outside the context of processing
 	 * a request or to apply a custom baseUrl not matching the current request.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param builder the builder for the base URL; the builder will be cloned
 	 * and therefore not modified and may be re-used for further calls.
 	 * @param controllerType the controller
@@ -232,6 +240,8 @@ public class MvcUriComponentsBuilder {
 	 * {@link org.springframework.web.method.support.UriComponentsContributor
 	 * UriComponentsContributor}) while remaining argument values are ignored and
 	 * can be {@code null}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param controllerType the controller type
 	 * @param method the controller method
 	 * @param args argument values for the controller method
@@ -248,6 +258,8 @@ public class MvcUriComponentsBuilder {
 	 * This is useful when using MvcUriComponentsBuilder outside the context of
 	 * processing a request or to apply a custom baseUrl not matching the
 	 * current request.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param baseUrl the builder for the base URL; the builder will be cloned
 	 * and therefore not modified and may be re-used for further calls.
 	 * @param controllerType the controller type
@@ -294,6 +306,8 @@ public class MvcUriComponentsBuilder {
 	 * controller.getAddressesForCountry("US")
 	 * builder = MvcUriComponentsBuilder.fromMethodCall(controller);
 	 * </pre>
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param info either the value returned from a "mock" controller
 	 * invocation or the "mock" controller itself after an invocation
 	 * @return a UriComponents instance
@@ -314,6 +328,8 @@ public class MvcUriComponentsBuilder {
 	 * {@code UriComponentsBuilder} representing the base URL. This is useful
 	 * when using MvcUriComponentsBuilder outside the context of processing a
 	 * request or to apply a custom baseUrl not matching the current request.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param builder the builder for the base URL; the builder will be cloned
 	 * and therefore not modified and may be re-used for further calls.
 	 * @param info either the value returned from a "mock" controller
@@ -339,6 +355,8 @@ public class MvcUriComponentsBuilder {
 	 * <pre class="code">
 	 * MvcUriComponentsBuilder.fromMethodCall(on(FooController.class).getFoo(1)).build();
 	 * </pre>
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param controllerType the target controller
 	 */
 	public static <T> T on(Class<T> controllerType) {
@@ -361,6 +379,8 @@ public class MvcUriComponentsBuilder {
 	 * fooController.saveFoo(2, null);
 	 * builder = MvcUriComponentsBuilder.fromMethodCall(fooController);
 	 * </pre>
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param controllerType the target controller
 	 */
 	public static <T> T controller(Class<T> controllerType) {
@@ -403,6 +423,9 @@ public class MvcUriComponentsBuilder {
 	 * </pre>
 	 * <p>Note that it's not necessary to specify all arguments. Only the ones
 	 * required to prepare the URL, mainly {@code @RequestParam} and {@code @PathVariable}).
+	 *
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param mappingName the mapping name
 	 * @return a builder to prepare the URI String
 	 * @throws IllegalArgumentException if the mapping name is not found or
@@ -418,6 +441,8 @@ public class MvcUriComponentsBuilder {
 	 * {@code UriComponentsBuilder} representing the base URL. This is useful
 	 * when using MvcUriComponentsBuilder outside the context of processing a
 	 * request or to apply a custom baseUrl not matching the current request.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @param builder the builder for the base URL; the builder will be cloned
 	 * and therefore not modified and may be re-used for further calls.
 	 * @param name the mapping name
@@ -457,6 +482,8 @@ public class MvcUriComponentsBuilder {
 	/**
 	 * An alternative to {@link #fromController(Class)} for use with an instance
 	 * of this class created via a call to {@link #relativeTo}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @since 4.2
 	 */
 	public UriComponentsBuilder withController(Class<?> controllerType) {
@@ -464,8 +491,10 @@ public class MvcUriComponentsBuilder {
 	}

 	/**
-	 * An alternative to {@link #fromMethodName(Class, String, Object...)} for
+	 * An alternative to {@link #fromMethodName(Class, String, Object...)}} for
 	 * use with an instance of this class created via {@link #relativeTo}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @since 4.2
 	 */
 	public UriComponentsBuilder withMethodName(Class<?> controllerType, String methodName, Object... args) {
@@ -475,6 +504,8 @@ public class MvcUriComponentsBuilder {
 	/**
 	 * An alternative to {@link #fromMethodCall(Object)} for use with an instance
 	 * of this class created via {@link #relativeTo}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @since 4.2
 	 */
 	public UriComponentsBuilder withMethodCall(Object invocationInfo) {
@@ -484,6 +515,8 @@ public class MvcUriComponentsBuilder {
 	/**
 	 * An alternative to {@link #fromMappingName(String)} for use with an instance
 	 * of this class created via {@link #relativeTo}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @since 4.2
 	 */
 	public MethodArgumentBuilder withMappingName(String mappingName) {
@@ -493,6 +526,8 @@ public class MvcUriComponentsBuilder {
 	/**
 	 * An alternative to {@link #fromMethod(Class, Method, Object...)}
 	 * for use with an instance of this class created via {@link #relativeTo}.
+	 * <p><strong>Note:</strong> This method extracts values from "Forwarded"
+	 * and "X-Forwarded-*" headers if found. See class-level docs.
 	 * @since 4.2
 	 */
 	public UriComponentsBuilder withMethod(Class<?> controllerType, Method method, Object... args) {
@@ -632,8 +667,8 @@ public class MvcUriComponentsBuilder {
 	private static String resolveEmbeddedValue(String value) {
 		if (value.contains(SystemPropertyUtils.PLACEHOLDER_PREFIX)) {
 			WebApplicationContext webApplicationContext = getWebApplicationContext();
-			if (webApplicationContext != null &&
-					webApplicationContext.getAutowireCapableBeanFactory() instanceof ConfigurableBeanFactory cbf) {
+			if (webApplicationContext != null
+					&& webApplicationContext.getAutowireCapableBeanFactory() instanceof ConfigurableBeanFactory cbf) {
 				String resolvedEmbeddedValue = cbf.resolveEmbeddedValue(value);
 				if (resolvedEmbeddedValue != null) {
 					return resolvedEmbeddedValue;
@@ -794,7 +829,7 @@ public class MvcUriComponentsBuilder {
 				enhancer.setSuperclass(controllerType);
 				enhancer.setInterfaces(new Class<?>[] {MethodInvocationInfo.class});
 				enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
-				enhancer.setAttemptLoad(AotDetector.useGeneratedArtifacts());
+				enhancer.setAttemptLoad(true);
 				enhancer.setCallbackType(MethodInterceptor.class);

 				Class<?> proxyClass = enhancer.createClass();
@@ -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.
@@ -333,18 +333,11 @@ class ReactiveTypeHandler {
 					this.subscription.request(1);
 				}
 				catch (final Throwable ex) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Send for " + this.emitter + " failed: " + ex);
+					if (logger.isTraceEnabled()) {
+						logger.trace("Send for " + this.emitter + " failed: " + ex);
 					}
 					terminate();
-					try {
-						this.emitter.completeWithError(ex);
-					}
-					catch (Exception ex2) {
-						if (logger.isDebugEnabled()) {
-							logger.debug("Failure from emitter completeWithError: " + ex2);
-						}
-					}
+					this.emitter.completeWithError(ex);
 					return;
 				}
 			}
@@ -354,30 +347,16 @@ class ReactiveTypeHandler {
 				Throwable ex = this.error;
 				this.error = null;
 				if (ex != null) {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Publisher for " + this.emitter + " failed: " + ex);
-					}
-					try {
-						this.emitter.completeWithError(ex);
-					}
-					catch (Exception ex2) {
-						if (logger.isDebugEnabled()) {
-							logger.debug("Failure from emitter completeWithError: " + ex2);
-						}
+					if (logger.isTraceEnabled()) {
+						logger.trace("Publisher for " + this.emitter + " failed: " + ex);
 					}
+					this.emitter.completeWithError(ex);
 				}
 				else {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Publisher for " + this.emitter + " completed");
 					}
-					try {
-						this.emitter.complete();
-					}
-					catch (Exception ex2) {
-						if (logger.isDebugEnabled()) {
-							logger.debug("Failure from emitter complete: " + ex2);
-						}
-					}
+					this.emitter.complete();
 				}
 				return;
 			}
@@ -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.
@@ -217,10 +217,11 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 			throw new IllegalArgumentException("Attribute 'items' is required and must be a Collection, an Array or a Map");
 		}

-		if (itemsObject instanceof Object[] itemsArray) {
-			for (int itemIndex = 0; itemIndex < itemsArray.length; itemIndex++) {
-				Object item = itemsArray[itemIndex];
-				writeObjectEntry(tagWriter, valueProperty, labelProperty, item, itemIndex);
+		if (itemsObject.getClass().isArray()) {
+			Object[] itemsArray = (Object[]) itemsObject;
+			for (int i = 0; i < itemsArray.length; i++) {
+				Object item = itemsArray[i];
+				writeObjectEntry(tagWriter, valueProperty, labelProperty, item, i);
 			}
 		}
 		else if (itemsObject instanceof Collection<?> optionCollection) {
@@ -89,14 +89,7 @@
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 	The bean name of the PathMatcher implementation to use for matching URL paths against registered URL patterns.
-	If no bean is provided, the PathPatternParser will be used instead.
-								]]></xsd:documentation>
-							</xsd:annotation>
-						</xsd:attribute>
-						<xsd:attribute name="pattern-parser" type="xsd:string">
-							<xsd:annotation>
-								<xsd:documentation><![CDATA[
-	The bean name of the PathPatternParser instance to use for matching URL paths against registered URL patterns.
+	Default is AntPathMatcher.
 								]]></xsd:documentation>
 							</xsd:annotation>
 						</xsd:attribute>
@@ -89,7 +89,6 @@ class AnnotationDrivenBeanDefinitionParserTests {
 		assertThat(hm.useRegisteredSuffixPatternMatch()).isTrue();
 		assertThat(hm.getUrlPathHelper()).isInstanceOf(TestPathHelper.class);
 		assertThat(hm.getPathMatcher()).isInstanceOf(TestPathMatcher.class);
-		assertThat(hm.getPatternParser()).isNull();
 		List<String> fileExtensions = hm.getContentNegotiationManager().getAllFileExtensions();
 		assertThat(fileExtensions).containsExactly("xml");
 	}
--- a/Show More
+++ b/Show More