Release v6.0.4

2026-06-08 17:33:33 +00:00 · 2023-01-11 12:10:28 +00:00
1308 changed files with 11478 additions and 16425 deletions
@@ -29,7 +29,7 @@ spring-test/test-output/

 # Maven artifacts
 pom.xml
-/target/
+target/

 # Eclipse artifacts, including WTP generated manifests
 bin
@@ -30,7 +30,5 @@ Andy Clement <aclement@vmware.com> <andrew.clement@gmail.com>
 Sam Brannen <sbrannen@vmware.com>
 Sam Brannen <sbrannen@vmware.com> <sbrannen@pivotal.io>
 Sam Brannen <sbrannen@vmware.com> <sam@sambrannen.com>
-Simon Basle <sbasle@vmware.com>
-Simon Baslé <sbasle@vmware.com>
 <dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
 Nick Williams <nicholas@nicholaswilliams.net>
@@ -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.6-librca
+java=17.0.5-librca
@@ -1,4 +1,4 @@
-# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-6.0.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
+# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-5.3.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.3.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)

 This is the home of the Spring Framework: the foundation for all [Spring projects](https://spring.io/projects). Collectively the Spring Framework and the family of Spring projects are often referred to simply as "Spring". 

@@ -1,10 +1,5 @@
 # Security Policy

-## JAR signing
-
-Spring Framework JARs released on Maven Central are signed.
-You'll find more information about the key here: https://spring.io/GPG-KEY-spring.txt
-
 ## Supported Versions

 Please see the
@@ -1,5 +1,5 @@
 plugins {
-	id 'io.spring.nohttp' version '0.0.11'
+	id 'io.spring.nohttp' version '0.0.10'
 	id 'io.freefair.aspectj' version '6.5.0.3' apply false
 	// kotlinVersion is managed in gradle.properties
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
@@ -78,7 +78,7 @@ configure([rootProject] + javaProjects) { project ->
 	}

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

@@ -121,14 +121,16 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
-			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.14.1/",
-			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.14.1/",
-			"https://www.javadoc.io/doc/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.1/",
+			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
+			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
+			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
 			"https://hc.apache.org/httpcomponents-client-5.2.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			// TODO Uncomment link to JUnit 5 docs once we execute Gradle with Java 18+.
-			// See https://github.com/spring-projects/spring-framework/issues/27497
+			// TODO Uncomment link to JUnit 5 docs once we have sorted out
+			// the following warning in the build.
+			//
+			// warning: The code being documented uses packages in the unnamed module, but the packages defined in https://junit.org/junit5/docs/5.9.2/api/ are in named modules.
 			//
 			// "https://junit.org/junit5/docs/5.9.2/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
@@ -17,4 +17,4 @@ changelog:
        - "type: dependency-upgrade"
  contributors:
    exclude:
-      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll", "simonbasle"]
+      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll"]
@@ -6,6 +6,7 @@ RUN ./setup.sh

 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
+ENV JDK18 /opt/openjdk/java18
 ENV JDK19 /opt/openjdk/java19

 ENV PATH $JAVA_HOME/bin:$PATH
@@ -3,10 +3,13 @@ set -e

 case "$1" in
 	java17)
-		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.5+8/bellsoft-jdk17.0.5+8-linux-amd64.tar.gz"
+	;;
+	java18)
+		echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1%2B1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz"
 	;;
 	java19)
-		echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/19.0.1%2B11/bellsoft-jdk19.0.1+11-linux-amd64.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"
@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c

 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java17 java19
+for jdk in java17 java18 java19
 do
  JDK_URL=$( /get-jdk-url.sh $jdk )
  mkdir $jdk
@@ -8,4 +8,7 @@ milestone: "6.0.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
+registry-mirror-host: docker.repo.spring.io
+registry-mirror-username: ((artifactory-username))
+registry-mirror-password: ((artifactory-password))
 task-timeout: 1h00m
@@ -23,6 +23,11 @@ anchors:
  docker-resource-source: &docker-resource-source
    username: ((docker-hub-username))
    password: ((docker-hub-password))
+    tag: ((milestone))
+  registry-mirror-vars: &registry-mirror-vars
+    registry-mirror-host: ((registry-mirror-host))
+    registry-mirror-username: ((registry-mirror-username))
+    registry-mirror-password: ((registry-mirror-password))
  slack-fail-params: &slack-fail-params
    text: >
      :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
@@ -43,37 +48,31 @@ resource_types:
 - name: registry-image
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: concourse/registry-image-resource
    tag: 1.5.0
 - name: artifactory-resource
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: springio/artifactory-resource
-    tag: 0.0.18
+    tag: 0.0.17
 - name: github-release
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: concourse/github-release-resource
    tag: 1.5.5
 - name: github-status-resource
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: dpb587/github-status-resource
    tag: master
 - name: pull-request
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: teliaoss/github-pr-resource
    tag: v0.23.0
 - name: slack-notification
  type: registry-image
  source:
-    <<: *docker-resource-source
    repository: cfcommunity/slack-notification-resource
    tag: latest
 resources:
@@ -95,7 +94,6 @@ resources:
  source:
    <<: *docker-resource-source
    repository: ((docker-hub-organization))/spring-framework-ci
-    tag: ((milestone))
 - name: every-morning
  type: time
  icon: alarm
@@ -127,6 +125,14 @@ resources:
    access_token: ((github-ci-status-token))
    branch: ((branch))
    context: build
+- name: repo-status-jdk18-build
+  type: github-status-resource
+  icon: eye-check-outline
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-ci-status-token))
+    branch: ((branch))
+    context: jdk18-build
 - name: repo-status-jdk19-build
  type: github-status-resource
  icon: eye-check-outline
@@ -170,7 +176,7 @@ jobs:
        image: ci-image
      vars:
        ci-image-name: ci-image
-        <<: *docker-resource-source
+        <<: *registry-mirror-vars
    - put: ci-image
      params:
        image: ci-image/image.tar
@@ -231,6 +237,34 @@ jobs:
          "zip.type": "schema"
    get_params:
      threads: 8
+- name: jdk18-build
+  serial: true
+  public: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+    - get: every-morning
+      trigger: true
+    - put: repo-status-jdk18-build
+      params: { state: "pending", commit: "git-repo" }
+    - do:
+        - task: check-project
+          image: ci-image
+          file: git-repo/ci/tasks/check-project.yml
+          privileged: true
+          timeout: ((task-timeout))
+          params:
+            TEST_TOOLCHAIN: 18
+            <<: *build-project-task-params
+      on_failure:
+        do:
+          - put: repo-status-jdk18-build
+            params: { state: "failure", commit: "git-repo" }
+          - put: slack-alert
+            params:
+              <<: *slack-fail-params
+    - put: repo-status-jdk18-build
+      params: { state: "success", commit: "git-repo" }
 - name: jdk19-build
  serial: true
  public: true
@@ -331,7 +365,6 @@ jobs:
      params:
        RELEASE_TYPE: M
        <<: *github-task-params
-        <<: *docker-resource-source
    - put: github-pre-release
      params:
        <<: *changelog-task-params
@@ -370,7 +403,6 @@ jobs:
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RC
-        <<: *docker-resource-source
        <<: *artifactory-task-params
    - task: generate-changelog
      file: git-repo/ci/tasks/generate-changelog.yml
@@ -415,7 +447,6 @@ jobs:
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RELEASE
-        <<: *docker-resource-source
        <<: *artifactory-task-params
        <<: *sonatype-task-params
 - name: create-github-release
@@ -433,7 +464,6 @@ jobs:
      file: git-repo/ci/tasks/generate-changelog.yml
      params:
        RELEASE_TYPE: RELEASE
-        <<: *docker-resource-source
        <<: *github-task-params
    - put: github-release
      params:
@@ -441,7 +471,7 @@ jobs:

 groups:
 - name: "builds"
-  jobs: ["build", "jdk19-build"]
+  jobs: ["build", "jdk18-build", "jdk19-build"]
 - name: "releases"
  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
@@ -4,6 +4,6 @@ set -e
 source $(dirname $0)/common.sh

 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK19 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 \
  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
 popd > /dev/null
@@ -5,8 +5,10 @@ image_resource:
  source:
    repository: concourse/oci-build-task
    tag: 0.10.0
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
+    registry_mirror:
+      host: ((registry-mirror-host))
+      username: ((registry-mirror-username))
+      password: ((registry-mirror-password))
 inputs:
  - name: ci-images-git-repo
 outputs:
@@ -5,8 +5,6 @@ image_resource:
  source:
    repository: springio/github-changelog-generator
    tag: '0.0.8'
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo
@@ -5,8 +5,6 @@ image_resource:
  source:
    repository: springio/concourse-release-scripts
    tag: '0.3.4'
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo
@@ -28,7 +28,13 @@ javadoc {
 }

 dependencies {
-	asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.5"
+	asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.3"
+}
+
+repositories {
+	maven {
+		url "https://repo.spring.io/release"
+	}
 }

 /**
@@ -1,9 +0,0 @@
-aot=core.aot
-aot-basics=core.aot.basics
-aot-refresh=core.aot.refresh
-aot-bean-factory-initialization-contributions=core.aot.bean-factory-initialization-contributions
-aot-bean-registration-contributions=core.aot.bean-registration-contributions
-aot-hints=core.aot.hints
-aot-hints-import-runtime-hints=core.aot.hints.import-runtime-hints
-aot-hints-reflective=core.aot.hints.reflective
-aot-hints-register-reflection-for-binding=core.aot.hints.register-reflection-for-binding
@@ -1,11 +1,5 @@
-// Spring Portfolio
-:docs-site:                     https://docs.spring.io
-:docs-spring-boot:              {docs-site}/spring-boot/docs/current/reference
-:docs-spring-gemfire:           {docs-site}/spring-gemfire/docs/current/reference
-:docs-spring-security:          {docs-site}/spring-security/reference
-// spring-asciidoctor-backends Settings
 :chomp:                         default headers packages
-:fold:                          all
+:docs-site:                     https://docs.spring.io
 // Spring Framework
 :docs-spring-framework:         {docs-site}/spring-framework/docs/{spring-version}
 :api-spring-framework:          {docs-spring-framework}/javadoc-api/org/springframework
@@ -13,6 +7,10 @@
 :docs-kotlin:                   {docdir}/../../main/kotlin/org/springframework/docs
 :docs-resources:                {docdir}/../../main/resources
 :spring-framework-main-code:    https://github.com/spring-projects/spring-framework/tree/main
+// Spring portfolio Links
+:docs-spring-boot:              {docs-site}/spring-boot/docs/current/reference
+:docs-spring-gemfire:           {docs-site}/spring-gemfire/docs/current/reference
+:docs-spring-security:          {docs-site}/spring-security/reference
 // Third-party Links
 :docs-graalvm:                  https://www.graalvm.org/22.3/reference-manual
 :gh-rsocket:                    https://github.com/rsocket
@@ -1100,15 +1100,12 @@ subclass is used to implement the Decorator pattern, weaving in the advice.
 CGLIB proxying should generally be transparent to users. However, there are some issues
 to consider:

-* `final` classes cannot be proxied, because they cannot be extended.
-* `final` methods cannot be advised, because they cannot be overridden.
-* `private` methods cannot be advised, because they cannot be overridden.
+* `Final` methods cannot be advised, as they cannot be overridden.
+* There is no need to add CGLIB to your classpath. As of Spring 3.2, CGLIB is repackaged
+  and included in the spring-core JAR. In other words, CGLIB-based AOP works "`out of
+  the box`", as do JDK dynamic proxies.

-NOTE: There is no need to add CGLIB to your classpath. CGLIB is repackaged and included
-in the `spring-core` JAR. In other words, CGLIB-based AOP works "out of the box", as do
-JDK dynamic proxies.
-
-There is little performance difference between CGLIB proxies and dynamic proxies.
+There is little performance difference between CGLIB proxying and dynamic proxies.
 Performance should not be a decisive consideration in this case.


@@ -16,9 +16,7 @@ Applying such optimizations early implies the following restrictions:
 * The classpath is fixed and fully defined at build time.
 * The beans defined in your application cannot change at runtime, meaning:
 ** `@Profile`, in particular profile-specific configuration needs to be chosen at build time.
-** `Environment` properties that impact the presence of a bean (`@Conditional`) are only considered at build time.
-* Bean definitions with instance suppliers (lambdas or method references) cannot be transformed ahead-of-time (see related https://github.com/spring-projects/spring-framework/issues/29555[spring-framework#29555] issue).
-* The return type of methods annotated with `@Bean` should be the most specific type possible (typically the concrete class, not an interface) in order to support proper type inference without invoking the corresponding `@Bean` method at build time.
+** Environment properties that impact the presence of a bean (`@Conditional`) are only considered at build time.

 When these restrictions are in place, it becomes possible to perform ahead-of-time processing at build time and generate additional assets.
 A Spring AOT processed application typically generates:
@@ -123,7 +123,7 @@ easy to do in Spring. You do not actually have to do anything or know anything a
 the Spring internals (or even about classes such as the `FieldRetrievingFactoryBean`).
 The following example enumeration shows how easy injecting an enum value is:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package jakarta.persistence;
@@ -134,7 +134,7 @@ The following example enumeration shows how easy injecting an enum value is:
 		EXTENDED
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package jakarta.persistence
@@ -148,7 +148,7 @@ The following example enumeration shows how easy injecting an enum value is:

 Now consider the following setter of type `PersistenceContextType` and the corresponding bean definition:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package example;
@@ -162,7 +162,7 @@ Now consider the following setter of type `PersistenceContextType` and the corre
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package example
@@ -796,7 +796,7 @@ element results in a single `SimpleDateFormat` bean definition). Spring features
 number of convenience classes that support this scenario. In the following example, we
 use the `NamespaceHandlerSupport` class:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package org.springframework.samples.xml;
@@ -810,7 +810,7 @@ use the `NamespaceHandlerSupport` class:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package org.springframework.samples.xml
@@ -847,7 +847,7 @@ responsible for parsing one distinct top-level XML element defined in the schema
 the parser, we' have access to the XML element (and thus to its subelements, too) so that
 we can parse our custom XML content, as you can see in the following example:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package org.springframework.samples.xml;
@@ -884,7 +884,7 @@ the basic grunt work of creating a single `BeanDefinition`.
 <2> We supply the `AbstractSingleBeanDefinitionParser` superclass with the type that our
 single `BeanDefinition` represents.

-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package org.springframework.samples.xml
@@ -1056,7 +1056,7 @@ setter method for the `components` property. This makes it hard (or rather impos
 to configure a bean definition for the `Component` class by using setter injection.
 The following listing shows the `Component` class:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1087,7 +1087,7 @@ The following listing shows the `Component` class:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1114,7 +1114,7 @@ The typical solution to this issue is to create a custom `FactoryBean` that expo
 setter property for the `components` property. The following listing shows such a custom
 `FactoryBean`:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1154,7 +1154,7 @@ setter property for the `components` property. The following listing shows such
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1226,7 +1226,7 @@ listing shows:
 Again following <<core.appendix.xsd-custom-introduction, the process described earlier>>,
 we then create a custom `NamespaceHandler`:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1240,7 +1240,7 @@ we then create a custom `NamespaceHandler`:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1259,7 +1259,7 @@ Next up is the custom `BeanDefinitionParser`. Remember that we are creating
 a `BeanDefinition` that describes a `ComponentFactoryBean`. The following
 listing shows our custom `BeanDefinitionParser` implementation:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1308,7 +1308,7 @@ listing shows our custom `BeanDefinitionParser` implementation:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1403,14 +1403,14 @@ the named JCache for us. We can also modify the existing `BeanDefinition` for th
 `'checkingAccountService'` so that it has a dependency on this new
 JCache-initializing `BeanDefinition`. The following listing shows our `JCacheInitializer`:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;

 	public class JCacheInitializer {

-		private final String name;
+		private String name;

 		public JCacheInitializer(String name) {
 			this.name = name;
@@ -1421,7 +1421,7 @@ JCache-initializing `BeanDefinition`. The following listing shows our `JCacheIni
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1453,7 +1453,7 @@ the XSD schema that describes the custom attribute, as follows:

 Next, we need to create the associated `NamespaceHandler`, as follows:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1469,7 +1469,7 @@ Next, we need to create the associated `NamespaceHandler`, as follows:

 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -1490,7 +1490,7 @@ Next, we need to create the parser. Note that, in this case, because we are goin
 an XML attribute, we write a `BeanDefinitionDecorator` rather than a `BeanDefinitionParser`.
 The following listing shows our `BeanDefinitionDecorator` implementation:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo;
@@ -1544,7 +1544,7 @@ The following listing shows our `BeanDefinitionDecorator` implementation:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo
@@ -524,13 +524,15 @@ container that hosts the bean. A bean usually has only one identifier. However,
 requires more than one, the extra ones can be considered aliases.

 In XML-based configuration metadata, you use the `id` attribute, the `name` attribute, or
-both to specify bean identifiers. The `id` attribute lets you specify exactly one `id`.
-Conventionally, these names are alphanumeric ('myBean', 'someService', etc.), but they
-can contain special characters as well. If you want to introduce other aliases for the
-bean, you can also specify them in the `name` attribute, separated by a comma (`,`),
-semicolon (`;`), or white space. Although the `id` attribute is defined as an
-`xsd:string` type, bean `id` uniqueness is enforced by the container, though not by XML
-parsers.
+both to specify the bean identifiers. The `id` attribute lets you specify
+exactly one id. Conventionally, these names are alphanumeric ('myBean',
+'someService', etc.), but they can contain special characters as well. If you want to
+introduce other aliases for the bean, you can also specify them in the `name`
+attribute, separated by a comma (`,`), semicolon (`;`), or white space. As a
+historical note, in versions prior to Spring 3.1, the `id` attribute was
+defined as an `xsd:ID` type, which constrained possible characters. As of 3.1,
+it is defined as an `xsd:string` type. Note that bean `id` uniqueness is still
+enforced by the container, though no longer by XML parsers.

 You are not required to supply a `name` or an `id` for a bean. If you do not supply a
 `name` or `id` explicitly, the container generates a unique name for that bean. However,
@@ -949,7 +951,7 @@ order in which the constructor arguments are defined in a bean definition is the
 in which those arguments are supplied to the appropriate constructor when the bean is
 being instantiated. Consider the following class:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package x.y;
@@ -961,7 +963,7 @@ being instantiated. Consider the following class:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package x.y
@@ -993,7 +995,7 @@ case with the preceding example). When a simple type is used, such as
 `<value>true</value>`, Spring cannot determine the type of the value, and so cannot match
 by type without help. Consider the following class:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package examples;
@@ -1012,7 +1014,7 @@ by type without help. Consider the following class:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package examples
@@ -1077,7 +1079,7 @@ https://download.oracle.com/javase/8/docs/api/java/beans/ConstructorProperties.h
 JDK annotation to explicitly name your constructor arguments. The sample class would
 then have to look as follows:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package examples;
@@ -1093,7 +1095,7 @@ then have to look as follows:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package examples
@@ -2276,9 +2278,10 @@ and by <<beans-factory-client,making a `getBean("B")` call to the container>> as
 typically new) bean B instance every time bean A needs it. The following example
 shows this approach:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages",fold="none"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
+	// a class that uses a stateful Command-style class to perform some processing
 	package fiona.apple;

 	// Spring-API imports
@@ -2286,10 +2289,6 @@ shows this approach:
 	import org.springframework.context.ApplicationContext;
 	import org.springframework.context.ApplicationContextAware;

-	/**
-	 * A class that uses a stateful Command-style class to perform
-	 * some processing.
-	 */
 	public class CommandManager implements ApplicationContextAware {

 		private ApplicationContext applicationContext;
@@ -2313,17 +2312,16 @@ shows this approach:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages",fold="none"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
+	// a class that uses a stateful Command-style class to perform some processing
 	package fiona.apple

 	// Spring-API imports
 	import org.springframework.context.ApplicationContext
 	import org.springframework.context.ApplicationContextAware

-	// A class that uses a stateful Command-style class to perform
-	// some processing.
 	class CommandManager : ApplicationContextAware {

 		private lateinit var applicationContext: ApplicationContext
@@ -2386,7 +2384,7 @@ Spring container dynamically overrides the implementation of the `createCommand(
 method. The `CommandManager` class does not have any Spring dependencies, as
 the reworked example shows:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages",fold="none"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package fiona.apple;
@@ -2407,7 +2405,7 @@ the reworked example shows:
 		protected abstract Command createCommand();
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages",fold="none"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package fiona.apple
@@ -2706,8 +2704,8 @@ The following table describes the supported scopes:
  the context of a web-aware Spring `ApplicationContext`.
 |===

-NOTE: A thread scope is available but is not registered by default. For more information,
-see the documentation for
+NOTE: As of Spring 3.0, a thread scope is available but is not registered by default. For
+more information, see the documentation for
 {api-spring-framework}/context/support/SimpleThreadScope.html[`SimpleThreadScope`].
 For instructions on how to register this or any other custom scope, see
 <<beans-factory-scopes-custom-using>>.
@@ -4218,7 +4216,7 @@ it is created by the container and prints the resulting string to the system con

 The following listing shows the custom `BeanPostProcessor` implementation class definition:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package scripting;
@@ -4238,11 +4236,9 @@ The following listing shows the custom `BeanPostProcessor` implementation class
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
-	package scripting
-
 	import org.springframework.beans.factory.config.BeanPostProcessor

 	class InstantiationTracingBeanPostProcessor : BeanPostProcessor {
@@ -4594,24 +4590,26 @@ configuration becomes decentralized and harder to control.

 No matter the choice, Spring can accommodate both styles and even mix them together.
 It is worth pointing out that through its <<beans-java, JavaConfig>> option, Spring lets
-annotations be used in a non-invasive way, without touching the target components'
-source code and that, in terms of tooling, all configuration styles are supported by
-https://spring.io/tools[Spring Tools] for Eclipse, Visual Studio Code, and Theia.
+annotations be used in a non-invasive way, without touching the target components
+source code and that, in terms of tooling, all configuration styles are supported by the
+https://spring.io/tools[Spring Tools for Eclipse].
 ****

 An alternative to XML setup is provided by annotation-based configuration, which relies
-on bytecode metadata for wiring up components instead of XML declarations. Instead of
-using XML to describe a bean wiring, the developer moves the configuration into the
-component class itself by using annotations on the relevant class, method, or field
-declaration. As mentioned in <<beans-factory-extension-bpp-examples-aabpp>>, using a
-`BeanPostProcessor` in conjunction with annotations is a common means of extending the
-Spring IoC container. For example, the <<beans-autowired-annotation, `@Autowired`>>
-annotation provides the same capabilities as described in <<beans-factory-autowire>> but
-with more fine-grained control and wider applicability. In addition, Spring provides
-support for JSR-250 annotations, such as `@PostConstruct` and `@PreDestroy`, as well as
-support for JSR-330 (Dependency Injection for Java) annotations contained in the
-`jakarta.inject` package such as `@Inject` and `@Named`. Details about those annotations
-can be found in the <<beans-standard-annotations, relevant section>>.
+on the bytecode metadata for wiring up components instead of angle-bracket declarations.
+Instead of using XML to describe a bean wiring, the developer moves the configuration
+into the component class itself by using annotations on the relevant class, method, or
+field declaration. As mentioned in <<beans-factory-extension-bpp-examples-aabpp>>, using
+a `BeanPostProcessor` in conjunction with annotations is a common means of extending the
+Spring IoC container. For example, Spring 2.5 introduced an annotation-based approach to
+drive Spring's dependency injection. Essentially, the <<beans-autowired-annotation,
+`@Autowired`>> annotation provides the same capabilities as described in
+<<beans-factory-autowire>> but with more fine-grained control and wider applicability.
+Spring 2.5 also added support for JSR-250 annotations, such as `@PostConstruct` and
+`@PreDestroy`. Spring 3.0 added support for JSR-330 (Dependency Injection for Java)
+annotations contained in the `jakarta.inject` package such as `@Inject` and `@Named`.
+Details about those annotations can be found in the <<beans-standard-annotations,
+relevant section>>.

 [NOTE]
 ====
@@ -6239,7 +6237,7 @@ simply to be added to the application's classpath like any other library.
 Most examples in this chapter use XML to specify the configuration metadata that produces
 each `BeanDefinition` within the Spring container. The previous section
 (<<beans-annotation-config>>) demonstrates how to provide a lot of the configuration
-metadata through source-level annotations. Even in those examples, however, the "base"
+metadata through source-level annotations. Even in those examples, however, the "`base`"
 bean definitions are explicitly defined in the XML file, while the annotations drive only
 the dependency injection. This section describes an option for implicitly detecting the
 candidate components by scanning the classpath. Candidate components are classes that
@@ -6251,9 +6249,10 @@ the container.

 [NOTE]
 ====
-You can define beans using Java rather than using XML files. Take a look at the
-`@Configuration`, `@Bean`, `@Import`, and `@DependsOn` annotations for examples of how to
-use these features.
+Starting with Spring 3.0, many features provided by the Spring JavaConfig project are
+part of the core Spring Framework. This allows you to define beans using Java rather
+than using the traditional XML files. Take a look at the `@Configuration`, `@Bean`,
+`@Import`, and `@DependsOn` annotations for examples of how to use these new features.
 ====


@@ -7173,15 +7172,15 @@ arrangement (as though no index were present at all) by setting `spring.index.ig
 [[beans-standard-annotations]]
 == Using JSR 330 Standard Annotations

-Spring offers support for JSR-330 standard annotations (Dependency Injection). Those
-annotations are scanned in the same way as the Spring annotations. To use them, you need
-to have the relevant jars in your classpath.
+Starting with Spring 3.0, Spring offers support for JSR-330 standard annotations
+(Dependency Injection). Those annotations are scanned in the same way as the Spring
+annotations. To use them, you need to have the relevant jars in your classpath.

 [NOTE]
 =====
 If you use Maven, the `jakarta.inject` artifact is available in the standard Maven
 repository (
-https://repo.maven.apache.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/[https://repo.maven.apache.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/]).
+https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/[https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/]).
 You can add the following dependency to your file pom.xml:

 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -7563,7 +7562,7 @@ The simplest possible `@Configuration` class reads as follows:
 	public class AppConfig {

 		@Bean
-		public MyServiceImpl myService() {
+		public MyService myService() {
 			return new MyServiceImpl();
 		}
 	}
@@ -7575,7 +7574,7 @@ The simplest possible `@Configuration` class reads as follows:
 	class AppConfig {

 		@Bean
-		fun myService(): MyServiceImpl {
+		fun myService(): MyService {
 			return MyServiceImpl()
 		}
 	}
@@ -8612,24 +8611,22 @@ about singletons here.

 [NOTE]
 ====
-It is not necessary to add CGLIB to your classpath because CGLIB classes are repackaged
-under the `org.springframework.cglib` package and included directly within the
-`spring-core` JAR.
+As of Spring 3.2, it is no longer necessary to add CGLIB to your classpath because CGLIB
+classes have been repackaged under `org.springframework.cglib` and included directly
+within the spring-core JAR.
 ====

 [TIP]
 ====
 There are a few restrictions due to the fact that CGLIB dynamically adds features at
-startup-time. In particular, configuration classes must not be final. However, any
-constructors are allowed on configuration classes, including the use of `@Autowired` or a
-single non-default constructor declaration for default injection.
+startup-time. In particular, configuration classes must not be final. However, as
+of 4.3, any constructors are allowed on configuration classes, including the use of
+`@Autowired` or a single non-default constructor declaration for default injection.

 If you prefer to avoid any CGLIB-imposed limitations, consider declaring your `@Bean`
-methods on non-`@Configuration` classes (for example, on plain `@Component` classes
-instead) or by annotating your configuration class with
-`@Configuration(proxyBeanMethods = false)`. Cross-method calls between `@Bean` methods
-are then not intercepted, so you have to exclusively rely on dependency injection at the
-constructor or method level there.
+methods on non-`@Configuration` classes (for example, on plain `@Component` classes instead).
+Cross-method calls between `@Bean` methods are not then intercepted, so you have
+to exclusively rely on dependency injection at the constructor or method level there.
 ====


@@ -1978,7 +1978,7 @@ The definition of `TemplateParserContext` follows:

 This section lists the classes used in the examples throughout this chapter.

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Inventor.Java
 ----
 	package org.spring.samples.spel.inventor;
@@ -2051,20 +2051,18 @@ This section lists the classes used in the examples throughout this chapter.
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Inventor.kt
 ----
-	package org.spring.samples.spel.inventor
-
-	class Inventor(
-		var name: String,
-		var nationality: String,
-		var inventions: Array<String>? = null,
-		var birthdate: Date =  GregorianCalendar().time,
-		var placeOfBirth: PlaceOfBirth? = null)
+class Inventor(
+	var name: String,
+	var nationality: String,
+	var inventions: Array<String>? = null,
+	var birthdate: Date =  GregorianCalendar().time,
+	var placeOfBirth: PlaceOfBirth? = null)
 ----

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .PlaceOfBirth.java
 ----
 	package org.spring.samples.spel.inventor;
@@ -2100,15 +2098,13 @@ This section lists the classes used in the examples throughout this chapter.
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .PlaceOfBirth.kt
 ----
-	package org.spring.samples.spel.inventor
-
 	class PlaceOfBirth(var city: String, var country: String? = null) {
 ----

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Society.java
 ----
 	package org.spring.samples.spel.inventor;
@@ -2151,7 +2147,7 @@ This section lists the classes used in the examples throughout this chapter.
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Society.kt
 ----
 	package org.spring.samples.spel.inventor
@@ -2,7 +2,7 @@
 = Validation, Data Binding, and Type Conversion

 There are pros and cons for considering validation as business logic, and Spring offers
-a design for validation and data binding that does not exclude either one of them.
+a design for validation (and data binding) that does not exclude either one of them.
 Specifically, validation should not be tied to the web tier and should be easy to localize,
 and it should be possible to plug in any available validator. Considering these concerns,
 Spring provides a `Validator` contract that is both basic and eminently usable
@@ -15,18 +15,18 @@ provides the aptly named `DataBinder` to do exactly that. The `Validator` and th
 limited to the web layer.

 The `BeanWrapper` is a fundamental concept in the Spring Framework and is used in a lot
-of places. However, you probably do not need to use the `BeanWrapper` directly. Because
-this is reference documentation, however, we feel that some explanation might be in
-order. We explain the `BeanWrapper` in this chapter, since, if you are going to use it at
-all, you are most likely do so when trying to bind data to objects.
+of places. However, you probably do not need to use the `BeanWrapper`
+directly. Because this is reference documentation, however, we felt that some explanation
+might be in order. We explain the `BeanWrapper` in this chapter, since, if you are
+going to use it at all, you are most likely do so when trying to bind data to objects.

 Spring's `DataBinder` and the lower-level `BeanWrapper` both use `PropertyEditorSupport`
 implementations to parse and format property values. The `PropertyEditor` and
 `PropertyEditorSupport` types are part of the JavaBeans specification and are also
-explained in this chapter. Spring's `core.convert` package provides a general type
-conversion facility, as well as a higher-level `format` package for formatting UI field
-values. You can use these packages as simpler alternatives to `PropertyEditorSupport`
-implementations. They are also discussed in this chapter.
+explained in this chapter. Spring 3 introduced a `core.convert` package that provides a
+general type conversion facility, as well as a higher-level "`format`" package for
+formatting UI field values. You can use these packages as simpler alternatives to
+`PropertyEditorSupport` implementations. They are also discussed in this chapter.

 Spring supports Java Bean Validation through setup infrastructure and an adaptor to
 Spring's own `Validator` contract. Applications can enable Bean Validation once globally,
@@ -640,7 +640,7 @@ support for additional `PropertyEditor` instances to an `ApplicationContext`.
 Consider the following example, which defines a user class called `ExoticType` and
 another class called `DependsOnExoticType`, which needs `ExoticType` set as a property:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package example;
@@ -663,7 +663,7 @@ another class called `DependsOnExoticType`, which needs `ExoticType` set as a pr
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package example
@@ -689,14 +689,12 @@ string, which a `PropertyEditor` converts into an actual

 The `PropertyEditor` implementation could look similar to the following:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
+	// converts string representation to ExoticType object
 	package example;

-	import java.beans.PropertyEditorSupport;
-
-	// converts string representation to ExoticType object
 	public class ExoticTypeEditor extends PropertyEditorSupport {

 		public void setAsText(String text) {
@@ -704,14 +702,14 @@ The `PropertyEditor` implementation could look similar to the following:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
+	// converts string representation to ExoticType object
 	package example

 	import java.beans.PropertyEditorSupport

-	// converts string representation to ExoticType object
 	class ExoticTypeEditor : PropertyEditorSupport() {

 		override fun setAsText(text: String) {
@@ -754,7 +752,7 @@ instances for each bean creation attempt.

 The following example shows how to create your own `PropertyEditorRegistrar` implementation:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package com.foo.editors.spring;
@@ -770,7 +768,7 @@ The following example shows how to create your own `PropertyEditorRegistrar` imp
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package com.foo.editors.spring
@@ -863,12 +861,12 @@ as needed.
 [[core-convert]]
 == Spring Type Conversion

-The `core.convert` package provides a general type conversion system. The system defines
-an SPI to implement type conversion logic and an API to perform type conversions at
-runtime. Within a Spring container, you can use this system as an alternative to
-`PropertyEditor` implementations to convert externalized bean property value strings to
-the required property types. You can also use the public API anywhere in your application
-where type conversion is needed.
+Spring 3 introduced a `core.convert` package that provides a general type conversion
+system. The system defines an SPI to implement type conversion logic and an API
+to perform type conversions at runtime. Within a Spring container, you can use this system
+as an alternative to `PropertyEditor` implementations to convert externalized bean property value
+strings to the required property types. You can also use the public API anywhere in your
+application where type conversion is needed.



@@ -878,7 +876,7 @@ where type conversion is needed.
 The SPI to implement type conversion logic is simple and strongly typed, as the following
 interface definition shows:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert.converter;

@@ -903,7 +901,7 @@ Several converter implementations are provided in the `core.convert.support` pac
 a convenience. These include converters from strings to numbers and other common types.
 The following listing shows the `StringToInteger` class, which is a typical `Converter` implementation:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert.support;

@@ -924,7 +922,7 @@ When you need to centralize the conversion logic for an entire class hierarchy
 (for example, when converting from `String` to `Enum` objects), you can implement
 `ConverterFactory`, as the following example shows:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert.converter;

@@ -940,7 +938,7 @@ where T is a subclass of R.

 Consider the `StringToEnumConverterFactory` as an example:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert.support;

@@ -977,7 +975,7 @@ context that you can use when you implement your conversion logic. Such context
 type conversion be driven by a field annotation or by generic information declared on a
 field signature. The following listing shows the interface definition of `GenericConverter`:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert.converter;

@@ -1041,7 +1039,7 @@ might match only if the target entity type declares a static finder method (for
 `ConversionService` defines a unified API for executing type conversion logic at
 runtime. Converters are often run behind the following facade interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.core.convert;

@@ -1207,9 +1205,8 @@ web or desktop application. In such environments, you typically convert from `St
 to support the client postback process, as well as back to `String` to support the
 view rendering process. In addition, you often need to localize `String` values. The more
 general `core.convert` `Converter` SPI does not address such formatting requirements
-directly. To directly address them, Spring provides a convenient `Formatter` SPI that
-provides a simple and robust alternative to `PropertyEditor` implementations for client
-environments.
+directly. To directly address them, Spring 3 introduced a convenient `Formatter` SPI that
+provides a simple and robust alternative to `PropertyEditor` implementations for client environments.

 In general, you can use the `Converter` SPI when you need to implement general-purpose type
 conversion logic -- for example, for converting between a `java.util.Date` and a `Long`.
@@ -1225,7 +1222,7 @@ provides a unified type conversion API for both SPIs.
 The `Formatter` SPI to implement field formatting logic is simple and strongly typed. The
 following listing shows the `Formatter` interface definition:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.format;

@@ -1270,7 +1267,7 @@ a `java.text.DateFormat`.

 The following `DateFormatter` is an example `Formatter` implementation:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package org.springframework.format.datetime;
@@ -1304,7 +1301,7 @@ The following `DateFormatter` is an example `Formatter` implementation:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	class DateFormatter(private val pattern: String) : Formatter<Date> {
@@ -1336,7 +1333,7 @@ Field formatting can be configured by field type or annotation. To bind
 an annotation to a `Formatter`, implement `AnnotationFormatterFactory`. The following
 listing shows the definition of the `AnnotationFormatterFactory` interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.format;

@@ -1352,14 +1349,15 @@ listing shows the definition of the `AnnotationFormatterFactory` interface:

 To create an implementation:

-. Parameterize `A` to be the field `annotationType` with which you wish to associate
+. Parameterize A to be the field `annotationType` with which you wish to associate
 formatting  logic -- for example `org.springframework.format.annotation.DateTimeFormat`.
 . Have `getFieldTypes()` return the types of fields on which the annotation can be used.
 . Have `getPrinter()` return a `Printer` to print the value of an annotated field.
 . Have `getParser()` return a `Parser` to parse a `clientValue` for an annotated field.

 The following example `AnnotationFormatterFactory` implementation binds the `@NumberFormat`
-annotation to a formatter to let a number style or pattern be specified:
+annotation to a formatter to let a number style or pattern be
+specified:

 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
@@ -1367,12 +1365,10 @@ annotation to a formatter to let a number style or pattern be specified:
 	public final class NumberFormatAnnotationFormatterFactory
 			implements AnnotationFormatterFactory<NumberFormat> {

-		private static final Set<Class<?>> FIELD_TYPES = Set.of(Short.class,
-				Integer.class, Long.class, Float.class, Double.class,
-				BigDecimal.class, BigInteger.class);
-
 		public Set<Class<?>> getFieldTypes() {
-			return FIELD_TYPES;
+			return new HashSet<Class<?>>(asList(new Class<?>[] {
+				Short.class, Integer.class, Long.class, Float.class,
+				Double.class, BigDecimal.class, BigInteger.class }));
 		}

 		public Printer<Number> getPrinter(NumberFormat annotation, Class<?> fieldType) {
@@ -1386,13 +1382,16 @@ annotation to a formatter to let a number style or pattern be specified:
 		private Formatter<Number> configureFormatterFrom(NumberFormat annotation, Class<?> fieldType) {
 			if (!annotation.pattern().isEmpty()) {
 				return new NumberStyleFormatter(annotation.pattern());
+			} else {
+				Style style = annotation.style();
+				if (style == Style.PERCENT) {
+					return new PercentStyleFormatter();
+				} else if (style == Style.CURRENCY) {
+					return new CurrencyStyleFormatter();
+				} else {
+					return new NumberStyleFormatter();
+				}
 			}
-			// else
-			return switch(annotation.style()) {
-				case Style.PERCENT -> new PercentStyleFormatter();
-				case Style.CURRENCY -> new CurrencyStyleFormatter();
-				default -> new NumberStyleFormatter();
-			};
 		}
 	}
 ----
@@ -1428,7 +1427,7 @@ annotation to a formatter to let a number style or pattern be specified:
 	}
 ----

-To trigger formatting, you can annotate fields with `@NumberFormat`, as the following
+To trigger formatting, you can annotate fields with @NumberFormat, as the following
 example shows:

 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
@@ -1490,7 +1489,7 @@ for use with Spring's `DataBinder` and the Spring Expression Language (SpEL).

 The following listing shows the `FormatterRegistry` SPI:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.format;

@@ -1526,7 +1525,7 @@ these rules once, and they are applied whenever formatting is needed.
 `FormatterRegistrar` is an SPI for registering formatters and converters through the
 FormatterRegistry. The following listing shows its interface definition:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.format;

@@ -1578,22 +1577,20 @@ For example, the following Java configuration registers a global `yyyyMMdd` form
 		public FormattingConversionService conversionService() {

 			// Use the DefaultFormattingConversionService but do not register defaults
-			DefaultFormattingConversionService conversionService =
-				new DefaultFormattingConversionService(false);
+			DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService(false);

 			// Ensure @NumberFormat is still supported
-			conversionService.addFormatterForFieldAnnotation(
-				new NumberFormatAnnotationFormatterFactory());
+			conversionService.addFormatterForFieldAnnotation(new NumberFormatAnnotationFormatterFactory());

 			// Register JSR-310 date conversion with a specific global format
-			DateTimeFormatterRegistrar dateTimeRegistrar = new DateTimeFormatterRegistrar();
-			dateTimeRegistrar.setDateFormatter(DateTimeFormatter.ofPattern("yyyyMMdd"));
-			dateTimeRegistrar.registerFormatters(conversionService);
+			DateTimeFormatterRegistrar registrar = new DateTimeFormatterRegistrar();
+			registrar.setDateFormatter(DateTimeFormatter.ofPattern("yyyyMMdd"));
+			registrar.registerFormatters(conversionService);

 			// Register date conversion with a specific global format
-			DateFormatterRegistrar dateRegistrar = new DateFormatterRegistrar();
-			dateRegistrar.setFormatter(new DateFormatter("yyyyMMdd"));
-			dateRegistrar.registerFormatters(conversionService);
+			DateFormatterRegistrar registrar = new DateFormatterRegistrar();
+			registrar.setFormatter(new DateFormatter("yyyyMMdd"));
+			registrar.registerFormatters(conversionService);

 			return conversionService;
 		}
@@ -1614,14 +1611,14 @@ For example, the following Java configuration registers a global `yyyyMMdd` form
 				addFormatterForFieldAnnotation(NumberFormatAnnotationFormatterFactory())

 				// Register JSR-310 date conversion with a specific global format
-				val dateTimeRegistrar = DateTimeFormatterRegistrar()
-				dateTimeRegistrar.setDateFormatter(DateTimeFormatter.ofPattern("yyyyMMdd"))
-				dateTimeRegistrar.registerFormatters(this)
+				val registrar = DateTimeFormatterRegistrar()
+				registrar.setDateFormatter(DateTimeFormatter.ofPattern("yyyyMMdd"))
+				registrar.registerFormatters(this)

 				// Register date conversion with a specific global format
-				val dateRegistrar = DateFormatterRegistrar()
-				dateRegistrar.setFormatter(DateFormatter("yyyyMMdd"))
-				dateRegistrar.registerFormatters(this)
+				val registrar = DateFormatterRegistrar()
+				registrar.setFormatter(DateFormatter("yyyyMMdd"))
+				registrar.registerFormatters(this)
 			}
 		}
 	}
@@ -1959,9 +1956,9 @@ javadoc for more information on these options.
 [[validation-binder]]
 === Configuring a `DataBinder`

-You can configure a `DataBinder` instance with a `Validator`. Once configured, you can
-invoke the `Validator` by calling `binder.validate()`. Any validation `Errors` are
-automatically added to the binder's `BindingResult`.
+Since Spring 3, you can configure a `DataBinder` instance with a `Validator`. Once
+configured, you can invoke the `Validator` by calling `binder.validate()`. Any validation
+`Errors` are automatically added to the binder's `BindingResult`.

 The following example shows how to use a `DataBinder` programmatically to invoke validation
 logic after binding to a target object:
@@ -622,7 +622,7 @@ transactions being created and then rolled back in response to the
 `UnsupportedOperationException` instance. The following listing shows the `FooService`
 interface:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	// the service interface that we want to make transactional
@@ -641,7 +641,7 @@ interface:

 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	// the service interface that we want to make transactional
@@ -662,7 +662,7 @@ interface:

 The following example shows an implementation of the preceding interface:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package x.y.service;
@@ -690,7 +690,7 @@ The following example shows an implementation of the preceding interface:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package x.y.service
@@ -893,7 +893,7 @@ return type is reactive.
 The following listing shows a modified version of the previously used `FooService`, but
 this time the code uses reactive types:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	// the reactive service interface that we want to make transactional
@@ -912,7 +912,7 @@ this time the code uses reactive types:

 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	// the reactive service interface that we want to make transactional
@@ -933,7 +933,7 @@ this time the code uses reactive types:

 The following example shows an implementation of the preceding interface:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package x.y.service;
@@ -961,7 +961,7 @@ The following example shows an implementation of the preceding interface:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 .Kotlin
 ----
 	package x.y.service
@@ -2028,7 +2028,7 @@ configuration and AOP in general.

 The following code shows the simple profiling aspect discussed earlier:

-[source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 .Java
 ----
 	package x.y;
@@ -2065,15 +2065,9 @@ The following code shows the simple profiling aspect discussed earlier:
 		}
 	}
 ----
-[source,kotlin,indent=0,subs="verbatim",role="secondary",chomp="-packages"]
+[source,kotlin,indent=0,subs="verbatim",role="secondary"]
 .Kotlin
 ----
-	package x.y
-
-	import org.aspectj.lang.ProceedingJoinPoint
-	import org.springframework.util.StopWatch
-	import org.springframework.core.Ordered
-
 	class SimpleProfiler : Ordered {

 		private var order: Int = 0
@@ -31,7 +31,7 @@ Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abedrabbo, Andy Clem
 Syer, Oliver Gierke, Rossen Stoyanchev, Phillip Webb, Rob Winch, Brian Clozel, Stephane
 Nicoll, Sebastien Deleuze, Jay Bryant, Mark Paluch

-Copyright © 2002 - 2023 VMware, Inc. All Rights Reserved.
+Copyright © 2002 - 2022 VMware, Inc. All Rights Reserved.

 Copies of this document may be made for your own use and for distribution to others,
 provided that you do not charge any fee for such copies and further provided that each
@@ -582,7 +582,7 @@ a similar contract to the JMS `MessageListener` interface but also gives the mes
 method access to the JMS `Session` from which the `Message` was received.
 The following listing shows the definition of the `SessionAwareMessageListener` interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.jms.listener;

@@ -31,7 +31,7 @@ The core class in Spring's JMX framework is the `MBeanExporter`. This class is
 responsible for taking your Spring beans and registering them with a JMX `MBeanServer`.
 For example, consider the following class:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.jmx;

@@ -358,7 +358,7 @@ an operation or an attribute.
 The following example shows the annotated version of the `JmxTestBean` class that we
 used in <<jmx-exporting-mbeanserver>>:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.jmx;

@@ -1067,7 +1067,7 @@ example, consider the scenario where one would like to be informed (through a
 `Notification`) each and every time an attribute of a target MBean changes. The following
 example writes notifications to the console:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package com.example;

@@ -1317,7 +1317,7 @@ published, and invoke the `sendNotification(Notification)` on the
 In the following example, exported instances of the `JmxTestBean` publish a
 `NotificationEvent` every time the `add(int, int)` operation is invoked:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.jmx;

@@ -9,30 +9,6 @@ Traces provide a holistic view of an entire system, crossing application boundar
 Spring Framework instruments various parts of its own codebase to publish observations if an `ObservationRegistry` is configured.
 You can learn more about {docs-spring-boot}/html/actuator.html#actuator.metrics[configuring the observability infrastructure in Spring Boot].

-
-[[integration.observability.list]]
-== List of produced Observations
-
-Spring Framework instruments various features for observability.
-As outlined <<integration.observability,at the beginning of this section>>, observations can generate timer Metrics and/or Traces depending on the configuration.
-
-.Observations produced by Spring Framework
-[%autowidth]
-|===
-|Observation name |Description
-
-|<<integration.observability.http-client,`"http.client.requests"`>>
-|Time spent for HTTP client exchanges
-
-|<<integration.observability.http-server,`"http.server.requests"`>>
-|Processing time for HTTP server exchanges at the Framework level
-|===
-
-NOTE: Observations are using Micrometer's official naming convention, but Metrics names will be automatically converted
-https://micrometer.io/docs/concepts#_naming_meters[to the format preferred by the monitoring system backend]
-(Prometheus, Atlas, Graphite, InfluxDB...).
-
-
 [[integration.observability.concepts]]
 == Micrometer Observation concepts

@@ -91,12 +67,6 @@ HTTP server exchanges observations are created with the name `"http.server.reque
 Applications need to configure the `org.springframework.web.filter.ServerHttpObservationFilter` Servlet filter in their application.
 It is using the `org.springframework.http.server.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.

-This will only record an observation as an error if the `Exception` has not been handled by the web Framework and has bubbled up to the Servlet filter.
-Typically, all exceptions handled by Spring MVC's `@ExceptionHandler` and <<web.adoc#mvc-ann-rest-exceptions,`ProblemDetail` support>> will not be recorded with the observation.
-You can, at any point during request processing, set the error field on the `ObservationContext` yourself:
-
-include::code:UserController[]
-
 By default, the following `KeyValues` are created:

 .Low cardinality Keys
@@ -124,12 +94,6 @@ By default, the following `KeyValues` are created:
 Applications need to configure the `org.springframework.web.filter.reactive.ServerHttpObservationFilter` reactive `WebFilter` in their application.
 It is using the `org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.

-This will only record an observation as an error if the `Exception` has not been handled by the web Framework and has bubbled up to the `WebFilter`.
-Typically, all exceptions handled by Spring WebFlux's `@ExceptionHandler` and <<web.adoc#webflux-ann-rest-exceptions,`ProblemDetail` support>> will not be recorded with the observation.
-You can, at any point during request processing, set the error field on the `ObservationContext` yourself:
-
-include::code:UserController[]
-
 By default, the following `KeyValues` are created:

 .Low cardinality Keys
@@ -161,27 +125,24 @@ Unlike their server counterparts, the instrumentation is implemented directly in
 [[integration.observability.http-client.resttemplate]]
 === RestTemplate

-Applications must configure an `ObservationRegistry` on `RestTemplate` instances to enable the instrumentation; without that, observations are "no-ops".
-Spring Boot will auto-configure `RestTemplateBuilder` beans with the observation registry already set.
-
 Instrumentation is using the `org.springframework.http.client.observation.ClientRequestObservationConvention` by default, backed by the `ClientRequestObservationContext`.

 .Low cardinality Keys
 [cols="a,a"]
 |===
 |Name | Description
-|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
-|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
-|`client.name` _(required)_|Client name derived from the request URI host.
-|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
-|`outcome` _(required)_|Outcome of the HTTP client exchange.
 |`exception` _(required)_|Name of the exception thrown during the exchange, or `"none"` if no exception happened.
+|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
+|`outcome` _(required)_|Outcome of the HTTP client exchange.
+|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
+|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided.
 |===

 .High cardinality Keys
 [cols="a,a"]
 |===
 |Name | Description
+|`client.name` _(required)_|Client name derived from the request URI host.
 |`http.url` _(required)_|HTTP request URI.
 |===

@@ -190,27 +151,24 @@ Instrumentation is using the `org.springframework.http.client.observation.Client
 [[integration.observability.http-client.webclient]]
 === WebClient

-Applications must configure an `ObservationRegistry` on the `WebClient` builder to enable the instrumentation; without that, observations are "no-ops".
-Spring Boot will auto-configure `WebClient.Builder` beans with the observation registry already set.
-
 Instrumentation is using the `org.springframework.web.reactive.function.client.ClientRequestObservationConvention` by default, backed by the `ClientRequestObservationContext`.

 .Low cardinality Keys
 [cols="a,a"]
 |===
 |Name | Description
-|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
-|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
-|`client.name` _(required)_|Client name derived from the request URI host.
-|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
-|`outcome` _(required)_|Outcome of the HTTP client exchange.
 |`exception` _(required)_|Name of the exception thrown during the exchange, or `"none"` if no exception happened.
+|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
+|`outcome` _(required)_|Outcome of the HTTP client exchange.
+|`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
+|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided.
 |===

 .High cardinality Keys
 [cols="a,a"]
 |===
 |Name | Description
+|`client.name` _(required)_|Client name derived from the request URI host.
 |`http.url` _(required)_|HTTP request URI.
 |===

@@ -117,9 +117,6 @@ TIP: Note that the `java.net` implementation for HTTP requests can raise an exce
 accessing the status of a response that represents an error (such as 401). If this is an
 issue, switch to another HTTP client library.

-NOTE: `RestTemplate` can be instrumented for observability, in order to produce metrics and traces.
-See the <<integration.adoc#integration.observability.http-client.resttemplate,RestTemplate Observability support>> section.
-
 [[rest-resttemplate-uri]]
 ==== URIs

@@ -136,16 +136,14 @@ To configure the rules that the `TaskExecutor` uses, we expose simple bean prope
 [[scheduling-task-scheduler]]
 == The Spring `TaskScheduler` Abstraction

-In addition to the `TaskExecutor` abstraction, Spring has a `TaskScheduler` SPI with a
-variety of methods for scheduling tasks to run at some point in the future. The following
-listing shows the `TaskScheduler` interface definition:
+In addition to the `TaskExecutor` abstraction, Spring 3.0 introduced a `TaskScheduler`
+with a variety of methods for scheduling tasks to run at some point in the future.
+The following listing shows the `TaskScheduler` interface definition:

 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	public interface TaskScheduler {

-		Clock getClock();
-
 		ScheduledFuture schedule(Runnable task, Trigger trigger);

 		ScheduledFuture schedule(Runnable task, Instant startTime);
@@ -170,11 +168,12 @@ much more flexible.
 [[scheduling-trigger-interface]]
 === `Trigger` Interface

-The `Trigger` interface is essentially inspired by JSR-236. The basic idea of the
-`Trigger` is that execution times may be determined based on past execution outcomes or
-even arbitrary conditions. If these determinations take into account the outcome of the
-preceding execution, that information is available within a `TriggerContext`. The
-`Trigger` interface itself is quite simple, as the following listing shows:
+The `Trigger` interface is essentially inspired by JSR-236 which, as of Spring 3.0,
+was not yet officially implemented. The basic idea of the `Trigger` is that execution
+times may be determined based on past execution outcomes or even arbitrary conditions.
+If these determinations take into account the outcome of the preceding execution,
+that information is available within a `TriggerContext`. The `Trigger` interface itself
+is quite simple, as the following listing shows:

 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -193,8 +192,6 @@ default). The following listing shows the available methods for `Trigger` implem
 ----
 	public interface TriggerContext {

-		Clock getClock();
-
 		Instant lastScheduledExecution();

 		Instant lastActualExecution();
@@ -816,7 +813,8 @@ its properties from the job data mapped to properties of the job instance. So, i
 the `ExampleJob` contains a bean property named `timeout`, and the `JobDetail`
 has it applied automatically:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0]
+[subs="verbatim"]
 ----
 	package example;

@@ -826,7 +824,7 @@ has it applied automatically:

 		/**
 		 * Setter called after the ExampleJob is instantiated
-		 * with the value from the JobDetailFactoryBean.
+		 * with the value from the JobDetailFactoryBean (5)
 		 */
 		public void setTimeout(int timeout) {
 			this.timeout = timeout;
@@ -33,7 +33,7 @@ implement. Note that this interface is defined in plain Java. Dependent objects
 are injected with a reference to the `Messenger` do not know that the underlying
 implementation is a Groovy script. The following listing shows the `Messenger` interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting;

@@ -45,7 +45,7 @@ implementation is a Groovy script. The following listing shows the `Messenger` i

 The following example defines a class that has a dependency on the `Messenger` interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting;

@@ -65,14 +65,15 @@ The following example defines a class that has a dependency on the `Messenger` i

 The following example implements the `Messenger` interface in Groovy:

-[source,groovy,indent=0,subs="verbatim,quotes",chomp="-packages",fold="none"]
+[source,groovy,indent=0,subs="verbatim,quotes"]
 ----
-	package org.springframework.scripting.groovy
+	// from the file 'Messenger.groovy'
+	package org.springframework.scripting.groovy;

-	// Import the Messenger interface (written in Java) that is to be implemented
+	// import the Messenger interface (written in Java) that is to be implemented
 	import org.springframework.scripting.Messenger

-	// Define the implementation in Groovy in file 'Messenger.groovy'
+	// define the implementation in Groovy
 	class GroovyMessenger implements Messenger {

 		String message
@@ -275,7 +276,7 @@ surrounded by quotation marks. The following listing shows the changes that you
 (the developer) should make to the `Messenger.groovy` source file when the
 execution of the program is paused:

-[source,groovy,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,groovy,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting

@@ -330,13 +331,13 @@ feature works:
 	<lang:groovy id="messenger">
 		<lang:inline-script>

-			package org.springframework.scripting.groovy
+	package org.springframework.scripting.groovy;

-			import org.springframework.scripting.Messenger
+	import org.springframework.scripting.Messenger

-			class GroovyMessenger implements Messenger {
-				String message
-			}
+	class GroovyMessenger implements Messenger {
+		String message
+	}

 		</lang:inline-script>
 		<lang:property name="message" value="I Can Do The Frug" />
@@ -362,13 +363,13 @@ constructors and properties 100% clear, the following mixture of code and config
 does not work:

 .An approach that cannot work
-[source,groovy,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,groovy,indent=0,subs="verbatim,quotes"]
 ----
-	package org.springframework.scripting.groovy
+	// from the file 'Messenger.groovy'
+	package org.springframework.scripting.groovy;

 	import org.springframework.scripting.Messenger

-	// from the file 'Messenger.groovy'
 	class GroovyMessenger implements Messenger {

 		GroovyMessenger() {}
@@ -419,7 +420,7 @@ If you have read this chapter straight from the top, you have already
 <<dynamic-language-a-first-example, seen an example>> of a Groovy-dynamic-language-backed
 bean. Now consider another example (again using an example from the Spring test suite):

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting;

@@ -431,11 +432,11 @@ bean. Now consider another example (again using an example from the Spring test

 The following example implements the `Calculator` interface in Groovy:

-[source,groovy,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,groovy,indent=0,subs="verbatim,quotes"]
 ----
+	// from the file 'calculator.groovy'
 	package org.springframework.scripting.groovy

-	// from the file 'calculator.groovy'
 	class GroovyCalculator implements Calculator {

 		int add(int x, int y) {
@@ -456,7 +457,7 @@ The following bean definition uses the calculator defined in Groovy:

 Finally, the following small application exercises the preceding configuration:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting;

@@ -595,7 +596,7 @@ Now we can show a fully working example of using a BeanShell-based bean that imp
 the `Messenger` interface that was defined earlier in this chapter. We again show the
 definition of the `Messenger` interface:

-[source,java,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
 	package org.springframework.scripting;

@@ -675,8 +676,9 @@ beans, you have to enable the "`refreshable beans`" functionality. See
 The following example shows an `org.springframework.web.servlet.mvc.Controller` implemented
 by using the Groovy dynamic language:

-[source,groovy,indent=0,subs="verbatim,quotes",chomp="-packages"]
+[source,groovy,indent=0,subs="verbatim,quotes"]
 ----
+	// from the file '/WEB-INF/groovy/FortuneController.groovy'
 	package org.springframework.showcase.fortune.web

 	import org.springframework.showcase.fortune.service.FortuneService
@@ -687,7 +689,6 @@ by using the Groovy dynamic language:
 	import jakarta.servlet.http.HttpServletRequest
 	import jakarta.servlet.http.HttpServletResponse

-	// from the file '/WEB-INF/groovy/FortuneController.groovy'
 	class FortuneController implements Controller {

 		@Property FortuneService fortuneService
@@ -1,7 +1,5 @@
 :noheader:
 :toc:
-:toclevels: 4
-:tabsize: 4
 include::attributes.adoc[]
 = Spring Framework Documentation
 Rod Johnson; Juergen Hoeller; Keith Donald; Colin Sampaleanu; Rob Harrop; Thomas Risberg; Alef Arendsen; Darren Davison; Dmitriy Kopylenko; Mark Pollack; Thierry Templier; Erwin Vervaet; Portia Tung; Ben Hale; Adrian Colyer; John Lewis; Costin Leau; Mark Fisher; Sam Brannen; Ramnivas Laddad; Arjen Poutsma; Chris Beams; Tareq Abedrabbo; Andy Clement; Dave Syer; Oliver Gierke; Rossen Stoyanchev; Phillip Webb; Rob Winch; Brian Clozel; Stephane Nicoll; Sebastien Deleuze; Jay Bryant; Mark Paluch
@@ -11,7 +9,7 @@ NOTE: This documentation is also available in {docs-spring-framework}/reference/
 [[legal]]
 == Legal

-Copyright © 2002 - 2023 VMware, Inc. All Rights Reserved.
+Copyright © 2002 - 2022 VMware, Inc. All Rights Reserved.

 Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.

@@ -2022,13 +2022,12 @@ properties.
 	class ExampleIntegrationTests {

 		@Container
-		static GenericContainer redis =
-			new GenericContainer("redis:5.0.3-alpine").withExposedPorts(6379);
+		static RedisContainer redis = new RedisContainer();

 		@DynamicPropertySource
 		static void redisProperties(DynamicPropertyRegistry registry) {
 			registry.add("redis.host", redis::getHost);
-			registry.add("redis.port", redis::getFirstMappedPort);
+			registry.add("redis.port", redis::getMappedPort);
 		}

 		// tests ...
@@ -2046,14 +2045,13 @@ properties.

 			@Container
 			@JvmStatic
-			val redis: GenericContainer =
-				GenericContainer("redis:5.0.3-alpine").withExposedPorts(6379)
+			val redis: RedisContainer = RedisContainer()

 			@DynamicPropertySource
 			@JvmStatic
 			fun redisProperties(registry: DynamicPropertyRegistry) {
 				registry.add("redis.host", redis::getHost)
-				registry.add("redis.port", redis::getFirstMappedPort)
+				registry.add("redis.port", redis::getMappedPort)
 			}
 		}

@@ -251,7 +251,7 @@ By default global configuration enables the following:
 * `GET`, `HEAD`, and `POST` methods.

 `allowedCredentials` is not enabled by default, since that establishes a trust level
-that exposes sensitive user-specific information (such as cookies and CSRF tokens) and
+that exposes sensitive user-specific information( such as cookies and CSRF tokens) and
 should be used only where appropriate. When it is enabled either `allowOrigins` must be
 set to one or more specific domain (but not the special value `"*"`) or alternatively
 the `allowOriginPatterns` property may be used to match to a dynamic set of origins.
@@ -38,8 +38,6 @@ You can also use `WebClient.builder()` with further options:
 * `filter`: Client filter for every request.
 * `exchangeStrategies`: HTTP message reader/writer customizations.
 * `clientConnector`: HTTP client library settings.
-* `observationRegistry`: the registry to use for enabling <<integration.adoc#integration.observability.http-client.webclient, Observability support>>.
-* `observationConvention`: <<integration.adoc#integration.observability.config,an optional, custom convention to extract metadata>> for recorded observations.

 For example:

@@ -613,8 +613,8 @@ The `DefaultServerWebExchange` uses the configured `HttpMessageReader` to parse
 ----

 The `DefaultServerWebExchange` uses the configured
-`HttpMessageReader<MultiValueMap<String, Part>>` to parse `multipart/form-data`,  
-`multipart/mixed`, and `multipart/related` content into a `MultiValueMap`.
+`HttpMessageReader<MultiValueMap<String, Part>>` to parse `multipart/form-data` content
+into a `MultiValueMap`.
 By default, this is the `DefaultPartHttpMessageReader`, which does not have any third-party
 dependencies.
 Alternatively, the `SynchronossPartHttpMessageReader` can be used, which is based on the
@@ -805,9 +805,9 @@ consistently for access to the cached form data versus reading from the raw requ
 ==== Multipart

 `MultipartHttpMessageReader` and `MultipartHttpMessageWriter` support decoding and
-encoding "multipart/form-data", "multipart/mixed", and "multipart/related" content.
-In turn `MultipartHttpMessageReader` delegates to another `HttpMessageReader` 
-for the actual parsing to a `Flux<Part>` and then simply collects the parts into a `MultiValueMap`.
+encoding "multipart/form-data" content. In turn `MultipartHttpMessageReader` delegates to
+another `HttpMessageReader` for the actual parsing to a `Flux<Part>` and then simply
+collects the parts into a `MultiValueMap`.
 By default, the `DefaultPartHttpMessageReader` is used, but this can be changed through the
 `ServerCodecConfigurer`.
 For more information about the `DefaultPartHttpMessageReader`, refer to the
@@ -2504,7 +2504,7 @@ reactive type, as the following example shows:
 ----

 Note that use of `@ModelAttribute` is optional -- for example, to set its attributes.
-By default, any argument that is not a simple value type (as determined by
+By default, any argument that is not a simple value type( as determined by
 {api-spring-framework}/beans/BeanUtils.html#isSimpleProperty-java.lang.Class-[BeanUtils#isSimpleProperty])
 and is not resolved by any other argument resolver is treated as if it were annotated
 with `@ModelAttribute`.
@@ -1649,6 +1649,138 @@ is the default type.



+[[mvc-view-tiles]]
+== Tiles
+
+You can integrate Tiles - just as any other view technology - in web
+applications that use Spring. This section describes, in a broad way, how to do so.
+
+NOTE: This section focuses on Spring's support for Tiles version 3 in the
+`org.springframework.web.servlet.view.tiles3` package.
+
+
+
+[[mvc-view-tiles-dependencies]]
+=== Dependencies
+
+To be able to use Tiles, you have to add a dependency on Tiles version 3.0.1 or higher
+and https://tiles.apache.org/framework/dependency-management.html[its transitive dependencies]
+to your project.
+
+
+
+[[mvc-view-tiles-integrate]]
+=== Configuration
+
+To be able to use Tiles, you have to configure it by using files that contain definitions
+(for basic information on definitions and other Tiles concepts, see
+https://tiles.apache.org[]). In Spring, this is done by using the `TilesConfigurer`.
+The following example `ApplicationContext` configuration shows how to do so:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+		<property name="definitions">
+			<list>
+				<value>/WEB-INF/defs/general.xml</value>
+				<value>/WEB-INF/defs/widgets.xml</value>
+				<value>/WEB-INF/defs/administrator.xml</value>
+				<value>/WEB-INF/defs/customer.xml</value>
+				<value>/WEB-INF/defs/templates.xml</value>
+			</list>
+		</property>
+	</bean>
+----
+
+The preceding example defines five files that contain definitions. The files are all
+located in the `WEB-INF/defs` directory. At initialization of the `WebApplicationContext`,
+the files are loaded, and the definitions factory are initialized. After that has
+been done, the Tiles included in the definition files can be used as views within your
+Spring web application. To be able to use the views, you have to have a `ViewResolver`
+as with any other view technology in Spring: typically a convenient `TilesViewResolver`.
+
+You can specify locale-specific Tiles definitions by adding an underscore and then
+the locale, as the following example shows:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+		<property name="definitions">
+			<list>
+				<value>/WEB-INF/defs/tiles.xml</value>
+				<value>/WEB-INF/defs/tiles_fr_FR.xml</value>
+			</list>
+		</property>
+	</bean>
+----
+
+With the preceding configuration, `tiles_fr_FR.xml` is used for requests with the `fr_FR` locale,
+and `tiles.xml` is used by default.
+
+NOTE: Since underscores are used to indicate locales, we recommended not using
+them otherwise in the file names for Tiles definitions.
+
+
+
+[[mvc-view-tiles-url]]
+==== `UrlBasedViewResolver`
+
+The `UrlBasedViewResolver` instantiates the given `viewClass` for each view it has to
+resolve. The following bean defines a `UrlBasedViewResolver`:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
+		<property name="viewClass" value="org.springframework.web.servlet.view.tiles3.TilesView"/>
+	</bean>
+----
+
+
+[[mvc-view-tiles-preparer]]
+==== `SimpleSpringPreparerFactory` and `SpringBeanPreparerFactory`
+
+As an advanced feature, Spring also supports two special Tiles `PreparerFactory`
+implementations. See the Tiles documentation for details on how to use
+`ViewPreparer` references in your Tiles definition files.
+
+You can specify `SimpleSpringPreparerFactory` to autowire `ViewPreparer` instances based on
+specified preparer classes, applying Spring's container callbacks as well as applying
+configured Spring BeanPostProcessors. If Spring's context-wide annotation configuration has
+been activated, annotations in `ViewPreparer` classes are automatically detected and
+applied. Note that this expects preparer classes in the Tiles definition files, as
+the default `PreparerFactory` does.
+
+You can specify `SpringBeanPreparerFactory` to operate on specified preparer names (instead
+of classes), obtaining the corresponding Spring bean from the DispatcherServlet's
+application context. The full bean creation process is in the control of the Spring
+application context in this case, allowing for the use of explicit dependency injection
+configuration, scoped beans, and so on. Note that you need to define one Spring bean definition
+for each preparer name (as used in your Tiles definitions). The following example shows
+how to define a `SpringBeanPreparerFactory` property on a `TilesConfigurer` bean:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
+		<property name="definitions">
+			<list>
+				<value>/WEB-INF/defs/general.xml</value>
+				<value>/WEB-INF/defs/widgets.xml</value>
+				<value>/WEB-INF/defs/administrator.xml</value>
+				<value>/WEB-INF/defs/customer.xml</value>
+				<value>/WEB-INF/defs/templates.xml</value>
+			</list>
+		</property>
+
+		<!-- resolving preparer names as Spring bean definition names -->
+		<property name="preparerFactoryClass"
+				value="org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory"/>
+
+	</bean>
+----
+
+
+
+
 [[mvc-view-feeds]]
 == RSS and Atom

@@ -802,8 +802,8 @@ The following table provides more details on the `ViewResolver` hierarchy:

 | `InternalResourceViewResolver`
 | Convenient subclass of `UrlBasedViewResolver` that supports `InternalResourceView` (in
-  effect, Servlets and JSPs) and subclasses such as `JstlView`. You can specify the view
-  class for all views generated by this resolver by using `setViewClass(..)`.
+  effect, Servlets and JSPs) and subclasses such as `JstlView` and `TilesView`. You can
+  specify the view class for all views generated by this resolver by using `setViewClass(..)`.
  See the {api-spring-framework}/web/reactive/result/view/UrlBasedViewResolver.html[`UrlBasedViewResolver`]
  javadoc for details.

@@ -4777,7 +4777,7 @@ directly. For example:
 	ContextSnapshot snapshot = ContextSnapshot.captureAll();

 	// On a different thread: restore ThreadLocal values
-	try (ContextSnapshot.Scope scope = snapshot.setThreadLocals()) {
+	try (ContextSnapshot.Scope scoped = snapshot.setThreadLocals()) {
 		// ...
 	}
 ----
@@ -5888,7 +5888,7 @@ The following example shows how to achieve the same configuration in XML:
 	</mvc:view-resolvers>
 ----

-Note, however, that FreeMarker, Groovy Markup, and script templates also require
+Note, however, that FreeMarker, Tiles, Groovy Markup, and script templates also require
 configuration of the underlying view technology.

 The MVC namespace provides dedicated elements. The following example works with FreeMarker:
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -30,8 +30,6 @@ public class AotProcessingSample {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.register(MyApplication.class);
 		context.refreshForAotProcessing(hints);
-		// ...
-		context.close();
 		// end::aotcontext[]
 	}

@@ -1,42 +0,0 @@
-/*
- * 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.
- * 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.docs.integration.observability.httpserver.reactive;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.filter.reactive.ServerHttpObservationFilter;
-import org.springframework.web.server.ServerWebExchange;
-
-@Controller
-public class UserController {
-
-	@ExceptionHandler(MissingUserException.class)
-	ResponseEntity<Void> handleMissingUser(ServerWebExchange exchange, MissingUserException exception) {
-		// We want to record this exception with the observation
-		ServerHttpObservationFilter.findObservationContext(exchange)
-				.ifPresent(context -> context.setError(exception));
-		return ResponseEntity.notFound().build();
-	}
-
-	// @fold:on
-	@SuppressWarnings("serial")
-	static class MissingUserException extends RuntimeException {
-	}
-	// @fold:off
-
-}
@@ -1,43 +0,0 @@
-/*
- * 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.
- * 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.docs.integration.observability.httpserver.servlet;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.filter.ServerHttpObservationFilter;
-
-@Controller
-public class UserController {
-
-	@ExceptionHandler(MissingUserException.class)
-	ResponseEntity<Void> handleMissingUser(HttpServletRequest request, MissingUserException exception) {
-		// We want to record this exception with the observation
-		ServerHttpObservationFilter.findObservationContext(request)
-				.ifPresent(context -> context.setError(exception));
-		return ResponseEntity.notFound().build();
-	}
-
-	// @fold:on
-	@SuppressWarnings("serial")
-	static class MissingUserException extends RuntimeException {
-	}
-	// @fold:off
-
-}
@@ -7,23 +7,23 @@ javaPlatform {
 }

 dependencies {
-	api(platform("com.fasterxml.jackson:jackson-bom:2.14.2"))
-	api(platform("io.micrometer:micrometer-bom:1.10.4"))
-	api(platform("io.netty:netty-bom:4.1.90.Final"))
+	api(platform("com.fasterxml.jackson:jackson-bom:2.14.1"))
+	api(platform("io.micrometer:micrometer-bom:1.10.3"))
+	api(platform("io.netty:netty-bom:4.1.86.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
-	api(platform("io.projectreactor:reactor-bom:2022.0.5"))
+	api(platform("io.projectreactor:reactor-bom:2022.0.2"))
 	api(platform("io.rsocket:rsocket-bom:1.1.3"))
-	api(platform("org.apache.groovy:groovy-bom:4.0.8"))
-	api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
-	api(platform("org.eclipse.jetty:jetty-bom:11.0.14"))
+	api(platform("org.apache.groovy:groovy-bom:4.0.6"))
+	api(platform("org.apache.logging.log4j:log4j-bom:2.19.0"))
+	api(platform("org.eclipse.jetty:jetty-bom:11.0.13"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.4.0"))
 	api(platform("org.junit:junit-bom:5.9.2"))
-	api(platform("org.mockito:mockito-bom:5.2.0"))
+	api(platform("org.mockito:mockito-bom:4.9.0"))  // spring-beans tests fail with 4.10+

 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.1")
-		api("com.fasterxml.woodstox:woodstox-core:6.5.0")
+		api("com.fasterxml.woodstox:woodstox-core:6.4.0")
 		api("com.github.ben-manes.caffeine:caffeine:3.1.2")
 		api("com.github.librepdf:openpdf:1.3.30")
 		api("com.google.code.findbugs:findbugs:3.0.1")
@@ -55,9 +55,9 @@ dependencies {
 		api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
 		api("io.reactivex.rxjava3:rxjava:3.1.5")
 		api("io.smallrye.reactive:mutiny:1.8.0")
-		api("io.undertow:undertow-core:2.3.4.Final")
-		api("io.undertow:undertow-servlet:2.3.4.Final")
-		api("io.undertow:undertow-websockets-jsr:2.3.4.Final")
+		api("io.undertow:undertow-core:2.3.2.Final")
+		api("io.undertow:undertow-servlet:2.3.2.Final")
+		api("io.undertow:undertow-websockets-jsr:2.3.2.Final")
 		api("io.vavr:vavr:0.10.4")
 		api("jakarta.activation:jakarta.activation-api:2.0.1")
 		api("jakarta.annotation:jakarta.annotation-api:2.0.0")
@@ -87,7 +87,7 @@ dependencies {
 		api("jaxen:jaxen:1.2.0")
 		api("junit:junit:4.13.2")
 		api("net.sf.jopt-simple:jopt-simple:5.0.4")
-		api("net.sourceforge.htmlunit:htmlunit:2.70.0")
+		api("net.sourceforge.htmlunit:htmlunit:2.69.0")
 		api("org.apache-extras.beanshell:bsh:2.0b6")
 		api("org.apache.activemq:activemq-broker:5.16.2")
 		api("org.apache.activemq:activemq-kahadb-store:5.16.2")
@@ -97,16 +97,16 @@ dependencies {
 		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.2.1")
-		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.1")
+		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2")
 		api("org.apache.poi:poi-ooxml:5.2.3")
-		api("org.apache.tomcat.embed:tomcat-embed-core:10.1.7")
-		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.7")
-		api("org.apache.tomcat:tomcat-util:10.1.7")
-		api("org.apache.tomcat:tomcat-websocket:10.1.7")
+		api("org.apache.tomcat.embed:tomcat-embed-core:10.1.4")
+		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.4")
+		api("org.apache.tomcat:tomcat-util:10.1.4")
+		api("org.apache.tomcat:tomcat-websocket:10.1.4")
 		api("org.aspectj:aspectjrt:1.9.9.1")
 		api("org.aspectj:aspectjtools:1.9.9.1")
 		api("org.aspectj:aspectjweaver:1.9.9.1")
-		api("org.assertj:assertj-core:3.24.2")
+		api("org.assertj:assertj-core:3.24.1")
 		api("org.awaitility:awaitility:3.1.6")
 		api("org.bouncycastle:bcpkix-jdk18on:1.71")
 		api("org.codehaus.jettison:jettison:1.3.8")
@@ -116,7 +116,7 @@ dependencies {
 		api("org.eclipse:yasson:2.0.4")
 		api("org.ehcache:ehcache:3.4.0")
 		api("org.ehcache:jcache:1.0.1")
-		api("org.freemarker:freemarker:2.3.32")
+		api("org.freemarker:freemarker:2.3.31")
 		// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
 		// is not available on Maven Central
 		api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
@@ -124,7 +124,7 @@ dependencies {
 		api("org.glassfish:jakarta.el:4.0.2")
 		api("org.graalvm.sdk:graal-sdk:22.3.0")
 		api("org.hamcrest:hamcrest:2.2")
-		api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
+		api("org.hibernate:hibernate-core-jakarta:5.6.14.Final")
 		api("org.hibernate:hibernate-validator:7.0.5.Final")
 		api("org.hsqldb:hsqldb:2.7.1")
 		api("org.javamoney:moneta:1.4.2")
@@ -134,15 +134,15 @@ dependencies {
 		api("org.ogce:xpp3:1.1.6")
 		api("org.python:jython-standalone:2.7.1")
 		api("org.quartz-scheduler:quartz:2.3.2")
-		api("org.seleniumhq.selenium:htmlunit-driver:2.70.0")
+		api("org.seleniumhq.selenium:htmlunit-driver:2.67.0")
 		api("org.seleniumhq.selenium:selenium-java:3.141.59")
 		api("org.skyscreamer:jsonassert:1.5.0")
 		api("org.slf4j:slf4j-api:2.0.6")
-		api("org.testng:testng:7.7.1")
+		api("org.testng:testng:7.6.1")
 		api("org.webjars:underscorejs:1.8.3")
 		api("org.webjars:webjars-locator-core:0.52")
-		api("org.xmlunit:xmlunit-assertj:2.9.1")
-		api("org.xmlunit:xmlunit-matchers:2.9.1")
+		api("org.xmlunit:xmlunit-assertj:2.9.0")
+		api("org.xmlunit:xmlunit-matchers:2.9.0")
 		api("org.yaml:snakeyaml:1.33")
 	}
 }
@@ -1,4 +1,4 @@
-version=6.0.7
+version=6.0.4

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
@@ -5,10 +5,10 @@
 * One can choose the toolchain to use for compiling the MAIN sources and/or compiling
 * and running the TEST sources. These options apply to Java, Kotlin and Groovy sources
 * when available.
- * {@code "./gradlew check -PmainToolchain=17 -PtestToolchain=19"} will use:
+ * {@code "./gradlew check -PmainToolchain=17 -PtestToolchain=18"} will use:
 * <ul>
 *     <li>a JDK17 toolchain for compiling the main SourceSet
- *     <li>a JDK19 toolchain for compiling and running the test SourceSet
+ *     <li>a JDK18 toolchain for compiling and running the test SourceSet
 * </ul>
 *
 * By default, the build will fall back to using the current JDK and 17 language level for all sourceSets.
@@ -23,9 +23,9 @@
 * {@code
 * $ echo JDK17
 * /opt/openjdk/java17
- * $ echo JDK19
+ * $ echo JDK18
 * /opt/openjdk/java18
- * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK17,JDK19 check
+ * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK17,JDK18 check
 * }
 *
 * @author Brian Clozel
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -151,7 +151,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {

 		@Bean
 		PersistenceExceptionTranslator peTranslator() {
-			return mock();
+			return mock(PersistenceExceptionTranslator.class);
 		}

 		@Bean
@@ -7,7 +7,7 @@ pluginManagement {
 }

 plugins {
-	id "com.gradle.enterprise" version "3.12.3"
+	id "com.gradle.enterprise" version "3.12.1"
 	id "io.spring.ge.conventions" version "0.0.13"
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -248,42 +248,38 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	}

 	/**
-	 * Set by the creator of this advice object if the argument names are known.
-	 * <p>This could be for example because they have been explicitly specified in XML
+	 * Set by creator of this advice object if the argument names are known.
+	 * <p>This could be for example because they have been explicitly specified in XML,
 	 * or in an advice annotation.
-	 * @param argumentNames comma delimited list of argument names
+	 * @param argNames comma delimited list of arg names
 	 */
-	public void setArgumentNames(String argumentNames) {
-		String[] tokens = StringUtils.commaDelimitedListToStringArray(argumentNames);
+	public void setArgumentNames(String argNames) {
+		String[] tokens = StringUtils.commaDelimitedListToStringArray(argNames);
 		setArgumentNamesFromStringArray(tokens);
 	}

-	/**
-	 * Set by the creator of this advice object if the argument names are known.
-	 * <p>This could be for example because they have been explicitly specified in XML
-	 * or in an advice annotation.
-	 * @param argumentNames list of argument names
-	 */
-	public void setArgumentNamesFromStringArray(String... argumentNames) {
-		this.argumentNames = new String[argumentNames.length];
-		for (int i = 0; i < argumentNames.length; i++) {
-			this.argumentNames[i] = argumentNames[i].strip();
+	public void setArgumentNamesFromStringArray(String... args) {
+		this.argumentNames = new String[args.length];
+		for (int i = 0; i < args.length; i++) {
+			this.argumentNames[i] = args[i].strip();
 			if (!isVariableName(this.argumentNames[i])) {
 				throw new IllegalArgumentException(
 						"'argumentNames' property of AbstractAspectJAdvice contains an argument name '" +
 						this.argumentNames[i] + "' that is not a valid Java identifier");
 			}
 		}
-		if (this.aspectJAdviceMethod.getParameterCount() == this.argumentNames.length + 1) {
-			// May need to add implicit join point arg name...
-			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);
+		if (this.argumentNames != null) {
+			if (this.aspectJAdviceMethod.getParameterCount() == this.argumentNames.length + 1) {
+				// May need to add implicit join point arg name...
+				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-2023 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.
@@ -38,14 +38,6 @@ import org.springframework.util.StringUtils;
 * for an advice method from the pointcut expression, returning, and throwing clauses.
 * If an unambiguous interpretation is not available, it returns {@code null}.
 *
- * <h3>Algorithm Summary</h3>
- * <p>If an unambiguous binding can be deduced, then it is.
- * If the advice requirements cannot possibly be satisfied, then {@code null}
- * is returned. By setting the {@link #setRaiseExceptions(boolean) raiseExceptions}
- * property to {@code true}, descriptive exceptions will be thrown instead of
- * returning {@code null} in the case that the parameter names cannot be discovered.
- *
- * <h3>Algorithm Details</h3>
 * <p>This class interprets arguments in the following way:
 * <ol>
 * <li>If the first parameter of the method is of type {@link JoinPoint}
@@ -73,15 +65,15 @@ import org.springframework.util.StringUtils;
 * zero we proceed to the next stage. If {@code a} &gt; 1 then an
 * {@code AmbiguousBindingException} is raised. If {@code a} == 1,
 * and there are no unbound arguments of type {@code Annotation+},
- * then an {@code IllegalArgumentException} is raised. If there is
+ * then an {@code IllegalArgumentException} is raised. if there is
 * exactly one such argument, then the corresponding parameter name is
 * assigned the value from the pointcut expression.</li>
- * <li>If a {@code returningName} has been set, and there are no unbound arguments
+ * <li>If a returningName has been set, and there are no unbound arguments
 * then an {@code IllegalArgumentException} is raised. If there is
 * more than one unbound argument then an
 * {@code AmbiguousBindingException} is raised. If there is exactly
 * one unbound argument then the corresponding parameter name is assigned
- * the value of the {@code returningName}.</li>
+ * the value &lt;returningName&gt;.</li>
 * <li>If there remain unbound arguments, then the pointcut expression is
 * examined once more for {@code this}, {@code target}, and
 * {@code args} pointcut expressions used in the binding form (binding
@@ -107,12 +99,20 @@ import org.springframework.util.StringUtils;
 * <p>The behavior on raising an {@code IllegalArgumentException} or
 * {@code AmbiguousBindingException} is configurable to allow this discoverer
 * to be used as part of a chain-of-responsibility. By default the condition will
- * be logged and the {@link #getParameterNames(Method)} method will simply return
+ * be logged and the {@code getParameterNames(..)} method will simply return
 * {@code null}. If the {@link #setRaiseExceptions(boolean) raiseExceptions}
 * property is set to {@code true}, the conditions will be thrown as
 * {@code IllegalArgumentException} and {@code AmbiguousBindingException},
 * respectively.
 *
+ * <p>Was that perfectly clear? ;)
+ *
+ * <p>Short version: If an unambiguous binding can be deduced, then it is.
+ * If the advice requirements cannot possibly be satisfied, then {@code null}
+ * is returned. By setting the {@link #setRaiseExceptions(boolean) raiseExceptions}
+ * property to {@code true}, descriptive exceptions will be thrown instead of
+ * returning {@code null} in the case that the parameter names cannot be discovered.
+ *
 * @author Adrian Colyer
 * @author Juergen Hoeller
 * @since 2.0
@@ -197,7 +197,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov

 	/**
 	 * If {@code afterReturning} advice binds the return value, the
-	 * {@code returning} variable name must be specified.
+	 * returning variable name must be specified.
 	 * @param returningName the name of the returning variable
 	 */
 	public void setReturningName(@Nullable String returningName) {
@@ -206,17 +206,18 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov

 	/**
 	 * If {@code afterThrowing} advice binds the thrown value, the
-	 * {@code throwing} variable name must be specified.
+	 * throwing variable name must be specified.
 	 * @param throwingName the name of the throwing variable
 	 */
 	public void setThrowingName(@Nullable String throwingName) {
 		this.throwingName = throwingName;
 	}

+
 	/**
 	 * Deduce the parameter names for an advice method.
-	 * <p>See the {@link AspectJAdviceParameterNameDiscoverer class-level javadoc}
-	 * for this class for details on the algorithm used.
+	 * <p>See the {@link AspectJAdviceParameterNameDiscoverer class level javadoc}
+	 * for this class for details of the algorithm used.
 	 * @param method the target {@link Method}
 	 * @return the parameter names
 	 */
@@ -243,18 +244,31 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 			int algorithmicStep = STEP_JOIN_POINT_BINDING;
 			while ((this.numberOfRemainingUnboundArguments > 0) && algorithmicStep < STEP_FINISHED) {
 				switch (algorithmicStep++) {
-					case STEP_JOIN_POINT_BINDING -> {
+					case STEP_JOIN_POINT_BINDING:
 						if (!maybeBindThisJoinPoint()) {
 							maybeBindThisJoinPointStaticPart();
 						}
-					}
-					case STEP_THROWING_BINDING -> maybeBindThrowingVariable();
-					case STEP_ANNOTATION_BINDING -> maybeBindAnnotationsFromPointcutExpression();
-					case STEP_RETURNING_BINDING -> maybeBindReturningVariable();
-					case STEP_PRIMITIVE_ARGS_BINDING -> maybeBindPrimitiveArgsFromPointcutExpression();
-					case STEP_THIS_TARGET_ARGS_BINDING -> maybeBindThisOrTargetOrArgsFromPointcutExpression();
-					case STEP_REFERENCE_PCUT_BINDING -> maybeBindReferencePointcutParameter();
-					default -> throw new IllegalStateException("Unknown algorithmic step: " + (algorithmicStep - 1));
+						break;
+					case STEP_THROWING_BINDING:
+						maybeBindThrowingVariable();
+						break;
+					case STEP_ANNOTATION_BINDING:
+						maybeBindAnnotationsFromPointcutExpression();
+						break;
+					case STEP_RETURNING_BINDING:
+						maybeBindReturningVariable();
+						break;
+					case STEP_PRIMITIVE_ARGS_BINDING:
+						maybeBindPrimitiveArgsFromPointcutExpression();
+						break;
+					case STEP_THIS_TARGET_ARGS_BINDING:
+						maybeBindThisOrTargetOrArgsFromPointcutExpression();
+						break;
+					case STEP_REFERENCE_PCUT_BINDING:
+						maybeBindReferencePointcutParameter();
+						break;
+					default:
+						throw new IllegalStateException("Unknown algorithmic step: " + (algorithmicStep - 1));
 				}
 			}
 		}
@@ -308,7 +322,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	}

 	/**
-	 * If the first parameter is of type JoinPoint or ProceedingJoinPoint, bind "thisJoinPoint" as
+	 * If the first parameter is of type JoinPoint or ProceedingJoinPoint,bind "thisJoinPoint" as
 	 * parameter name and return true, else return false.
 	 */
 	private boolean maybeBindThisJoinPoint() {
@@ -347,14 +361,14 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 					// Second candidate we've found - ambiguous binding
 					throw new AmbiguousBindingException("Binding of throwing parameter '" +
 							this.throwingName + "' is ambiguous: could be bound to argument " +
-							throwableIndex + " or " + i);
+							throwableIndex + " or argument " + i);
 				}
 			}
 		}

 		if (throwableIndex == -1) {
-			throw new IllegalStateException("Binding of throwing parameter '" + this.throwingName +
-					"' could not be completed as no available arguments are a subtype of Throwable");
+			throw new IllegalStateException("Binding of throwing parameter '" + this.throwingName
+					+ "' could not be completed as no available arguments are a subtype of Throwable");
 		}
 		else {
 			bindParameterName(throwableIndex, this.throwingName);
@@ -373,7 +387,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.");
+						"' is ambiguous, there are " + this.numberOfRemainingUnboundArguments + " candidates.");
 			}

 			// We're all set... find the unbound parameter, and bind it.
@@ -386,6 +400,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		}
 	}

+
 	/**
 	 * Parse the string pointcut expression looking for:
 	 * &#64;this, &#64;target, &#64;args, &#64;within, &#64;withincode, &#64;annotation.
@@ -429,7 +444,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 			int numAnnotationSlots = countNumberOfUnboundAnnotationArguments();
 			if (numAnnotationSlots > 1) {
 				throw new AmbiguousBindingException("Found " + varNames.size() +
-						" potential annotation variable(s) and " +
+						" potential annotation variable(s), and " +
 						numAnnotationSlots + " potential argument slots");
 			}
 			else if (numAnnotationSlots == 1) {
@@ -450,7 +465,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		}
 	}

-	/**
+	/*
 	 * If the token starts meets Java identifier conventions, it's in.
 	 */
 	@Nullable
@@ -486,7 +501,7 @@ 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");
+					+ " unbound args at this(),target(),args() binding stage, with no way to determine between them");
 		}

 		List<String> varNames = new ArrayList<>();
@@ -518,9 +533,10 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 			}
 		}

+
 		if (varNames.size() > 1) {
 			throw new AmbiguousBindingException("Found " + varNames.size() +
-					" candidate this(), target(), or args() variables but only one unbound argument slot");
+					" candidate this(), target() or args() variables but only one unbound argument slot");
 		}
 		else if (varNames.size() == 1) {
 			for (int j = 0; j < this.parameterNameBindings.length; j++) {
@@ -593,7 +609,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		// else varNames.size must be 0 and we have nothing to bind.
 	}

-	/**
+	/*
 	 * We've found the start of a binding pointcut at the given index into the
 	 * token array. Now we need to extract the pointcut body and return it.
 	 */
@@ -646,8 +662,8 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	private void maybeBindPrimitiveArgsFromPointcutExpression() {
 		int numUnboundPrimitives = countNumberOfUnboundPrimitiveArguments();
 		if (numUnboundPrimitives > 1) {
-			throw new AmbiguousBindingException("Found " + numUnboundPrimitives +
-					" unbound primitive arguments with no way to distinguish between them.");
+			throw new AmbiguousBindingException("Found '" + numUnboundPrimitives +
+					"' unbound primitive arguments with no way to distinguish between them.");
 		}
 		if (numUnboundPrimitives == 1) {
 			// Look for arg variable and bind it if we find exactly one...
@@ -693,7 +709,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		return false;
 	}

-	/**
+	/*
 	 * Return {@code true} if the given argument type is a subclass
 	 * of the given supertype.
 	 */
@@ -721,7 +737,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 		return count;
 	}

-	/**
+	/*
 	 * Find the argument index with the given type, and bind the given
 	 * {@code varName} in that position.
 	 */
@@ -738,10 +754,22 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov


 	/**
-	 * Simple record to hold the extracted text from a pointcut body, together
+	 * Simple struct 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 static class PointcutBody {
+
+		private final int numTokensConsumed;
+
+		@Nullable
+		private final String text;
+
+		public PointcutBody(int tokens, @Nullable String text) {
+			this.numTokensConsumed = tokens;
+			this.text = text;
+		}
+	}
+

 	/**
 	 * Thrown in response to an ambiguous binding being detected when
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -117,7 +117,7 @@ public class TypePatternClassFilter implements ClassFilter {
 	}

 	@Override
-	public boolean equals(@Nullable Object obj) {
+	public boolean equals(Object obj) {
 		return (this == obj || (obj instanceof TypePatternClassFilter that &&
 				ObjectUtils.nullSafeEquals(this.typePattern, that.typePattern)));
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -20,6 +20,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.Map;
 import java.util.StringTokenizer;

@@ -51,7 +52,6 @@ import org.springframework.lang.Nullable;
 * @author Rod Johnson
 * @author Adrian Colyer
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 2.0
 */
 public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFactory {
@@ -101,6 +101,14 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac

 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
+		// If the parent has the annotation and isn't abstract it's an error
+		Class<?> superclass = aspectClass.getSuperclass();
+		if (superclass.getAnnotation(Aspect.class) != null &&
+				!Modifier.isAbstract(superclass.getModifiers())) {
+			throw new AopConfigException("[" + aspectClass.getName() + "] cannot extend concrete aspect [" +
+					superclass.getName() + "]");
+		}
+
 		AjType<?> ajType = AjTypeSystem.getAjType(aspectClass);
 		if (!ajType.isAspect()) {
 			throw new NotAnAtAspectException(aspectClass);
@@ -121,21 +129,21 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 */
 	@SuppressWarnings("unchecked")
 	@Nullable
-	protected static AspectJAnnotation findAspectJAnnotationOnMethod(Method method) {
-		for (Class<?> annotationType : ASPECTJ_ANNOTATION_CLASSES) {
-			AspectJAnnotation annotation = findAnnotation(method, (Class<Annotation>) annotationType);
-			if (annotation != null) {
-				return annotation;
+	protected static AspectJAnnotation<?> findAspectJAnnotationOnMethod(Method method) {
+		for (Class<?> clazz : ASPECTJ_ANNOTATION_CLASSES) {
+			AspectJAnnotation<?> foundAnnotation = findAnnotation(method, (Class<Annotation>) clazz);
+			if (foundAnnotation != null) {
+				return foundAnnotation;
 			}
 		}
 		return null;
 	}

 	@Nullable
-	private static AspectJAnnotation findAnnotation(Method method, Class<? extends Annotation> annotationType) {
-		Annotation annotation = AnnotationUtils.findAnnotation(method, annotationType);
-		if (annotation != null) {
-			return new AspectJAnnotation(annotation);
+	private static <A extends Annotation> AspectJAnnotation<A> findAnnotation(Method method, Class<A> toLookFor) {
+		A result = AnnotationUtils.findAnnotation(method, toLookFor);
+		if (result != null) {
+			return new AspectJAnnotation<>(result);
 		}
 		else {
 			return null;
@@ -156,8 +164,9 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	/**
 	 * Class modeling an AspectJ annotation, exposing its type enumeration and
 	 * pointcut String.
+	 * @param <A> the annotation type
 	 */
-	protected static class AspectJAnnotation {
+	protected static class AspectJAnnotation<A extends Annotation> {

 		private static final String[] EXPRESSION_ATTRIBUTES = {"pointcut", "value"};

@@ -170,7 +179,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 				AfterThrowing.class, AspectJAnnotationType.AtAfterThrowing //
 			);

-		private final Annotation annotation;
+		private final A annotation;

 		private final AspectJAnnotationType annotationType;

@@ -178,11 +187,11 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac

 		private final String argumentNames;

-		public AspectJAnnotation(Annotation annotation) {
+		public AspectJAnnotation(A annotation) {
 			this.annotation = annotation;
 			this.annotationType = determineAnnotationType(annotation);
 			try {
-				this.pointcutExpression = resolvePointcutExpression(annotation);
+				this.pointcutExpression = resolveExpression(annotation);
 				Object argNames = AnnotationUtils.getValue(annotation, "argNames");
 				this.argumentNames = (argNames instanceof String names ? names : "");
 			}
@@ -191,7 +200,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 			}
 		}

-		private AspectJAnnotationType determineAnnotationType(Annotation annotation) {
+		private AspectJAnnotationType determineAnnotationType(A annotation) {
 			AspectJAnnotationType type = annotationTypeMap.get(annotation.annotationType());
 			if (type != null) {
 				return type;
@@ -199,21 +208,21 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 			throw new IllegalStateException("Unknown annotation type: " + annotation);
 		}

-		private String resolvePointcutExpression(Annotation annotation) {
+		private String resolveExpression(A annotation) {
 			for (String attributeName : EXPRESSION_ATTRIBUTES) {
 				Object val = AnnotationUtils.getValue(annotation, attributeName);
 				if (val instanceof String str && !str.isEmpty()) {
 					return str;
 				}
 			}
-			throw new IllegalStateException("Failed to resolve pointcut expression in: " + annotation);
+			throw new IllegalStateException("Failed to resolve expression in: " + annotation);
 		}

 		public AspectJAnnotationType getAnnotationType() {
 			return this.annotationType;
 		}

-		public Annotation getAnnotation() {
+		public A getAnnotation() {
 			return this.annotation;
 		}

@@ -238,22 +247,19 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 */
 	private static class AspectJAnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {

-		private static final String[] EMPTY_ARRAY = new String[0];
-
 		@Override
 		@Nullable
 		public String[] getParameterNames(Method method) {
 			if (method.getParameterCount() == 0) {
-				return EMPTY_ARRAY;
+				return new String[0];
 			}
-			AspectJAnnotation annotation = findAspectJAnnotationOnMethod(method);
+			AspectJAnnotation<?> annotation = findAspectJAnnotationOnMethod(method);
 			if (annotation == null) {
 				return null;
 			}
 			StringTokenizer nameTokens = new StringTokenizer(annotation.getArgumentNames(), ",");
-			int numTokens = nameTokens.countTokens();
-			if (numTokens > 0) {
-				String[] names = new String[numTokens];
+			if (nameTokens.countTokens() > 0) {
+				String[] names = new String[nameTokens.countTokens()];
 				for (int i = 0; i < names.length; i++) {
 					names[i] = nameTokens.nextToken();
 				}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -35,8 +35,7 @@ import org.springframework.lang.Nullable;

 /**
 * Internal implementation of AspectJPointcutAdvisor.
- *
- * <p>Note that there will be one instance of this advisor for each target method.
+ * Note that there will be one instance of this advisor for each target method.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -213,7 +212,7 @@ final class InstantiationModelAwarePointcutAdvisorImpl
 	 * creation of the advice.
 	 */
 	private void determineAdviceType() {
-		AspectJAnnotation aspectJAnnotation =
+		AspectJAnnotation<?> aspectJAnnotation =
 				AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(this.aspectJAdviceMethod);
 		if (aspectJAnnotation == null) {
 			this.isBeforeAdvice = false;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2016 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,6 +23,10 @@ import org.springframework.lang.Nullable;
 * Subinterface of {@link org.springframework.aop.aspectj.AspectInstanceFactory}
 * that returns {@link AspectMetadata} associated with AspectJ-annotated classes.
 *
+ * <p>Ideally, AspectInstanceFactory would include this method itself, but because
+ * AspectMetadata uses Java-5-only {@link org.aspectj.lang.reflect.AjType},
+ * we need to split out this subinterface.
+ *
 * @author Rod Johnson
 * @since 2.0
 * @see AspectMetadata
@@ -31,13 +35,13 @@ import org.springframework.lang.Nullable;
 public interface MetadataAwareAspectInstanceFactory extends AspectInstanceFactory {

 	/**
-	 * Get the AspectJ AspectMetadata for this factory's aspect.
+	 * Return the AspectJ AspectMetadata for this factory's aspect.
 	 * @return the aspect metadata
 	 */
 	AspectMetadata getAspectMetadata();

 	/**
-	 * Get the best possible creation mutex for this factory.
+	 * Return the best possible creation mutex for this factory.
 	 * @return the mutex object (may be {@code null} for no mutex to use)
 	 * @since 4.3
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -87,7 +87,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				new InstanceComparator<>(
 						Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class),
 				(Converter<Method, Annotation>) method -> {
-					AspectJAnnotation ann = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
+					AspectJAnnotation<?> ann = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
 					return (ann != null ? ann.getAnnotation() : null);
 				});
 		Comparator<Method> methodNameComparator = new ConvertingComparator<>(Method::getName);
@@ -216,7 +216,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto

 	@Nullable
 	private AspectJExpressionPointcut getPointcut(Method candidateAdviceMethod, Class<?> candidateAspectClass) {
-		AspectJAnnotation aspectJAnnotation =
+		AspectJAnnotation<?> aspectJAnnotation =
 				AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(candidateAdviceMethod);
 		if (aspectJAnnotation == null) {
 			return null;
@@ -240,7 +240,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 		Class<?> candidateAspectClass = aspectInstanceFactory.getAspectMetadata().getAspectClass();
 		validate(candidateAspectClass);

-		AspectJAnnotation aspectJAnnotation =
+		AspectJAnnotation<?> aspectJAnnotation =
 				AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(candidateAdviceMethod);
 		if (aspectJAnnotation == null) {
 			return null;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -108,10 +108,14 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 		List<Element> childElts = DomUtils.getChildElements(element);
 		for (Element elt: childElts) {
 			String localName = parserContext.getDelegate().getLocalName(elt);
-			switch (localName) {
-				case POINTCUT -> parsePointcut(elt, parserContext);
-				case ADVISOR -> parseAdvisor(elt, parserContext);
-				case ASPECT -> parseAspect(elt, parserContext);
+			if (POINTCUT.equals(localName)) {
+				parsePointcut(elt, parserContext);
+			}
+			else if (ADVISOR.equals(localName)) {
+				parseAdvisor(elt, parserContext);
+			}
+			else if (ASPECT.equals(localName)) {
+				parseAspect(elt, parserContext);
 			}
 		}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -93,16 +93,10 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu

 		if (bean instanceof Advised advised) {
 			if (!advised.isFrozen() && isEligible(AopUtils.getTargetClass(bean))) {
-				// Add our local Advisor to the existing proxy's Advisor chain.
+				// Add our local Advisor to the existing proxy's Advisor chain...
 				if (this.beforeExistingAdvisors) {
 					advised.addAdvisor(0, this.advisor);
 				}
-				else if (advised.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE &&
-						advised.getAdvisorCount() > 0) {
-					// No target, leave last Advisor in place and add new Advisor right before.
-					advised.addAdvisor(advised.getAdvisorCount() - 1, this.advisor);
-					return bean;
-				}
 				else {
 					advised.addAdvisor(this.advisor);
 				}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -257,21 +257,23 @@ public abstract class AopProxyUtils {
 		if (ObjectUtils.isEmpty(arguments)) {
 			return new Object[0];
 		}
-		if (method.isVarArgs() && (method.getParameterCount() == arguments.length)) {
-			Class<?>[] paramTypes = method.getParameterTypes();
-			int varargIndex = paramTypes.length - 1;
-			Class<?> varargType = paramTypes[varargIndex];
-			if (varargType.isArray()) {
-				Object varargArray = arguments[varargIndex];
-				if (varargArray instanceof Object[] && !varargType.isInstance(varargArray)) {
-					Object[] newArguments = new Object[arguments.length];
-					System.arraycopy(arguments, 0, newArguments, 0, varargIndex);
-					Class<?> targetElementType = varargType.getComponentType();
-					int varargLength = Array.getLength(varargArray);
-					Object newVarargArray = Array.newInstance(targetElementType, varargLength);
-					System.arraycopy(varargArray, 0, newVarargArray, 0, varargLength);
-					newArguments[varargIndex] = newVarargArray;
-					return newArguments;
+		if (method.isVarArgs()) {
+			if (method.getParameterCount() == arguments.length) {
+				Class<?>[] paramTypes = method.getParameterTypes();
+				int varargIndex = paramTypes.length - 1;
+				Class<?> varargType = paramTypes[varargIndex];
+				if (varargType.isArray()) {
+					Object varargArray = arguments[varargIndex];
+					if (varargArray instanceof Object[] && !varargType.isInstance(varargArray)) {
+						Object[] newArguments = new Object[arguments.length];
+						System.arraycopy(arguments, 0, newArguments, 0, varargIndex);
+						Class<?> targetElementType = varargType.getComponentType();
+						int varargLength = Array.getLength(varargArray);
+						Object newVarargArray = Array.newInstance(targetElementType, varargLength);
+						System.arraycopy(varargArray, 0, newVarargArray, 0, varargLength);
+						newArguments[varargIndex] = newVarargArray;
+						return newArguments;
+					}
 				}
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -251,10 +251,11 @@ class CglibAopProxy implements AopProxy, Serializable {
 	private void validateClassIfNecessary(Class<?> proxySuperClass, @Nullable ClassLoader proxyClassLoader) {
 		if (!this.advised.isOptimize() && logger.isInfoEnabled()) {
 			synchronized (validatedClasses) {
-				validatedClasses.computeIfAbsent(proxySuperClass, clazz -> {
-					doValidateClass(clazz, proxyClassLoader, ClassUtils.getAllInterfacesForClassAsSet(clazz));
-					return Boolean.TRUE;
-				});
+				if (!validatedClasses.containsKey(proxySuperClass)) {
+					doValidateClass(proxySuperClass, proxyClassLoader,
+							ClassUtils.getAllInterfacesForClassAsSet(proxySuperClass));
+					validatedClasses.put(proxySuperClass, Boolean.TRUE);
+				}
 			}
 		}
 	}
@@ -701,7 +702,8 @@ class CglibAopProxy implements AopProxy, Serializable {
 					// We need to create a method invocation...
 					retVal = new CglibMethodInvocation(proxy, target, method, args, targetClass, chain, methodProxy).proceed();
 				}
-				return processReturnType(proxy, target, method, retVal);
+				retVal = processReturnType(proxy, target, method, retVal);
+				return retVal;
 			}
 			finally {
 				if (target != null && !targetSource.isStatic()) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -109,8 +109,10 @@ public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializ
 	 */
 	private static boolean hasMatchingIntroductions(Advisor[] advisors, Class<?> actualClass) {
 		for (Advisor advisor : advisors) {
-			if (advisor instanceof IntroductionAdvisor ia && ia.getClassFilter().matches(actualClass)) {
-				return true;
+			if (advisor instanceof IntroductionAdvisor ia) {
+				if (ia.getClassFilter().matches(actualClass)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2007 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,20 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.springframework.aop.MethodMatcher;

 /**
- * Internal framework record, combining a {@link MethodInterceptor} instance
- * with a {@link MethodMatcher} for use as an element in the advisor chain.
+ * Internal framework class, combining a MethodInterceptor instance
+ * with a MethodMatcher for use as an element in the advisor chain.
 *
 * @author Rod Johnson
- * @author Sam Brannen
- * @param interceptor the {@code MethodInterceptor}
- * @param matcher the {@code MethodMatcher}
 */
-record InterceptorAndDynamicMethodMatcher(MethodInterceptor interceptor, MethodMatcher matcher) {
+class InterceptorAndDynamicMethodMatcher {
+
+	final MethodInterceptor interceptor;
+
+	final MethodMatcher methodMatcher;
+
+	public InterceptorAndDynamicMethodMatcher(MethodInterceptor interceptor, MethodMatcher methodMatcher) {
+		this.interceptor = interceptor;
+		this.methodMatcher = methodMatcher;
+	}
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -169,8 +169,8 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 			// Evaluate dynamic method matcher here: static part will already have
 			// been evaluated and found to match.
 			Class<?> targetClass = (this.targetClass != null ? this.targetClass : this.method.getDeclaringClass());
-			if (dm.matcher().matches(this.method, targetClass, this.arguments)) {
-				return dm.interceptor().invoke(this);
+			if (dm.methodMatcher.matches(this.method, targetClass, this.arguments)) {
+				return dm.interceptor.invoke(this);
 			}
 			else {
 				// Dynamic matching failed.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -92,7 +92,8 @@ public class BeanFactoryAdvisorRetrievalHelper {
 					}
 					catch (BeanCreationException ex) {
 						Throwable rootCause = ex.getMostSpecificCause();
-						if (rootCause instanceof BeanCurrentlyInCreationException bce) {
+						if (rootCause instanceof BeanCurrentlyInCreationException) {
+							BeanCreationException bce = (BeanCreationException) rootCause;
 							String bceBeanName = bce.getBeanName();
 							if (bceBeanName != null && this.beanFactory.isCurrentlyInCreation(bceBeanName)) {
 								if (logger.isTraceEnabled()) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -58,11 +58,11 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator

 	protected final Log logger = LogFactory.getLog(getClass());

-	@Nullable
 	private ConfigurableBeanFactory beanFactory;

 	/** Internally used DefaultListableBeanFactory instances, keyed by bean name. */
-	private final Map<String, DefaultListableBeanFactory> internalBeanFactories = new HashMap<>();
+	private final Map<String, DefaultListableBeanFactory> internalBeanFactories =
+			new HashMap<>();


 	@Override
@@ -77,7 +77,6 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	/**
 	 * Return the BeanFactory that this TargetSourceCreators runs in.
 	 */
-	@Nullable
 	protected final BeanFactory getBeanFactory() {
 		return this.beanFactory;
 	}
@@ -1,10 +0,0 @@
-/**
- * Various {@link org.springframework.aop.framework.autoproxy.TargetSourceCreator}
- * implementations for use with Spring's AOP auto-proxying support.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.aop.framework.autoproxy.target;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -54,9 +54,9 @@ import org.springframework.util.ClassUtils;
 * return type however, such exceptions cannot be transmitted back. In that case an
 * {@link AsyncUncaughtExceptionHandler} can be registered to process such exceptions.
 *
- * <p>Note: the {@code AnnotationAsyncExecutionInterceptor} subclass is preferred
- * due to its support for executor qualification in conjunction with Spring's
- * {@code @Async} annotation.
+ * <p>As of Spring 3.1.2 the {@code AnnotationAsyncExecutionInterceptor} subclass is
+ * preferred for use due to its support for executor qualification in conjunction with
+ * Spring's {@code @Async} annotation.
 *
 * @author Juergen Hoeller
 * @author Chris Beams
@@ -71,8 +71,8 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 	/**
 	 * Create a new instance with a default {@link AsyncUncaughtExceptionHandler}.
 	 * @param defaultExecutor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
-	 * or {@link java.util.concurrent.ExecutorService}) to delegate to; a local
-	 * executor for this interceptor will be built otherwise
+	 * or {@link java.util.concurrent.ExecutorService}) to delegate to;
+	 * as of 4.2.6, a local executor for this interceptor will be built otherwise
 	 */
 	public AsyncExecutionInterceptor(@Nullable Executor defaultExecutor) {
 		super(defaultExecutor);
@@ -81,8 +81,8 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 	/**
 	 * Create a new {@code AsyncExecutionInterceptor}.
 	 * @param defaultExecutor the {@link Executor} (typically a Spring {@link AsyncTaskExecutor}
-	 * or {@link java.util.concurrent.ExecutorService}) to delegate to; a local
-	 * executor for this interceptor will be built otherwise
+	 * or {@link java.util.concurrent.ExecutorService}) to delegate to;
+	 * as of 4.2.6, a local executor for this interceptor will be built otherwise
 	 * @param exceptionHandler the {@link AsyncUncaughtExceptionHandler} to use
 	 */
 	public AsyncExecutionInterceptor(@Nullable Executor defaultExecutor, AsyncUncaughtExceptionHandler exceptionHandler) {
@@ -130,12 +130,9 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport imple
 	}

 	/**
-	 * Get the qualifier for a specific executor to use when executing the given
-	 * method.
-	 * <p>The default implementation of this method is effectively a no-op.
-	 * <p>Subclasses may override this method to provide support for extracting
-	 * qualifier information &mdash; for example, via an annotation on the given
-	 * method.
+	 * This implementation is a no-op for compatibility in Spring 3.1.2.
+	 * Subclasses may override to provide support for extracting qualifier information,
+	 * e.g. via an annotation on the given method.
 	 * @return always {@code null}
 	 * @since 3.1.2
 	 * @see #determineAsyncExecutor(Method)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -55,8 +55,8 @@ class ScopedProxyBeanRegistrationAotProcessor implements BeanRegistrationAotProc

 	@Override
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
-		Class<?> beanClass = registeredBean.getBeanClass();
-		if (beanClass.equals(ScopedProxyFactoryBean.class)) {
+		Class<?> beanType = registeredBean.getBeanType().toClass();
+		if (beanType.equals(ScopedProxyFactoryBean.class)) {
 			String targetBeanName = getTargetBeanName(registeredBean.getMergedBeanDefinition());
 			BeanDefinition targetBeanDefinition =
 					getTargetBeanDefinition(registeredBean.getBeanFactory(), targetBeanName);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.aop.support;
 import java.io.Serializable;

 import org.springframework.aop.ClassFilter;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -46,7 +45,7 @@ public class RootClassFilter implements ClassFilter, Serializable {
 	}

 	@Override
-	public boolean equals(@Nullable Object obj) {
+	public boolean equals(Object obj) {
 		return (this == obj || (obj instanceof RootClassFilter that &&
 				this.clazz.equals(that.clazz)));
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -183,7 +183,7 @@ public class AnnotationMatchingPointcut implements Pointcut {
 		}

 		@Override
-		public boolean equals(@Nullable Object obj) {
+		public boolean equals(Object obj) {
 			if (this == obj) {
 				return true;
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.TargetSource;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;

 /**
@@ -170,7 +169,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSour


 	@Override
-	public boolean equals(@Nullable Object other) {
+	public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -181,7 +181,7 @@ public class CommonsPool2TargetSource extends AbstractPoolingTargetSource implem
 	}

 	/**
-	 * Set whether the call should block when the pool is exhausted.
+	 * Set whether the call should bock when the pool is exhausted.
 	 */
 	public void setBlockWhenExhausted(boolean blockWhenExhausted) {
 		this.blockWhenExhausted = blockWhenExhausted;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -131,7 +131,7 @@ public final class EmptyTargetSource implements TargetSource, Serializable {
 	}

 	@Override
-	public boolean equals(@Nullable Object other) {
+	public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.aop.target;
 import java.io.Serializable;

 import org.springframework.aop.TargetSource;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -101,7 +100,7 @@ public class HotSwappableTargetSource implements TargetSource, Serializable {
 	 * objects are equal.
 	 */
 	@Override
-	public boolean equals(@Nullable Object obj) {
+	public boolean equals(Object obj) {
 		return (this == obj || (obj instanceof HotSwappableTargetSource that &&
 				this.target.equals(that.target)));
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -65,6 +65,7 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {


 	@Override
+	@Nullable
 	public synchronized Object getTarget() throws BeansException {
 		if (this.target == null) {
 			this.target = getBeanFactory().getBean(getTargetBeanName());
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.aop.target;
 import java.io.Serializable;

 import org.springframework.aop.TargetSource;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

@@ -83,7 +82,7 @@ public class SingletonTargetSource implements TargetSource, Serializable {
 	 * targets or the targets are equal.
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
+	public boolean equals(Object other) {
 		if (this == other) {
 			return true;
 		}
@@ -1,10 +0,0 @@
-/**
- * Support for dynamic, refreshable {@link org.springframework.aop.TargetSource}
- * implementations for use with Spring AOP.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.aop.target.dynamic;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,10 +0,0 @@
-/**
- * Various {@link org.springframework.aop.TargetSource} implementations for use
- * with Spring AOP.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.aop.target;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -17,6 +17,7 @@
 package org.springframework.aop.aspectj;

 import java.lang.reflect.Method;
+import java.util.Arrays;

 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -42,17 +43,17 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void noArgs() {
-			assertParameterNames(getMethod("noArgs"), "execution(* *(..))");
+			assertParameterNames(getMethod("noArgs"), "execution(* *(..))", new String[0]);
 		}

 		@Test
 		void joinPointOnly() {
-			assertParameterNames(getMethod("tjp"), "execution(* *(..))", "thisJoinPoint");
+			assertParameterNames(getMethod("tjp"), "execution(* *(..))", new String[] {"thisJoinPoint"});
 		}

 		@Test
 		void joinPointStaticPartOnly() {
-			assertParameterNames(getMethod("tjpsp"), "execution(* *(..))", "thisJoinPointStaticPart");
+			assertParameterNames(getMethod("tjpsp"), "execution(* *(..))", new String[] {"thisJoinPointStaticPart"});
 		}

 		@Test
@@ -63,18 +64,18 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void oneThrowable() {
-			assertParameterNamesExtended(getMethod("oneThrowable"), "foo()", null, "ex", "ex");
+			assertParameterNames(getMethod("oneThrowable"), "foo()", null, "ex", new String[] {"ex"});
 		}

 		@Test
 		void oneJPAndOneThrowable() {
-			assertParameterNamesExtended(getMethod("jpAndOneThrowable"), "foo()", null, "ex", "thisJoinPoint", "ex");
+			assertParameterNames(getMethod("jpAndOneThrowable"), "foo()", null, "ex", new String[] {"thisJoinPoint", "ex"});
 		}

 		@Test
 		void oneJPAndTwoThrowables() {
 			assertException(getMethod("jpAndTwoThrowables"), "foo()", null, "ex", AmbiguousBindingException.class,
-					"Binding of throwing parameter 'ex' is ambiguous: could be bound to argument 1 or 2");
+					"Binding of throwing parameter 'ex' is ambiguous: could be bound to argument 1 or argument 2");
 		}

 		@Test
@@ -85,13 +86,13 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void returning() {
-			assertParameterNamesExtended(getMethod("oneObject"), "foo()", "obj", null, "obj");
+			assertParameterNames(getMethod("oneObject"), "foo()", "obj", null, new String[] {"obj"});
 		}

 		@Test
 		void ambiguousReturning() {
 			assertException(getMethod("twoObjects"), "foo()", "obj", null, AmbiguousBindingException.class,
-					"Binding of returning parameter 'obj' is ambiguous: there are 2 candidates.");
+					"Binding of returning parameter 'obj' is ambiguous, there are 2 candidates.");
 		}

 		@Test
@@ -102,22 +103,22 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void thisBindingOneCandidate() {
-			assertParameterNames(getMethod("oneObject"), "this(x)", "x");
+			assertParameterNames(getMethod("oneObject"), "this(x)", new String[] {"x"});
 		}

 		@Test
 		void thisBindingWithAlternateTokenizations() {
-			assertParameterNames(getMethod("oneObject"), "this( x )", "x");
-			assertParameterNames(getMethod("oneObject"), "this( x)", "x");
-			assertParameterNames(getMethod("oneObject"), "this (x )", "x");
-			assertParameterNames(getMethod("oneObject"), "this(x )", "x");
-			assertParameterNames(getMethod("oneObject"), "foo() && this(x)", "x");
+			assertParameterNames(getMethod("oneObject"), "this( x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "this( x)", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "this (x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "this(x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "foo() && this(x)", new String[] {"x"});
 		}

 		@Test
 		void thisBindingTwoCandidates() {
 			assertException(getMethod("oneObject"), "this(x) || this(y)", AmbiguousBindingException.class,
-					"Found 2 candidate this(), target(), or args() variables but only one unbound argument slot");
+					"Found 2 candidate this(), target() or args() variables but only one unbound argument slot");
 		}

 		@Test
@@ -130,22 +131,22 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void targetBindingOneCandidate() {
-			assertParameterNames(getMethod("oneObject"), "target(x)", "x");
+			assertParameterNames(getMethod("oneObject"), "target(x)", new String[] {"x"});
 		}

 		@Test
 		void targetBindingWithAlternateTokenizations() {
-			assertParameterNames(getMethod("oneObject"), "target( x )", "x");
-			assertParameterNames(getMethod("oneObject"), "target( x)", "x");
-			assertParameterNames(getMethod("oneObject"), "target (x )", "x");
-			assertParameterNames(getMethod("oneObject"), "target(x )", "x");
-			assertParameterNames(getMethod("oneObject"), "foo() && target(x)", "x");
+			assertParameterNames(getMethod("oneObject"), "target( x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "target( x)", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "target (x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "target(x )", new String[] {"x"});
+			assertParameterNames(getMethod("oneObject"), "foo() && target(x)", new String[] {"x"});
 		}

 		@Test
 		void targetBindingTwoCandidates() {
 			assertException(getMethod("oneObject"), "target(x) || target(y)", AmbiguousBindingException.class,
-					"Found 2 candidate this(), target(), or args() variables but only one unbound argument slot");
+					"Found 2 candidate this(), target() or args() variables but only one unbound argument slot");
 		}

 		@Test
@@ -158,24 +159,24 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void argsBindingOneObject() {
-			assertParameterNames(getMethod("oneObject"), "args(x)", "x");
+			assertParameterNames(getMethod("oneObject"), "args(x)", new String[] {"x"});
 		}

 		@Test
 		void argsBindingOneObjectTwoCandidates() {
 			assertException(getMethod("oneObject"), "args(x,y)", AmbiguousBindingException.class,
-					"Found 2 candidate this(), target(), or args() variables but only one unbound argument slot");
+					"Found 2 candidate this(), target() or args() variables but only one unbound argument slot");
 		}

 		@Test
 		void ambiguousArgsBinding() {
 			assertException(getMethod("twoObjects"), "args(x,y)", AmbiguousBindingException.class,
-					"Still 2 unbound args at this()/target()/args() binding stage, with no way to determine between them");
+					"Still 2 unbound args at this(),target(),args() binding stage, with no way to determine between them");
 		}

 		@Test
 		void argsOnePrimitive() {
-			assertParameterNames(getMethod("onePrimitive"), "args(count)", "count");
+			assertParameterNames(getMethod("onePrimitive"), "args(count)", new String[] {"count"});
 		}

 		@Test
@@ -187,37 +188,37 @@ class AspectJAdviceParameterNameDiscovererTests {
 		@Test
 		void thisAndPrimitive() {
 			assertParameterNames(getMethod("oneObjectOnePrimitive"), "args(count) && this(obj)",
-					"obj", "count");
+					new String[] {"obj", "count"});
 		}

 		@Test
 		void targetAndPrimitive() {
 			assertParameterNames(getMethod("oneObjectOnePrimitive"), "args(count) && target(obj)",
-					"obj", "count");
+					new String[] {"obj", "count"});
 		}

 		@Test
 		void throwingAndPrimitive() {
-			assertParameterNamesExtended(getMethod("oneThrowableOnePrimitive"), "args(count)", null, "ex",
-					"ex", "count");
+			assertParameterNames(getMethod("oneThrowableOnePrimitive"), "args(count)", null, "ex",
+					new String[] {"ex", "count"});
 		}

 		@Test
 		void allTogetherNow() {
-			assertParameterNamesExtended(getMethod("theBigOne"), "this(foo) && args(x)", null, "ex",
-					"thisJoinPoint", "ex", "x", "foo");
+			assertParameterNames(getMethod("theBigOne"), "this(foo) && args(x)", null, "ex",
+					new String[] {"thisJoinPoint", "ex", "x", "foo"});
 		}

 		@Test
 		void referenceBinding() {
-			assertParameterNames(getMethod("onePrimitive"),"somepc(foo)", "foo");
+			assertParameterNames(getMethod("onePrimitive"),"somepc(foo)", new String[] {"foo"});
 		}

 		@Test
 		void referenceBindingWithAlternateTokenizations() {
-			assertParameterNames(getMethod("onePrimitive"),"call(bar *) && somepc(foo)", "foo");
-			assertParameterNames(getMethod("onePrimitive"),"somepc ( foo )", "foo");
-			assertParameterNames(getMethod("onePrimitive"),"somepc( foo)", "foo");
+			assertParameterNames(getMethod("onePrimitive"),"call(bar *) && somepc(foo)", new String[] {"foo"});
+			assertParameterNames(getMethod("onePrimitive"),"somepc ( foo )", new String[] {"foo"});
+			assertParameterNames(getMethod("onePrimitive"),"somepc( foo)", new String[] {"foo"});
 		}
 	}

@@ -229,38 +230,38 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void atThis() {
-			assertParameterNames(getMethod("oneAnnotation"),"@this(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@this(a)", new String[] {"a"});
 		}

 		@Test
 		void atTarget() {
-			assertParameterNames(getMethod("oneAnnotation"),"@target(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@target(a)", new String[] {"a"});
 		}

 		@Test
 		void atArgs() {
-			assertParameterNames(getMethod("oneAnnotation"),"@args(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@args(a)", new String[] {"a"});
 		}

 		@Test
 		void atWithin() {
-			assertParameterNames(getMethod("oneAnnotation"),"@within(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@within(a)", new String[] {"a"});
 		}

 		@Test
 		void atWithincode() {
-			assertParameterNames(getMethod("oneAnnotation"),"@withincode(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@withincode(a)", new String[] {"a"});
 		}

 		@Test
 		void atAnnotation() {
-			assertParameterNames(getMethod("oneAnnotation"),"@annotation(a)", "a");
+			assertParameterNames(getMethod("oneAnnotation"),"@annotation(a)", new String[] {"a"});
 		}

 		@Test
 		void ambiguousAnnotationTwoVars() {
 			assertException(getMethod("twoAnnotations"),"@annotation(a) && @this(x)", AmbiguousBindingException.class,
-					"Found 2 potential annotation variable(s) and 2 potential argument slots");
+					"Found 2 potential annotation variable(s), and 2 potential argument slots");
 		}

 		@Test
@@ -271,14 +272,15 @@ class AspectJAdviceParameterNameDiscovererTests {

 		@Test
 		void annotationMedley() {
-			assertParameterNamesExtended(getMethod("annotationMedley"),"@annotation(a) && args(count) && this(foo)",
-					null, "ex", "ex", "foo", "count", "a");
+			assertParameterNames(getMethod("annotationMedley"),"@annotation(a) && args(count) && this(foo)",
+					null, "ex", new String[] {"ex", "foo", "count", "a"});
 		}

 		@Test
 		void annotationBinding() {
 			assertParameterNames(getMethod("pjpAndAnAnnotation"),
-					"execution(* *(..)) && @annotation(ann)", "thisJoinPoint", "ann");
+					"execution(* *(..)) && @annotation(ann)",
+					new String[] {"thisJoinPoint","ann"});
 		}

 	}
@@ -294,23 +296,33 @@ class AspectJAdviceParameterNameDiscovererTests {
 		throw new AssertionError("Bad test specification, no method '" + name + "' found in test class");
 	}

-	private void assertParameterNames(Method method, String pointcut, String... parameterNames) {
-		assertParameterNamesExtended(method, pointcut, null, null, parameterNames);
+	private void assertParameterNames(Method method, String pointcut, String[] parameterNames) {
+		assertParameterNames(method, pointcut, null, null, parameterNames);
 	}

-	private void assertParameterNamesExtended(
-			Method method, String pointcut, String returning, String throwing, String... parameterNames) {
+	private void assertParameterNames(
+			Method method, String pointcut, String returning, String throwing, String[] parameterNames) {

-		assertThat(parameterNames)
-			.as("bad test specification, must have same number of parameter names as method arguments")
-			.hasSize(method.getParameterCount());
+		assertThat(parameterNames.length).as("bad test specification, must have same number of parameter names as method arguments").isEqualTo(method.getParameterCount());

 		AspectJAdviceParameterNameDiscoverer discoverer = new AspectJAdviceParameterNameDiscoverer(pointcut);
 		discoverer.setRaiseExceptions(true);
 		discoverer.setReturningName(returning);
 		discoverer.setThrowingName(throwing);
+		String[] discoveredNames = discoverer.getParameterNames(method);

-		assertThat(discoverer.getParameterNames(method)).isEqualTo(parameterNames);
+		String formattedExpectedNames = Arrays.toString(parameterNames);
+		String formattedActualNames = Arrays.toString(discoveredNames);
+
+		assertThat(discoveredNames.length).as("Expecting " + parameterNames.length + " parameter names in return set '" +
+				formattedExpectedNames + "', but found " + discoveredNames.length +
+				" '" + formattedActualNames + "'").isEqualTo(parameterNames.length);
+
+		for (int i = 0; i < discoveredNames.length; i++) {
+			assertThat(discoveredNames[i]).as("Parameter names must never be null").isNotNull();
+			assertThat(discoveredNames[i]).as("Expecting parameter " + i + " to be named '" +
+						parameterNames[i] + "' but was '" + discoveredNames[i] + "'").isEqualTo(parameterNames[i]);
+		}
 	}

 	private void assertException(Method method, String pointcut, Class<? extends Throwable> exceptionType, String message) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -20,7 +20,6 @@ import java.io.FileNotFoundException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
@@ -77,21 +76,24 @@ abstract class AbstractAspectJAdvisorFactoryTests {

 	/**
 	 * To be overridden by concrete test subclasses.
+	 * @return the fixture
 	 */
-	protected abstract AspectJAdvisorFactory getAdvisorFactory();
+	protected abstract AspectJAdvisorFactory getFixture();


 	@Test
 	void rejectsPerCflowAspect() {
-		assertThatExceptionOfType(AopConfigException.class)
-			.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowAspect(), "someBean")))
+		assertThatExceptionOfType(AopConfigException.class).isThrownBy(() ->
+				getFixture().getAdvisors(
+						new SingletonMetadataAwareAspectInstanceFactory(new PerCflowAspect(), "someBean")))
 			.withMessageContaining("PERCFLOW");
 	}

 	@Test
 	void rejectsPerCflowBelowAspect() {
-		assertThatExceptionOfType(AopConfigException.class)
-			.isThrownBy(() -> getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerCflowBelowAspect(), "someBean")))
+		assertThatExceptionOfType(AopConfigException.class).isThrownBy(() ->
+					getFixture().getAdvisors(
+							new SingletonMetadataAwareAspectInstanceFactory(new PerCflowBelowAspect(), "someBean")))
 			.withMessageContaining("PERCFLOWBELOW");
 	}

@@ -100,8 +102,9 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		TestBean itb = createProxy(target, TestBean.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerTargetAspect(), "someBean")));
+		TestBean itb = (TestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new PerTargetAspect(), "someBean")),
+				TestBean.class);
 		assertThat(itb.getAge()).as("Around advice must NOT apply").isEqualTo(realAge);

 		Advised advised = (Advised) itb;
@@ -136,13 +139,15 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		PerTargetAspect aspect1 = new PerTargetAspect();
 		aspect1.count = 100;
 		aspect1.setOrder(10);
-		advisors.addAll(getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspect1, "someBean1")));
+		advisors.addAll(
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspect1, "someBean1")));
 		PerTargetAspect aspect2 = new PerTargetAspect();
 		aspect2.setOrder(5);
-		advisors.addAll(getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspect2, "someBean2")));
+		advisors.addAll(
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspect2, "someBean2")));
 		OrderComparator.sort(advisors);

-		TestBean itb = createProxy(target, TestBean.class, advisors);
+		TestBean itb = (TestBean) createProxy(target, advisors, TestBean.class);
 		assertThat(itb.getAge()).as("Around advice must NOT apply").isEqualTo(realAge);

 		// Hit the method in the per clause to instantiate the aspect
@@ -161,12 +166,14 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		List<Advisor> advisors = new ArrayList<>();
 		PerTargetAspectWithOrderAnnotation10 aspect1 = new PerTargetAspectWithOrderAnnotation10();
 		aspect1.count = 100;
-		advisors.addAll(getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspect1, "someBean1")));
+		advisors.addAll(
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspect1, "someBean1")));
 		PerTargetAspectWithOrderAnnotation5 aspect2 = new PerTargetAspectWithOrderAnnotation5();
-		advisors.addAll(getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspect2, "someBean2")));
+		advisors.addAll(
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspect2, "someBean2")));
 		OrderComparator.sort(advisors);

-		TestBean itb = createProxy(target, TestBean.class, advisors);
+		TestBean itb = (TestBean) createProxy(target, advisors, TestBean.class);
 		assertThat(itb.getAge()).as("Around advice must NOT apply").isEqualTo(realAge);

 		// Hit the method in the per clause to instantiate the aspect
@@ -181,8 +188,9 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		TestBean itb = createProxy(target, TestBean.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new PerThisAspect(), "someBean")));
+		TestBean itb = (TestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new PerThisAspect(), "someBean")),
+				TestBean.class);
 		assertThat(itb.getAge()).as("Around advice must NOT apply").isEqualTo(realAge);

 		Advised advised = (Advised) itb;
@@ -217,7 +225,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		int realAge = 65;
 		target.setAge(realAge);
 		PerTypeWithinAspectInstanceFactory aif = new PerTypeWithinAspectInstanceFactory();
-		TestBean itb = createProxy(target, TestBean.class, getAdvisorFactory().getAdvisors(aif));
+		TestBean itb = (TestBean) createProxy(target, getFixture().getAdvisors(aif), TestBean.class);
 		assertThat(aif.getInstantiationCount()).as("No method calls").isEqualTo(0);
 		assertThat(itb.getAge()).as("Around advice must now apply").isEqualTo(0);

@@ -246,7 +254,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		assertThat(itb.getAge()).as("Around advice must still apply").isEqualTo(1);
 		assertThat(itb.getAge()).as("Around advice must still apply").isEqualTo(2);

-		TestBean itb2 = createProxy(target, TestBean.class, getAdvisorFactory().getAdvisors(aif));
+		TestBean itb2 = (TestBean) createProxy(target, getFixture().getAdvisors(aif), TestBean.class);
 		assertThat(aif.getInstantiationCount()).isEqualTo(1);
 		assertThat(itb2.getAge()).as("Around advice be independent for second instance").isEqualTo(0);
 		assertThat(aif.getInstantiationCount()).isEqualTo(2);
@@ -270,9 +278,10 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	void namedPointcutFromAspectLibraryWithBinding() {
 		TestBean target = new TestBean();
-		ITestBean itb = createProxy(target, ITestBean.class,
-				getAdvisorFactory().getAdvisors(aspectInstanceFactory(
-						new NamedPointcutAspectFromLibraryWithBinding(), "someBean")));
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(
+						new NamedPointcutAspectFromLibraryWithBinding(), "someBean")),
+				ITestBean.class);
 		itb.setAge(10);
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(20);
 		assertThat(target.getAge()).isEqualTo(20);
@@ -282,8 +291,9 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		ITestBean itb = createProxy(target, ITestBean.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspectInstance, "someBean")));
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspectInstance, "someBean")),
+				ITestBean.class);
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(-1);
 		assertThat(target.getAge()).isEqualTo(realAge);
 	}
@@ -291,8 +301,10 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	void bindingWithSingleArg() {
 		TestBean target = new TestBean();
-		ITestBean itb = createProxy(target, ITestBean.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new BindingAspectWithSingleArg(), "someBean")));
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(
+						new SingletonMetadataAwareAspectInstanceFactory(new BindingAspectWithSingleArg(), "someBean")),
+				ITestBean.class);
 		itb.setAge(10);
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(20);
 		assertThat(target.getAge()).isEqualTo(20);
@@ -301,8 +313,10 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	void bindingWithMultipleArgsDifferentlyOrdered() {
 		ManyValuedArgs target = new ManyValuedArgs();
-		ManyValuedArgs mva = createProxy(target, ManyValuedArgs.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new ManyValuedArgs(), "someBean")));
+		ManyValuedArgs mva = (ManyValuedArgs) createProxy(target,
+				getFixture().getAdvisors(
+						new SingletonMetadataAwareAspectInstanceFactory(new ManyValuedArgs(), "someBean")),
+				ManyValuedArgs.class);

 		String a = "a";
 		int b = 12;
@@ -320,8 +334,10 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void introductionOnTargetNotImplementingInterface() {
 		NotLockable notLockableTarget = new NotLockable();
 		assertThat(notLockableTarget instanceof Lockable).isFalse();
-		NotLockable notLockable1 = createProxy(notLockableTarget, NotLockable.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
+		NotLockable notLockable1 = (NotLockable) createProxy(notLockableTarget,
+				getFixture().getAdvisors(
+						new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
+				NotLockable.class);
 		assertThat(notLockable1 instanceof Lockable).isTrue();
 		Lockable lockable = (Lockable) notLockable1;
 		assertThat(lockable.locked()).isFalse();
@@ -329,64 +345,72 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		assertThat(lockable.locked()).isTrue();

 		NotLockable notLockable2Target = new NotLockable();
-		NotLockable notLockable2 = createProxy(notLockable2Target, NotLockable.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")));
+		NotLockable notLockable2 = (NotLockable) createProxy(notLockable2Target,
+				getFixture().getAdvisors(
+						new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
+				NotLockable.class);
 		assertThat(notLockable2 instanceof Lockable).isTrue();
 		Lockable lockable2 = (Lockable) notLockable2;
 		assertThat(lockable2.locked()).isFalse();
 		notLockable2.setIntValue(1);
 		lockable2.lock();
-		assertThatIllegalStateException().isThrownBy(() -> notLockable2.setIntValue(32));
+		assertThatIllegalStateException().isThrownBy(() ->
+			notLockable2.setIntValue(32));
 		assertThat(lockable2.locked()).isTrue();
 	}

 	@Test
 	void introductionAdvisorExcludedFromTargetImplementingInterface() {
 		assertThat(AopUtils.findAdvisorsThatCanApply(
-		getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new MakeLockable(), "someBean")),
+		getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
 		CannotBeUnlocked.class).isEmpty()).isTrue();
-		assertThat(AopUtils.findAdvisorsThatCanApply(getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2);
+		assertThat(AopUtils.findAdvisorsThatCanApply(getFixture().getAdvisors(
+		new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class)).hasSize(2);
 	}

 	@Test
 	void introductionOnTargetImplementingInterface() {
 		CannotBeUnlocked target = new CannotBeUnlocked();
-		Lockable proxy = createProxy(target, CannotBeUnlocked.class,
+		Lockable proxy = (Lockable) createProxy(target,
 				// Ensure that we exclude
 				AopUtils.findAdvisorsThatCanApply(
-					getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
-					CannotBeUnlocked.class));
+						getFixture().getAdvisors(
+								new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
+						CannotBeUnlocked.class
+				),
+				CannotBeUnlocked.class);
 		assertThat(proxy).isInstanceOf(Lockable.class);
 		Lockable lockable = proxy;
 		assertThat(lockable.locked()).as("Already locked").isTrue();
 		lockable.lock();
 		assertThat(lockable.locked()).as("Real target ignores locking").isTrue();
-		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> lockable.unlock());
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() ->
+				lockable.unlock());
 	}

 	@Test
 	void introductionOnTargetExcludedByTypePattern() {
 		ArrayList<Object> target = new ArrayList<>();
-		List<?> proxy = createProxy(target, List.class,
+		List<?> proxy = (List<?>) createProxy(target,
 				AopUtils.findAdvisorsThatCanApply(
-					getAdvisorFactory().getAdvisors(aspectInstanceFactory(new MakeLockable(), "someBean")),
-					List.class));
+						getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")),
+						List.class
+				),
+				List.class);
 		assertThat(proxy instanceof Lockable).as("Type pattern must have excluded mixin").isFalse();
 	}

 	@Test
-	void introductionBasedOnAnnotationMatch() { // gh-9980
+	void introductionBasedOnAnnotationMatch_SPR5307() {
 		AnnotatedTarget target = new AnnotatedTargetImpl();
-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new MakeAnnotatedTypeModifiable(), "someBean"));
-		Object proxy = createProxy(target, AnnotatedTarget.class, advisors);
-		assertThat(proxy).isInstanceOf(Lockable.class);
-		Lockable lockable = (Lockable) proxy;
-		assertThat(lockable.locked()).isFalse();
-		lockable.lock();
-		assertThat(lockable.locked()).isTrue();
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new MakeAnnotatedTypeModifiable(), "someBean"));
+		Object proxy = createProxy(target, advisors, AnnotatedTarget.class);
+		System.out.println(advisors.get(1));
+		assertThat(proxy instanceof Lockable).isTrue();
+		Lockable lockable = (Lockable)proxy;
+		lockable.locked();
 	}

 	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
@@ -395,12 +419,12 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void introductionWithArgumentBinding() {
 		TestBean target = new TestBean();

-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new MakeITestBeanModifiable(), "someBean"));
-		advisors.addAll(getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new MakeLockable(), "someBean")));
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new MakeITestBeanModifiable(), "someBean"));
+		advisors.addAll(getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(), "someBean")));

-		Modifiable modifiable = (Modifiable) createProxy(target, ITestBean.class, advisors);
+		Modifiable modifiable = (Modifiable) createProxy(target, advisors, ITestBean.class);
 		assertThat(modifiable).isInstanceOf(Modifiable.class);
 		Lockable lockable = (Lockable) modifiable;
 		assertThat(lockable.locked()).isFalse();
@@ -419,7 +443,8 @@ abstract class AbstractAspectJAdvisorFactoryTests {

 		lockable.lock();
 		assertThat(lockable.locked()).isTrue();
-		assertThatIllegalStateException().as("Should be locked").isThrownBy(() -> itb.setName("Else"));
+		assertThatIllegalStateException().as("Should be locked").isThrownBy(() ->
+				itb.setName("Else"));
 		lockable.unlock();
 		itb.setName("Tony");
 	}
@@ -428,11 +453,12 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void aspectMethodThrowsExceptionLegalOnSignature() {
 		TestBean target = new TestBean();
 		UnsupportedOperationException expectedException = new UnsupportedOperationException();
-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
 		assertThat(advisors.size()).as("One advice method was found").isEqualTo(1);
-		ITestBean itb = createProxy(target, ITestBean.class, advisors);
-		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(itb::getAge);
+		ITestBean itb = (ITestBean) createProxy(target, advisors, ITestBean.class);
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(
+				itb::getAge);
 	}

 	// TODO document this behaviour.
@@ -441,89 +467,18 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void aspectMethodThrowsExceptionIllegalOnSignature() {
 		TestBean target = new TestBean();
 		RemoteException expectedException = new RemoteException();
-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(new ExceptionThrowingAspect(expectedException), "someBean"));
 		assertThat(advisors.size()).as("One advice method was found").isEqualTo(1);
-		ITestBean itb = createProxy(target, ITestBean.class, advisors);
-		assertThatExceptionOfType(UndeclaredThrowableException.class)
-			.isThrownBy(itb::getAge)
-			.withCause(expectedException);
+		ITestBean itb = (ITestBean) createProxy(target, advisors, ITestBean.class);
+		assertThatExceptionOfType(UndeclaredThrowableException.class).isThrownBy(
+				itb::getAge).withCause(expectedException);
 	}

-	@Test
-	void twoAdvicesOnOneAspect() {
-		TestBean target = new TestBean();
-		TwoAdviceAspect twoAdviceAspect = new TwoAdviceAspect();
-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(twoAdviceAspect, "someBean"));
-		assertThat(advisors.size()).as("Two advice methods found").isEqualTo(2);
-		ITestBean itb = createProxy(target, ITestBean.class, advisors);
-		itb.setName("");
-		assertThat(itb.getAge()).isEqualTo(0);
-		int newAge = 32;
-		itb.setAge(newAge);
-		assertThat(itb.getAge()).isEqualTo(1);
-	}
-
-	@Test
-	void afterAdviceTypes() throws Exception {
-		InvocationTrackingAspect aspect = new InvocationTrackingAspect();
-		List<Advisor> advisors = getAdvisorFactory().getAdvisors(
-			aspectInstanceFactory(aspect, "exceptionHandlingAspect"));
-		Echo echo = createProxy(new Echo(), Echo.class, advisors);
-
-		assertThat(aspect.invocations).isEmpty();
-		assertThat(echo.echo(42)).isEqualTo(42);
-		assertThat(aspect.invocations).containsExactly("around - start", "before", "after returning", "after", "around - end");
-
-		aspect.invocations.clear();
-		assertThatExceptionOfType(FileNotFoundException.class)
-			.isThrownBy(() -> echo.echo(new FileNotFoundException()));
-		assertThat(aspect.invocations).containsExactly("around - start", "before", "after throwing", "after", "around - end");
-	}
-
-	@Test
-	void nonAbstractParentAspect() throws Exception {
-		IncrementingAspect aspect = new IncrementingAspect();
-
-		// Precondition:
-		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
-	}
-
-	@Test
-	void failureWithoutExplicitDeclarePrecedence() {
-		TestBean target = new TestBean();
-		MetadataAwareAspectInstanceFactory aspectInstanceFactory = aspectInstanceFactory(
-				new NoDeclarePrecedenceShouldFail(), "someBean");
-		ITestBean itb = createProxy(target, ITestBean.class, getAdvisorFactory().getAdvisors(aspectInstanceFactory));
-		assertThat(itb.getAge()).isEqualTo(42);
-	}
-
-	@Test
-	void declarePrecedenceNotSupported() {
-		TestBean target = new TestBean();
-		assertThatIllegalArgumentException().isThrownBy(() -> {
-				MetadataAwareAspectInstanceFactory aspectInstanceFactory = aspectInstanceFactory(
-							new DeclarePrecedenceShouldSucceed(), "someBean");
-				createProxy(target, ITestBean.class, getAdvisorFactory().getAdvisors(aspectInstanceFactory));
-		});
-	}
-
-
-	private static MetadataAwareAspectInstanceFactory aspectInstanceFactory(Object aspectInstance, String aspectName) {
-		return new SingletonMetadataAwareAspectInstanceFactory(aspectInstance, aspectName);
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> T createProxy(Object target, Class<T> type, List<Advisor> advisors) {
+	protected Object createProxy(Object target, List<Advisor> advisors, Class<?>... interfaces) {
 		ProxyFactory pf = new ProxyFactory(target);
-		if (type.isInterface()) {
-			pf.addInterface(type);
+		if (interfaces.length > 1 || interfaces[0].isInterface()) {
+			pf.setInterfaces(interfaces);
 		}
 		else {
 			pf.setProxyTargetClass(true);
@@ -534,7 +489,58 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		pf.addAdvisors(advisors);

 		pf.setExposeProxy(true);
-		return (T) pf.getProxy();
+		return pf.getProxy();
+	}
+
+	@Test
+	void twoAdvicesOnOneAspect() {
+		TestBean target = new TestBean();
+		TwoAdviceAspect twoAdviceAspect = new TwoAdviceAspect();
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(twoAdviceAspect, "someBean"));
+		assertThat(advisors.size()).as("Two advice methods found").isEqualTo(2);
+		ITestBean itb = (ITestBean) createProxy(target, advisors, ITestBean.class);
+		itb.setName("");
+		assertThat(itb.getAge()).isEqualTo(0);
+		int newAge = 32;
+		itb.setAge(newAge);
+		assertThat(itb.getAge()).isEqualTo(1);
+	}
+
+	@Test
+	void afterAdviceTypes() throws Exception {
+		InvocationTrackingAspect aspect = new InvocationTrackingAspect();
+		List<Advisor> advisors = getFixture().getAdvisors(
+				new SingletonMetadataAwareAspectInstanceFactory(aspect, "exceptionHandlingAspect"));
+		Echo echo = (Echo) createProxy(new Echo(), advisors, Echo.class);
+
+		assertThat(aspect.invocations).isEmpty();
+		assertThat(echo.echo(42)).isEqualTo(42);
+		assertThat(aspect.invocations).containsExactly("around - start", "before", "after returning", "after", "around - end");
+
+		aspect.invocations.clear();
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() -> echo.echo(new FileNotFoundException()));
+		assertThat(aspect.invocations).containsExactly("around - start", "before", "after throwing", "after", "around - end");
+	}
+
+	@Test
+	void failureWithoutExplicitDeclarePrecedence() {
+		TestBean target = new TestBean();
+		MetadataAwareAspectInstanceFactory aspectInstanceFactory = new SingletonMetadataAwareAspectInstanceFactory(
+				new NoDeclarePrecedenceShouldFail(), "someBean");
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(aspectInstanceFactory), ITestBean.class);
+		itb.getAge();
+	}
+
+	@Test
+	void declarePrecedenceNotSupported() {
+		TestBean target = new TestBean();
+		assertThatIllegalArgumentException().isThrownBy(() -> {
+				MetadataAwareAspectInstanceFactory aspectInstanceFactory = new SingletonMetadataAwareAspectInstanceFactory(
+							new DeclarePrecedenceShouldSucceed(), "someBean");
+				createProxy(target, getFixture().getAdvisors(aspectInstanceFactory), ITestBean.class);
+		});
 	}


@@ -752,35 +758,15 @@ abstract class AbstractAspectJAdvisorFactoryTests {

 	static class Echo {

-		Object echo(Object obj) throws Exception {
-			if (obj instanceof Exception ex) {
-				throw ex;
+		Object echo(Object o) throws Exception {
+			if (o instanceof Exception) {
+				throw (Exception) o;
 			}
-			return obj;
+			return o;
 		}
 	}


-	@Aspect
-	class DoublingAspect {
-
-		@Around("execution(* getAge())")
-		public Object doubleAge(ProceedingJoinPoint pjp) throws Throwable {
-			return ((int) pjp.proceed()) * 2;
-		}
-	}
-
-	@Aspect
-	class IncrementingAspect extends DoublingAspect {
-
-		@Around("execution(* getAge())")
-		public int incrementAge(ProceedingJoinPoint pjp) throws Throwable {
-			return ((int) pjp.proceed()) + 1;
-		}
-	}
-
-
-
 	@Aspect
 	private static class InvocationTrackingAspect {

@@ -838,7 +824,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {

 		@Around("getAge()")
 		int preventExecution(ProceedingJoinPoint pjp) {
-			return 42;
+			return 666;
 		}
 	}

@@ -858,7 +844,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {

 		@Around("getAge()")
 		int preventExecution(ProceedingJoinPoint pjp) {
-			return 42;
+			return 666;
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -38,55 +38,56 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 * @author Adrian Colyer
 * @author Juergen Hoeller
 * @author Chris Beams
- * @author Sam Brannen
 */
-class ArgumentBindingTests {
+public class ArgumentBindingTests {

 	@Test
-	void bindingInPointcutUsedByAdvice() {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
+	public void testBindingInPointcutUsedByAdvice() {
+		TestBean tb = new TestBean();
+		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(tb);
 		proxyFactory.addAspect(NamedPointcutWithArgs.class);

 		ITestBean proxiedTestBean = proxyFactory.getProxy();
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> proxiedTestBean.setName("enigma"))
-			.withMessage("enigma");
+		assertThatIllegalArgumentException().isThrownBy(() ->
+				proxiedTestBean.setName("Supercalifragalisticexpialidocious"));
 	}

 	@Test
-	void annotationArgumentNameBinding() {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TransactionalBean());
+	public void testAnnotationArgumentNameBinding() {
+		TransactionalBean tb = new TransactionalBean();
+		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(tb);
 		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);

 		ITransactionalBean proxiedTestBean = proxyFactory.getProxy();
-		assertThatIllegalStateException()
-			.isThrownBy(proxiedTestBean::doInTransaction)
-			.withMessage("Invoked with @Transactional");
+		assertThatIllegalStateException().isThrownBy(
+				proxiedTestBean::doInTransaction);
 	}

 	@Test
-	void parameterNameDiscoverWithReferencePointcut() throws Exception {
+	public void testParameterNameDiscoverWithReferencePointcut() throws Exception {
 		AspectJAdviceParameterNameDiscoverer discoverer =
 				new AspectJAdviceParameterNameDiscoverer("somepc(formal) && set(* *)");
 		discoverer.setRaiseExceptions(true);
-		Method method = getClass().getDeclaredMethod("methodWithOneParam", String.class);
-		assertThat(discoverer.getParameterNames(method)).containsExactly("formal");
+		Method methodUsedForParameterTypeDiscovery =
+				getClass().getMethod("methodWithOneParam", String.class);
+		String[] pnames = discoverer.getParameterNames(methodUsedForParameterTypeDiscovery);
+		assertThat(pnames.length).as("one parameter name").isEqualTo(1);
+		assertThat(pnames[0]).isEqualTo("formal");
 	}


-	@SuppressWarnings("unused")
-	private void methodWithOneParam(String aParam) {
+	public void methodWithOneParam(String aParam) {
 	}


-	interface ITransactionalBean {
+	public interface ITransactionalBean {

 		@Transactional
 		void doInTransaction();
 	}


-	static class TransactionalBean implements ITransactionalBean {
+	public static class TransactionalBean implements ITransactionalBean {

 		@Override
 		@Transactional
@@ -94,35 +95,38 @@ class ArgumentBindingTests {
 		}
 	}

-	/**
-	 * Mimics Spring's @Transactional annotation without actually introducing the dependency.
-	 */
-	@Retention(RetentionPolicy.RUNTIME)
-	@interface Transactional {
-	}
+}

-	@Aspect
-	static class PointcutWithAnnotationArgument {
+/**
+ * Represents Spring's Transactional annotation without actually introducing the dependency
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@interface Transactional {
+}

-		@Around(value = "execution(* org.springframework..*.*(..)) && @annotation(transactional)")
-		public Object around(ProceedingJoinPoint pjp, Transactional transactional) throws Throwable {
-			throw new IllegalStateException("Invoked with @Transactional");
-		}

-	}
-
-	@Aspect
-	static class NamedPointcutWithArgs {
-
-		@Pointcut("execution(* *(..)) && args(s,..)")
-		public void pointcutWithArgs(String s) {}
-
-		@Around("pointcutWithArgs(aString)")
-		public Object doAround(ProceedingJoinPoint pjp, String aString) throws Throwable {
-			throw new IllegalArgumentException(aString);
-		}
+@Aspect
+class PointcutWithAnnotationArgument {

+	@Around(value = "execution(* org.springframework..*.*(..)) && @annotation(transaction)")
+	public Object around(ProceedingJoinPoint pjp, Transactional transaction) throws Throwable {
+		System.out.println("Invoked with transaction " + transaction);
+		throw new IllegalStateException();
 	}

 }

+
+@Aspect
+class NamedPointcutWithArgs {
+
+	@Pointcut("execution(* *(..)) && args(s,..)")
+	public void pointcutWithArgs(String s) {}
+
+	@Around("pointcutWithArgs(aString)")
+	public Object doAround(ProceedingJoinPoint pjp, String aString) throws Throwable {
+		System.out.println("got '" + aString + "' at '" + pjp + "'");
+		throw new IllegalArgumentException(aString);
+	}
+
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -27,7 +27,7 @@ package org.springframework.aop.aspectj.annotation;
 class ReflectiveAspectJAdvisorFactoryTests extends AbstractAspectJAdvisorFactoryTests {

 	@Override
-	protected AspectJAdvisorFactory getAdvisorFactory() {
+	protected AspectJAdvisorFactory getFixture() {
 		return new ReflectiveAspectJAdvisorFactory();
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -50,7 +50,7 @@ public class ThrowsAdviceInterceptorTests {
 		MyThrowsHandler th = new MyThrowsHandler();
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		Object ret = new Object();
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willReturn(ret);
 		assertThat(ti.invoke(mi)).isEqualTo(ret);
 		assertThat(th.getCalls()).isEqualTo(0);
@@ -62,7 +62,7 @@ public class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		assertThat(ti.getHandlerMethodCount()).isEqualTo(2);
 		Exception ex = new Exception();
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willThrow(ex);
 		assertThatException().isThrownBy(() -> ti.invoke(mi)).isSameAs(ex);
 		assertThat(th.getCalls()).isEqualTo(0);
@@ -73,7 +73,7 @@ public class ThrowsAdviceInterceptorTests {
 		MyThrowsHandler th = new MyThrowsHandler();
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		FileNotFoundException ex = new FileNotFoundException();
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.getMethod()).willReturn(Object.class.getMethod("hashCode"));
 		given(mi.getThis()).willReturn(new Object());
 		given(mi.proceed()).willThrow(ex);
@@ -90,7 +90,7 @@ public class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		// Extends RemoteException
 		ConnectException ex = new ConnectException("");
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willThrow(ex);
 		assertThatExceptionOfType(ConnectException.class).isThrownBy(() ->
 				ti.invoke(mi))
@@ -115,7 +115,7 @@ public class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		// Extends RemoteException
 		ConnectException ex = new ConnectException("");
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willThrow(ex);
 		assertThatExceptionOfType(Throwable.class).isThrownBy(() ->
 				ti.invoke(mi))
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -94,11 +94,12 @@ public class CustomizableTraceInterceptorTests {

 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		MethodInvocation methodInvocation = mock();
+
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
 		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString"));
 		given(methodInvocation.getThis()).willReturn(this);

-		Log log = mock();
+		Log log = mock(Log.class);
 		given(log.isTraceEnabled()).willReturn(true);

 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
@@ -109,14 +110,15 @@ public class CustomizableTraceInterceptorTests {

 	@Test
 	public void testExceptionPathLogsCorrectly() throws Throwable {
-		MethodInvocation methodInvocation = mock();
+
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);

 		IllegalArgumentException exception = new IllegalArgumentException();
 		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString"));
 		given(methodInvocation.getThis()).willReturn(this);
 		given(methodInvocation.proceed()).willThrow(exception);

-		Log log = mock();
+		Log log = mock(Log.class);
 		given(log.isTraceEnabled()).willReturn(true);

 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
@@ -129,14 +131,15 @@ public class CustomizableTraceInterceptorTests {

 	@Test
 	public void testSunnyDayPathLogsCorrectlyWithPrettyMuchAllPlaceholdersMatching() throws Throwable {
-		MethodInvocation methodInvocation = mock();
+
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);

 		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
 		given(methodInvocation.getThis()).willReturn(this);
 		given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", 2L});
 		given(methodInvocation.proceed()).willReturn("Hello!");

-		Log log = mock();
+		Log log = mock(Log.class);
 		given(log.isTraceEnabled()).willReturn(true);

 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -39,9 +39,10 @@ public class DebugInterceptorTests {

 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		MethodInvocation methodInvocation = mock();

-		Log log = mock();
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
+
+		Log log = mock(Log.class);
 		given(log.isTraceEnabled()).willReturn(true);

 		DebugInterceptor interceptor = new StubDebugInterceptor(log);
@@ -53,12 +54,13 @@ public class DebugInterceptorTests {

 	@Test
 	public void testExceptionPathStillLogsCorrectly() throws Throwable {
-		MethodInvocation methodInvocation = mock();
+
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);

 		IllegalArgumentException exception = new IllegalArgumentException();
 		given(methodInvocation.proceed()).willThrow(exception);

-		Log log = mock();
+		Log log = mock(Log.class);
 		given(log.isTraceEnabled()).willReturn(true);

 		DebugInterceptor interceptor = new StubDebugInterceptor(log);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -50,10 +50,10 @@ public class PerformanceMonitorInterceptorTests {

 	@Test
 	public void testSunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable {
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));

-		Log log = mock();
+		Log log = mock(Log.class);

 		PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true);
 		interceptor.invokeUnderTrace(mi, log);
@@ -63,11 +63,11 @@ public class PerformanceMonitorInterceptorTests {

 	@Test
 	public void testExceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable {
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);

 		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
 		given(mi.proceed()).willThrow(new IllegalArgumentException());
-		Log log = mock();
+		Log log = mock(Log.class);

 		PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true);
 		assertThatIllegalArgumentException().isThrownBy(() ->
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ public class SimpleTraceInterceptorTests {

 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.getMethod()).willReturn(String.class.getMethod("toString"));
 		given(mi.getThis()).willReturn(this);

-		Log log = mock();
+		Log log = mock(Log.class);

 		SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true);
 		interceptor.invokeUnderTrace(mi, log);
@@ -52,13 +52,13 @@ public class SimpleTraceInterceptorTests {

 	@Test
 	public void testExceptionPathStillLogsCorrectly() throws Throwable {
-		MethodInvocation mi = mock();
+		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.getMethod()).willReturn(String.class.getMethod("toString"));
 		given(mi.getThis()).willReturn(this);
 		IllegalArgumentException exception = new IllegalArgumentException();
 		given(mi.proceed()).willThrow(exception);

-		Log log = mock();
+		Log log = mock(Log.class);

 		final SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true);
 		assertThatIllegalArgumentException().isThrownBy(() ->
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class DefaultScopedObjectTests {
 	}

 	private static void testBadTargetBeanName(final String badTargetBeanName) {
-		ConfigurableBeanFactory factory = mock();
+		ConfigurableBeanFactory factory = mock(ConfigurableBeanFactory.class);
 		new DefaultScopedObject(factory, badTargetBeanName);
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -44,22 +44,22 @@ import static org.mockito.Mockito.mock;
 * @author Chris Beams
 * @since 13.05.2003
 */
-class DelegatingIntroductionInterceptorTests {
+public class DelegatingIntroductionInterceptorTests {

 	@Test
-	void testNullTarget() throws Exception {
+	public void testNullTarget() throws Exception {
 		// Shouldn't accept null target
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new DelegatingIntroductionInterceptor(null));
 	}

 	@Test
-	void testIntroductionInterceptorWithDelegation() throws Exception {
+	public void testIntroductionInterceptorWithDelegation() throws Exception {
 		TestBean raw = new TestBean();
 		assertThat(! (raw instanceof TimeStamped)).isTrue();
 		ProxyFactory factory = new ProxyFactory(raw);

-		TimeStamped ts = mock();
+		TimeStamped ts = mock(TimeStamped.class);
 		long timestamp = 111L;
 		given(ts.getTimeStamp()).willReturn(timestamp);

@@ -70,12 +70,12 @@ class DelegatingIntroductionInterceptorTests {
 	}

 	@Test
-	void testIntroductionInterceptorWithInterfaceHierarchy() throws Exception {
+	public void testIntroductionInterceptorWithInterfaceHierarchy() throws Exception {
 		TestBean raw = new TestBean();
 		assertThat(! (raw instanceof SubTimeStamped)).isTrue();
 		ProxyFactory factory = new ProxyFactory(raw);

-		SubTimeStamped ts = mock();
+		TimeStamped ts = mock(SubTimeStamped.class);
 		long timestamp = 111L;
 		given(ts.getTimeStamp()).willReturn(timestamp);

@@ -86,12 +86,12 @@ class DelegatingIntroductionInterceptorTests {
 	}

 	@Test
-	void testIntroductionInterceptorWithSuperInterface() throws Exception {
+	public void testIntroductionInterceptorWithSuperInterface() throws Exception {
 		TestBean raw = new TestBean();
 		assertThat(! (raw instanceof TimeStamped)).isTrue();
 		ProxyFactory factory = new ProxyFactory(raw);

-		SubTimeStamped ts = mock();
+		TimeStamped ts = mock(SubTimeStamped.class);
 		long timestamp = 111L;
 		given(ts.getTimeStamp()).willReturn(timestamp);

@@ -103,7 +103,7 @@ class DelegatingIntroductionInterceptorTests {
 	}

 	@Test
-	void testAutomaticInterfaceRecognitionInDelegate() throws Exception {
+	public void testAutomaticInterfaceRecognitionInDelegate() throws Exception {
 		final long t = 1001L;
 		class Tester implements TimeStamped, ITester {
 			@Override
@@ -133,7 +133,7 @@ class DelegatingIntroductionInterceptorTests {


 	@Test
-	void testAutomaticInterfaceRecognitionInSubclass() throws Exception {
+	public void testAutomaticInterfaceRecognitionInSubclass() throws Exception {
 		final long t = 1001L;
 		@SuppressWarnings("serial")
 		class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester {
@@ -179,7 +179,7 @@ class DelegatingIntroductionInterceptorTests {

 	@SuppressWarnings("serial")
 	@Test
-	void testIntroductionInterceptorDoesntReplaceToString() throws Exception {
+	public void testIntroductionInterceptorDoesntReplaceToString() throws Exception {
 		TestBean raw = new TestBean();
 		assertThat(! (raw instanceof TimeStamped)).isTrue();
 		ProxyFactory factory = new ProxyFactory(raw);
@@ -200,7 +200,7 @@ class DelegatingIntroductionInterceptorTests {
 	}

 	@Test
-	void testDelegateReturnsThisIsMassagedToReturnProxy() {
+	public void testDelegateReturnsThisIsMassagedToReturnProxy() {
 		NestedTestBean target = new NestedTestBean();
 		String company = "Interface21";
 		target.setCompany(company);
@@ -221,7 +221,7 @@ class DelegatingIntroductionInterceptorTests {
 	}

 	@Test
-	void testSerializableDelegatingIntroductionInterceptorSerializable() throws Exception {
+	public void testSerializableDelegatingIntroductionInterceptorSerializable() throws Exception {
 		SerializablePerson serializableTarget = new SerializablePerson();
 		String name = "Tony";
 		serializableTarget.setName("Tony");
@@ -246,7 +246,7 @@ class DelegatingIntroductionInterceptorTests {

 	// Test when target implements the interface: should get interceptor by preference.
 	@Test
-	void testIntroductionMasksTargetImplementation() throws Exception {
+	public void testIntroductionMasksTargetImplementation() throws Exception {
 		final long t = 1001L;
 		@SuppressWarnings("serial")
 		class TestII extends DelegatingIntroductionInterceptor implements TimeStamped {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;

-import org.springframework.lang.Nullable;
-
 /**
 * Abstract superclass for counting advices etc.
 *
@@ -61,7 +59,7 @@ public class MethodCounter implements Serializable {
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
-	public boolean equals(@Nullable Object other) {
+	public boolean equals(Object other) {
 		return (other != null && other.getClass() == this.getClass());
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2016 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,8 +19,6 @@ package org.springframework.aop.testfixture.interceptor;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

-import org.springframework.lang.Nullable;
-
 /**
 * Trivial interceptor that can be introduced in a chain to display it.
 *
@@ -47,14 +45,14 @@ public class NopInterceptor implements MethodInterceptor {


 	@Override
-	public boolean equals(@Nullable Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!(obj instanceof NopInterceptor that)) {
+	public boolean equals(Object other) {
+		if (!(other instanceof NopInterceptor)) {
 			return false;
 		}
-		return this.count == that.count;
+		if (this == other) {
+			return true;
+		}
+		return this.count == ((NopInterceptor) other).count;
 	}

 	@Override
@@ -1,9 +0,0 @@
-/**
- * AspectJ-based dependency injection support.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.beans.factory.aspectj;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -17,8 +17,8 @@
 package org.springframework.cache.aspectj;

 /**
- * Utility to trick the compiler to throw valid checked exceptions masked as
- * runtime exceptions within the interceptor.
+ * Utility to trick the compiler to throw a valid checked
+ * exceptions within the interceptor.
 *
 * @author Stephane Nicoll
 */
@@ -36,5 +36,4 @@ final class AnyThrow {
 	private static <E extends Throwable> void throwAny(Throwable e) throws E {
 		throw (E) e;
 	}
-
 }
@@ -1,9 +0,0 @@
-/**
- * AspectJ-based caching support.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.cache.aspectj;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,11 +0,0 @@
-/**
- * AspectJ-based dependency injection support driven by the
- * {@link org.springframework.beans.factory.annotation.Configurable @Configurable}
- * annotation.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.context.annotation.aspectj;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,9 +0,0 @@
-/**
- * AspectJ-based transaction management support.
- */
-@NonNullApi
-@NonNullFields
-package org.springframework.transaction.aspectj;
-
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@

 package org.springframework.cache.config;

-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;

 /**
@@ -46,11 +45,16 @@ public class TestEntity {
 	}

 	@Override
-	public boolean equals(@Nullable Object obj) {
+	public boolean equals(Object obj) {
 		if (obj == this) {
 			return true;
 		}
-		return (obj instanceof TestEntity that && ObjectUtils.nullSafeEquals(this.id, that.id));
+		if (obj == null) {
+			return false;
+		}
+		if (obj instanceof TestEntity) {
+			return ObjectUtils.nullSafeEquals(this.id, ((TestEntity) obj).id);
+		}
+		return false;
 	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import java.time.temporal.Temporal;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -247,8 +246,7 @@ public abstract class BeanUtils {
 			// A single public constructor
 			return (Constructor<T>) ctors[0];
 		}
-		else if (ctors.length == 0) {
-			// No public constructors -> check non-public
+		else if (ctors.length == 0){
 			ctors = clazz.getDeclaredConstructors();
 			if (ctors.length == 1) {
 				// A single non-public constructor, e.g. from a non-public record type
@@ -792,11 +790,11 @@ public abstract class BeanUtils {
 			actualEditable = editable;
 		}
 		PropertyDescriptor[] targetPds = getPropertyDescriptors(actualEditable);
-		Set<String> ignoredProps = (ignoreProperties != null ? new HashSet<>(Arrays.asList(ignoreProperties)) : null);
+		List<String> ignoreList = (ignoreProperties != null ? Arrays.asList(ignoreProperties) : null);

 		for (PropertyDescriptor targetPd : targetPds) {
 			Method writeMethod = targetPd.getWriteMethod();
-			if (writeMethod != null && (ignoredProps == null || !ignoredProps.contains(targetPd.getName()))) {
+			if (writeMethod != null && (ignoreList == null || !ignoreList.contains(targetPd.getName()))) {
 				PropertyDescriptor sourcePd = getPropertyDescriptor(source.getClass(), targetPd.getName());
 				if (sourcePd != null) {
 					Method readMethod = sourcePd.getReadMethod();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import org.springframework.lang.Nullable;
 public interface ConfigurablePropertyAccessor extends PropertyAccessor, PropertyEditorRegistry, TypeConverter {

 	/**
-	 * Specify a {@link ConversionService} to use for converting
+	 * Specify a Spring 3.0 ConversionService to use for converting
 	 * property values, as an alternative to JavaBeans PropertyEditors.
 	 */
 	void setConversionService(@Nullable ConversionService conversionService);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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.
@@ -100,8 +100,8 @@ class ExtendedBeanInfo implements BeanInfo {
 		this.delegate = delegate;
 		for (PropertyDescriptor pd : delegate.getPropertyDescriptors()) {
 			try {
-				this.propertyDescriptors.add(pd instanceof IndexedPropertyDescriptor indexedPd ?
-						new SimpleIndexedPropertyDescriptor(indexedPd) :
+				this.propertyDescriptors.add(pd instanceof IndexedPropertyDescriptor ?
+						new SimpleIndexedPropertyDescriptor((IndexedPropertyDescriptor) pd) :
 						new SimplePropertyDescriptor(pd));
 			}
 			catch (IntrospectionException ex) {
@@ -170,8 +170,8 @@ class ExtendedBeanInfo implements BeanInfo {
 				this.propertyDescriptors.add(
 						new SimpleIndexedPropertyDescriptor(propertyName, null, null, null, method));
 			}
-			else if (existingPd instanceof IndexedPropertyDescriptor indexedPd) {
-				indexedPd.setIndexedWriteMethod(method);
+			else if (existingPd instanceof IndexedPropertyDescriptor) {
+				((IndexedPropertyDescriptor) existingPd).setIndexedWriteMethod(method);
 			}
 			else {
 				this.propertyDescriptors.remove(existingPd);
@@ -189,8 +189,8 @@ class ExtendedBeanInfo implements BeanInfo {
 		for (PropertyDescriptor pd : this.propertyDescriptors) {
 			final Class<?> candidateType;
 			final String candidateName = pd.getName();
-			if (pd instanceof IndexedPropertyDescriptor indexedPd) {
-				candidateType = indexedPd.getIndexedPropertyType();
+			if (pd instanceof IndexedPropertyDescriptor ipd) {
+				candidateType = ipd.getIndexedPropertyType();
 				if (candidateName.equals(propertyName) &&
 						(candidateType.equals(propertyType) || candidateType.equals(propertyType.getComponentType()))) {
 					return pd;
@@ -338,9 +338,9 @@ class ExtendedBeanInfo implements BeanInfo {
 		}

 		@Override
-		public boolean equals(@Nullable Object obj) {
-			return (this == obj || (obj instanceof PropertyDescriptor that &&
-					PropertyDescriptorUtils.equals(this, that)));
+		public boolean equals(@Nullable Object other) {
+			return (this == other || (other instanceof PropertyDescriptor &&
+					PropertyDescriptorUtils.equals(this, (PropertyDescriptor) other)));
 		}

 		@Override
--- a/Show More
+++ b/Show More