Release v5.3.29

2026-06-08 17:33:33 +00:00 · 2023-07-13 07:44:31 +00:00
391 changed files with 4753 additions and 8019 deletions
@@ -1,33 +0,0 @@
-name: Send notification
-description: Sends a Google Chat message as a notification of the job's outcome
-inputs:
-  webhook-url:
-    description: 'Google Chat Webhook URL'
-    required: true
-  status:
-    description: 'Status of the job'
-    required: true
-  build-scan-url:
-    description: 'URL of the build scan to include in the notification'
-  run-name:
-    description: 'Name of the run to include in the notification'
-    default: ${{ format('{0} {1}', github.ref_name, github.job) }}
-runs:
-  using: composite
-  steps:
-    - shell: bash
-      run: |
-        echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV"
-        echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV"
-    - shell: bash
-      if: ${{ inputs.status == 'success' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
-      if: ${{ inputs.status == 'failure' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<users/all> *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true
-    - shell: bash
-      if: ${{ inputs.status == 'cancelled' }}
-      run: |
-        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancelled"}' || true
@@ -1,34 +0,0 @@
-name: Backport Bot
-
-on:
-  issues:
-    types: [labeled]
-  pull_request:
-    types: [labeled]
-  push:
-    branches:
-      - '*.x'
-permissions:
-  contents: read
-jobs:
-  build:
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'liberica'
-          java-version: 17
-      - name: Download BackportBot
-        run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
-      - name: Backport
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_EVENT: ${{ toJSON(github.event) }}
-        run: java -jar backport-bot-0.0.1-SNAPSHOT.jar --github.accessToken="$GITHUB_TOKEN" --github.event_name "$GITHUB_EVENT_NAME" --github.event "$GITHUB_EVENT"
@@ -1,63 +0,0 @@
-name: Build and deploy snapshot
-on:
-  push:
-    branches:
-      - 5.3.x
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-jobs:
-  build-and-deploy-snapshot:
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
-    name: Build and deploy snapshot
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'liberica'
-          java-version: 8
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
-        with:
-          cache-read-only: false
-      - name: Configure Gradle properties
-        shell: bash
-        run: |
-          mkdir -p $HOME/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
-          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
-      - name: Build and publish
-        id: build
-        env:
-          CI: 'true'
-          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository
-      - name: Deploy
-        uses: spring-io/artifactory-deploy-action@v0.0.1
-        with:
-          uri: 'https://repo.spring.io'
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
-          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('spring-framework-{0}', github.ref_name)}}
-          repository: 'libs-snapshot-local'
-          folder: 'deployment-repository'
-          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          artifact-properties: |
-            /**/spring-*.zip::zip.name=spring-framework,zip.deployed=false
-            /**/spring-*-docs.zip::zip.type=docs
-            /**/spring-*-dist.zip::zip.type=dist
-            /**/spring-*-schema.zip::zip.type=schema
-      - name: Send notification
-        uses: ./.github/actions/send-notification
-        if: always()
-        with:
-          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
-          status: ${{ job.status }}
-          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
-          run-name: ${{ format('{0} | Linux | Java 8', github.ref_name) }}
@@ -1,80 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - 5.3.x
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-jobs:
-  ci:
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
-    strategy:
-      matrix:
-        os:
-          - id: ubuntu-latest
-            name: Linux
-        java:
-          - version: 8
-            toolchain: false
-          - version: 17
-            toolchain: true
-          - version: 21
-            toolchain: true
-        exclude:
-          - os:
-              name: Linux
-            java:
-              version: 8
-    name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
-    runs-on: ${{ matrix.os.id }}
-    steps:
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'liberica'
-          java-version: |
-            ${{ matrix.java.version }}
-            ${{ matrix.java.toolchain && '8' || '' }}
-      - name: Prepare Windows runner
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          git config --global core.autocrlf true
-          git config --global core.longPaths true
-          Stop-Service -name Docker
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
-        with:
-          cache-read-only: false
-      - name: Configure Gradle properties
-        shell: bash
-        run: |
-          mkdir -p $HOME/.gradle
-          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
-          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
-          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
-      - name: Configure toolchain properties
-        if: ${{ matrix.java.toolchain }}
-        shell: bash
-        run: |
-          echo toolchainVersion=${{ matrix.java.version }} >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.auto-detect=false >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.auto-download=false >> $HOME/.gradle/gradle.properties
-          echo systemProp.org.gradle.java.installations.paths=${{ format('$JAVA_HOME_{0}_X64', matrix.java.version) }} >> $HOME/.gradle/gradle.properties
-      - name: Build
-        id: build
-        env:
-          CI: 'true'
-          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
-        run: ./gradlew check
-      - name: Send notification
-        uses: ./.github/actions/send-notification
-        if: always()
-        with:
-          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
-          status: ${{ job.status }}
-          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
-          run-name: ${{ format('{0} | {1} | Java {2}', github.ref_name, matrix.os.name, matrix.java.version) }}
@@ -9,5 +9,5 @@ jobs:
    name: "Validation"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.382-librca
+java=8.0.372-librca
@@ -1,4 +1,4 @@
-# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=5.3.x)](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A5.3.x) [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
+# <img src="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". 

@@ -28,18 +28,18 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.7"
-			mavenBom "io.netty:netty-bom:4.1.109.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.44"
+			mavenBom "io.netty:netty-bom:4.1.94.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.34"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
 			mavenBom "io.rsocket:rsocket-bom:1.1.3"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.54.v20240208"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.51.v20230217"
 			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
 			mavenBom "org.junit:junit-bom:5.8.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.21.1') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.20.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -67,9 +67,9 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.8"
-			dependency "io.smallrye.reactive:mutiny:1.9.0"
-			dependency "io.projectreactor.tools:blockhound:1.0.8.RELEASE"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.5"
+			dependency "io.smallrye.reactive:mutiny:1.8.0"
+			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"

 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.1"
@@ -96,7 +96,7 @@ configure(allprojects) { project ->

 			dependency "com.h2database:h2:2.1.214"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
-			dependency "com.github.librepdf:openpdf:1.3.33"
+			dependency "com.github.librepdf:openpdf:1.3.30"
 			dependency "com.rometools:rome:1.18.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.4"
@@ -128,18 +128,18 @@ configure(allprojects) { project ->
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"

-			dependencySet(group: 'org.apache.tomcat', version: '9.0.82') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.78') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.82') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.78') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.29.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.25.Final') {
 				entry 'undertow-core'
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}

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

@@ -362,7 +362,7 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.41")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.31")
 	}

 	ext.javadocLinks = [
@@ -375,9 +375,8 @@ configure([rootProject] + javaProjects) { project ->
 			"https://tiles.apache.org/tiles-request/apidocs/",
 			"https://tiles.apache.org/framework/apidocs/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
-			// Temporarily commenting out Ehcache and Quartz since javadoc on JDK 8 cannot access them.
-			// "https://www.ehcache.org/apidocs/2.10.4/",
-			// "https://www.quartz-scheduler.org/api/2.3.0/",
+			"https://www.ehcache.org/apidocs/2.10.4/",
+			"https://www.quartz-scheduler.org/api/2.3.0/",
 			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.12.7/",
 			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.12.7/",
 			"https://www.javadoc.io/doc/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.12.7/",
@@ -389,8 +388,7 @@ configure([rootProject] + javaProjects) { project ->
 			// "https://junit.org/junit5/docs/5.8.2/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
-			// Temporarily commenting out R2DBC since javadoc on JDK 8 cannot access it.
-			// "https://r2dbc.io/spec/0.8.5.RELEASE/api/",
+			"https://r2dbc.io/spec/0.8.5.RELEASE/api/",
 			// The external Javadoc link for JSR 305 must come last to ensure that types from
 			// JSR 250 (such as @PostConstruct) are still supported. This is due to the fact
 			// that JSR 250 and JSR 305 both define types in javax.annotation, which results
@@ -1,7 +1,5 @@
 == Spring Framework Concourse pipeline

-NOTE: CI is being migrated to GitHub Actions.
-
 The Spring Framework uses https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
 The Spring team has a dedicated Concourse instance available at https://ci.spring.io with a build pipeline
 for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.3.x[Spring Framework 5.3.x].
@@ -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"]
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20240125
+FROM ubuntu:jammy-20230624

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -3,10 +3,10 @@ set -e

 case "$1" in
 	java8)
-		 echo "https://github.com/bell-sw/Liberica/releases/download/8u402%2B7/bellsoft-jdk8u402+7-linux-amd64.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/8u372+7/bellsoft-jdk8u372+7-linux-amd64.tar.gz"
 	;;
 	java17)
-		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.10%2B13/bellsoft-jdk17.0.10+13-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.7+7/bellsoft-jdk17.0.7+7-linux-amd64.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"
@@ -8,3 +8,4 @@ milestone: "5.3.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
+task-timeout: 1h00m
@@ -5,7 +5,9 @@ anchors:
    password: ((github-ci-release-token))
    branch: ((branch))
  gradle-enterprise-task-params: &gradle-enterprise-task-params
-    DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+    GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
+    GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
  sonatype-task-params: &sonatype-task-params
    SONATYPE_USERNAME: ((sonatype-username))
    SONATYPE_PASSWORD: ((sonatype-password))
@@ -21,6 +23,14 @@ anchors:
  docker-resource-source: &docker-resource-source
    username: ((docker-hub-username))
    password: ((docker-hub-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!>
+      [$TEXT_FILE_CONTENT]
+    text_file: git-repo/build/build-scan-uri.txt
+    silent: true
+    icon_emoji: ":concourse:"
+    username: concourse-ci
  changelog-task-params: &changelog-task-params
    name: generated-changelog/tag
    tag: generated-changelog/tag
@@ -35,7 +45,7 @@ resource_types:
  source:
    <<: *docker-resource-source
    repository: concourse/registry-image-resource
-    tag: 1.8.0
+    tag: 1.7.1
 - name: artifactory-resource
  type: registry-image
  source:
@@ -54,12 +64,25 @@ resource_types:
    <<: *docker-resource-source
    repository: dpb587/github-status-resource
    tag: master
+- name: slack-notification
+  type: registry-image
+  source:
+    <<: *docker-resource-source
+    repository: cfcommunity/slack-notification-resource
+    tag: latest
 resources:
 - name: git-repo
  type: git
  icon: github
  source:
    <<: *git-repo-resource-source
+- name: every-morning
+  type: time
+  icon: alarm
+  source:
+    start: 8:00 AM
+    stop: 9:00 AM
+    location: Europe/Vienna
 - name: ci-images-git-repo
  type: git
  icon: github
@@ -82,6 +105,27 @@ resources:
    username: ((artifactory-username))
    password: ((artifactory-password))
    build_name: ((build-name))
+- name: repo-status-build
+  type: github-status-resource
+  icon: eye-check-outline
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-ci-status-token))
+    branch: ((branch))
+    context: build
+- name: repo-status-jdk17-build
+  type: github-status-resource
+  icon: eye-check-outline
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-ci-status-token))
+    branch: ((branch))
+    context: jdk17-build
+- name: slack-alert
+  type: slack-notification
+  icon: slack
+  source:
+    url: ((slack-webhook-url))
 - name: github-pre-release
  type: github-release
  icon: briefcase-download-outline
@@ -116,23 +160,37 @@ jobs:
    - put: ci-image
      params:
        image: ci-image/image.tar
- name: stage-milestone
+- name: build
  serial: true
+  public: true
  plan:
  - get: ci-image
  - get: git-repo
-    trigger: false
-  - task: stage
-    image: ci-image
-    file: git-repo/ci/tasks/stage-version.yml
-    params:
-      RELEASE_TYPE: M
-      <<: *gradle-enterprise-task-params
+    trigger: true
+  - put: repo-status-build
+    params: { state: "pending", commit: "git-repo" }
+  - do:
+    - task: build-project
+      image: ci-image
+      file: git-repo/ci/tasks/build-project.yml
+      privileged: true
+      timeout: ((task-timeout))
+      params:
+        <<: *build-project-task-params
+    on_failure:
+      do:
+      - put: repo-status-build
+        params: { state: "failure", commit: "git-repo" }
+      - put: slack-alert
+        params:
+          <<: *slack-fail-params
+  - put: repo-status-build
+    params: { state: "success", commit: "git-repo" }
  - put: artifactory-repo
    params: &artifactory-params
      signing_key: ((signing-key))
      signing_passphrase: ((signing-passphrase))
-      repo: libs-staging-local
+      repo: libs-snapshot-local
      folder: distribution-repository
      build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
      build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
@@ -157,9 +215,55 @@ jobs:
        - "/**/spring-*-schema.zip"
        properties:
          "zip.type": "schema"
-  - put: git-repo
-    params:
-      repository: stage-git-repo
+    get_params:
+      threads: 8
+- name: jdk17-build
+  serial: true
+  public: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+    - get: every-morning
+      trigger: true
+    - put: repo-status-jdk17-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: 17
+          <<: *build-project-task-params
+      on_failure:
+        do:
+          - put: repo-status-jdk17-build
+            params: { state: "failure", commit: "git-repo" }
+          - put: slack-alert
+            params:
+              <<: *slack-fail-params
+    - put: repo-status-jdk17-build
+      params: { state: "success", commit: "git-repo" }
+- name: stage-milestone
+  serial: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+      trigger: false
+    - task: stage
+      image: ci-image
+      file: git-repo/ci/tasks/stage-version.yml
+      params:
+        RELEASE_TYPE: M
+        <<: *gradle-enterprise-task-params
+    - put: artifactory-repo
+      params:
+        <<: *artifactory-params
+        repo: libs-staging-local
+    - put: git-repo
+      params:
+        repository: stage-git-repo
 - name: promote-milestone
  serial: true
  plan:
@@ -200,6 +304,7 @@ jobs:
    - put: artifactory-repo
      params:
        <<: *artifactory-params
+        repo: libs-staging-local
    - put: git-repo
      params:
        repository: stage-git-repo
@@ -243,6 +348,7 @@ jobs:
    - put: artifactory-repo
      params:
        <<: *artifactory-params
+        repo: libs-staging-local
    - put: git-repo
      params:
        repository: stage-git-repo
@@ -285,6 +391,8 @@ jobs:
        <<: *changelog-task-params

 groups:
+- name: "builds"
+  jobs: ["build", "jdk17-build"]
 - name: "releases"
  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/common.sh
+
+pushd git-repo > /dev/null
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
+popd > /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+source $(dirname $0)/common.sh
+repository=$(pwd)/distribution-repository
+
+pushd git-repo > /dev/null
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
+popd > /dev/null
@@ -0,0 +1,9 @@
+#!/bin/bash
+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 \
+  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
+popd > /dev/null
@@ -1,5 +1,6 @@
 #!/bin/bash

+source $(dirname $0)/common.sh
 CONFIG_DIR=git-repo/ci/config

 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
@@ -26,5 +26,4 @@ run:
      cat > /root/.docker/config.json <<EOF
      { "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
      EOF
-      build
-
+      build
@@ -0,0 +1,19 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/build-pr.sh
@@ -0,0 +1,22 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+outputs:
+- name: distribution-repository
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/build-project.sh
@@ -0,0 +1,24 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+outputs:
+- name: distribution-repository
+- name: git-repo
+caches:
+- path: gradle
+params:
+  BRANCH:
+  CI: true
+  MAIN_TOOLCHAIN:
+  TEST_TOOLCHAIN:
+  GRADLE_ENTERPRISE_ACCESS_KEY:
+  GRADLE_ENTERPRISE_CACHE_USERNAME:
+  GRADLE_ENTERPRISE_CACHE_PASSWORD:
+  GRADLE_ENTERPRISE_URL: https://ge.spring.io
+run:
+  path: bash
+  args:
+    - -ec
+    - |
+      ${PWD}/git-repo/ci/scripts/check-project.sh
@@ -4,7 +4,7 @@ image_resource:
  type: registry-image
  source:
    repository: springio/github-changelog-generator
-    tag: '0.0.8'
+    tag: '0.0.7'
    username: ((docker-hub-username))
    password: ((docker-hub-password))
 inputs:
@@ -4,7 +4,7 @@ image_resource:
  type: registry-image
  source:
    repository: springio/concourse-release-scripts
-    tag: '0.4.0'
+    tag: '0.3.4'
    username: ((docker-hub-username))
    password: ((docker-hub-password))
 inputs:
@@ -1,4 +1,4 @@
-version=5.3.35
+version=5.3.29
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.parallel=true
@@ -5,7 +5,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 			sourceRoots.setFrom(file("src/main/kotlin"))
 			classpath.from(sourceSets["main"].runtimeClasspath)
 			externalDocumentationLink {
-				url.set(new URL("https://docs.spring.io/spring-framework/docs/5.3.x/javadoc-api/"))
+				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
@@ -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.
@@ -60,8 +60,8 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigA.class);
 		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(ctx::refresh)
-				.withCauseInstanceOf(IllegalStateException.class);
+			.isThrownBy(ctx::refresh)
+			.withCauseInstanceOf(IllegalStateException.class);
 	}

 	@Test
@@ -70,7 +70,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 		ctx.register(Config.class, SubclassProxyTxConfig.class, RepoConfigA.class);
 		ctx.refresh();

-		Thread.sleep(200);  // allow @Scheduled method to be called several times
+		Thread.sleep(100);  // allow @Scheduled method to be called several times

 		MyRepository repository = ctx.getBean(MyRepository.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
@@ -85,7 +85,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigB.class);
 		ctx.refresh();

-		Thread.sleep(200);  // allow @Scheduled method to be called several times
+		Thread.sleep(100);  // allow @Scheduled method to be called several times

 		MyRepositoryWithScheduledMethod repository = ctx.getBean(MyRepositoryWithScheduledMethod.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
@@ -100,7 +100,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 		ctx.register(AspectConfig.class, MyRepositoryWithScheduledMethodImpl.class);
 		ctx.refresh();

-		Thread.sleep(200);  // allow @Scheduled method to be called several times
+		Thread.sleep(100);  // allow @Scheduled method to be called several times

 		MyRepositoryWithScheduledMethod repository = ctx.getBean(MyRepositoryWithScheduledMethod.class);
 		assertThat(AopUtils.isCglibProxy(repository)).isTrue();
@@ -7,8 +7,8 @@ pluginManagement {
 }

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

 include "spring-aop"
@@ -42,7 +42,7 @@ rootProject.children.each {project ->
 }

 settings.gradle.projectsLoaded {
-	develocity {
+	gradleEnterprise {
 		buildScan {
 			File buildDir = settings.gradle.rootProject.getBuildDir()
 			buildDir.mkdirs()
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -174,30 +174,25 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public ClassFilter getClassFilter() {
-		checkExpression();
+		obtainPointcutExpression();
 		return this;
 	}

 	@Override
 	public MethodMatcher getMethodMatcher() {
-		checkExpression();
+		obtainPointcutExpression();
 		return this;
 	}


 	/**
-	 * Check whether this pointcut is ready to match.
+	 * Check whether this pointcut is ready to match,
+	 * lazily building the underlying AspectJ pointcut expression.
 	 */
-	private void checkExpression() {
+	private PointcutExpression obtainPointcutExpression() {
 		if (getExpression() == null) {
 			throw new IllegalStateException("Must set property 'expression' before attempting to match");
 		}
-	}
-
-	/**
-	 * Lazily build the underlying AspectJ pointcut expression.
-	 */
-	private PointcutExpression obtainPointcutExpression() {
 		if (this.pointcutExpression == null) {
 			this.pointcutClassLoader = determinePointcutClassLoader();
 			this.pointcutExpression = buildPointcutExpression(this.pointcutClassLoader);
@@ -253,8 +248,8 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	/**
 	 * If a pointcut expression has been specified in XML, the user cannot
-	 * write "and" as "&&" (though {@code &amp;&amp;} will work).
-	 * <p>We also allow "and" between two pointcut sub-expressions.
+	 * write {@code and} as "&&" (though &amp;&amp; will work).
+	 * We also allow {@code and} between two pointcut sub-expressions.
 	 * <p>This method converts back to {@code &&} for the AspectJ pointcut parser.
 	 */
 	private String replaceBooleanOperators(String pcExpr) {
@@ -274,9 +269,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Class<?> targetClass) {
+		PointcutExpression pointcutExpression = obtainPointcutExpression();
 		try {
 			try {
-				return obtainPointcutExpression().couldMatchJoinPointsInType(targetClass);
+				return pointcutExpression.couldMatchJoinPointsInType(targetClass);
 			}
 			catch (ReflectionWorldException ex) {
 				logger.debug("PointcutExpression matching rejected target class - trying fallback expression", ex);
@@ -287,9 +283,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 				}
 			}
 		}
-		catch (IllegalArgumentException | IllegalStateException ex) {
-			throw ex;
-		}
 		catch (Throwable ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
 		}
@@ -298,6 +291,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Method method, Class<?> targetClass, boolean hasIntroductions) {
+		obtainPointcutExpression();
 		ShadowMatch shadowMatch = getTargetShadowMatch(method, targetClass);

 		// Special handling for this, target, @this, @target, @annotation
@@ -335,6 +329,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public boolean matches(Method method, Class<?> targetClass, Object... args) {
+		obtainPointcutExpression();
 		ShadowMatch shadowMatch = getTargetShadowMatch(method, targetClass);

 		// Bind Spring AOP proxy to AspectJ "this" and Spring AOP target to AspectJ target,
@@ -532,7 +527,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			return false;
 		}
 		AspectJExpressionPointcut otherPc = (AspectJExpressionPointcut) other;
-		return ObjectUtils.nullSafeEquals(getExpression(), otherPc.getExpression()) &&
+		return ObjectUtils.nullSafeEquals(this.getExpression(), otherPc.getExpression()) &&
 				ObjectUtils.nullSafeEquals(this.pointcutDeclarationScope, otherPc.pointcutDeclarationScope) &&
 				ObjectUtils.nullSafeEquals(this.pointcutParameterNames, otherPc.pointcutParameterNames) &&
 				ObjectUtils.nullSafeEquals(this.pointcutParameterTypes, otherPc.pointcutParameterTypes);
@@ -540,7 +535,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut

 	@Override
 	public int hashCode() {
-		int hashCode = ObjectUtils.nullSafeHashCode(getExpression());
+		int hashCode = ObjectUtils.nullSafeHashCode(this.getExpression());
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutDeclarationScope);
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutParameterNames);
 		hashCode = 31 * hashCode + ObjectUtils.nullSafeHashCode(this.pointcutParameterTypes);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -18,6 +18,7 @@ package org.springframework.aop.aspectj.annotation;

 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.HashMap;
@@ -56,6 +57,8 @@ import org.springframework.lang.Nullable;
 */
 public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFactory {

+	private static final String AJC_MAGIC = "ajc$";
+
 	private static final Class<?>[] ASPECTJ_ANNOTATION_CLASSES = new Class<?>[] {
 			Pointcut.class, Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class};

@@ -66,11 +69,37 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	protected final ParameterNameDiscoverer parameterNameDiscoverer = new AspectJAnnotationParameterNameDiscoverer();


+	/**
+	 * We consider something to be an AspectJ aspect suitable for use by the Spring AOP system
+	 * if it has the @Aspect annotation, and was not compiled by ajc. The reason for this latter test
+	 * is that aspects written in the code-style (AspectJ language) also have the annotation present
+	 * when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
+	 */
 	@Override
 	public boolean isAspect(Class<?> clazz) {
+		return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
+	}
+
+	private boolean hasAspectAnnotation(Class<?> clazz) {
 		return (AnnotationUtils.findAnnotation(clazz, Aspect.class) != null);
 	}

+	/**
+	 * We need to detect this as "code-style" AspectJ aspects should not be
+	 * interpreted by Spring AOP.
+	 */
+	private boolean compiledByAjc(Class<?> clazz) {
+		// The AJTypeSystem goes to great lengths to provide a uniform appearance between code-style and
+		// annotation-style aspects. Therefore there is no 'clean' way to tell them apart. Here we rely on
+		// an implementation detail of the AspectJ compiler.
+		for (Field field : clazz.getDeclaredFields()) {
+			if (field.getName().startsWith(AJC_MAGIC)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
@@ -95,7 +124,6 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		}
 	}

-
 	/**
 	 * Find and return the first AspectJ annotation on the given method
 	 * (there <i>should</i> only be one anyway...).
@@ -135,7 +163,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac


 	/**
-	 * Class modeling an AspectJ annotation, exposing its type enumeration and
+	 * Class modelling an AspectJ annotation, exposing its type enumeration and
 	 * pointcut String.
 	 * @param <A> the annotation type
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -126,16 +126,10 @@ public class AspectMetadata implements Serializable {
 	 * Extract contents from String of form {@code pertarget(contents)}.
 	 */
 	private String findPerClause(Class<?> aspectClass) {
-		Aspect ann = aspectClass.getAnnotation(Aspect.class);
-		if (ann == null) {
-			return "";
-		}
-		String value = ann.value();
-		int beginIndex = value.indexOf('(');
-		if (beginIndex < 0) {
-			return "";
-		}
-		return value.substring(beginIndex + 1, value.length() - 1);
+		String str = aspectClass.getAnnotation(Aspect.class).value();
+		int beginIndex = str.indexOf('(') + 1;
+		int endIndex = str.length() - 1;
+		return str.substring(beginIndex, endIndex);
 	}


@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -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
@@ -294,7 +293,7 @@ final class InstantiationModelAwarePointcutAdvisorImpl
 		@Override
 		public boolean matches(Method method, Class<?> targetClass, Object... args) {
 			// This can match only on declared pointcut.
-			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass, args));
+			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass));
 		}

 		private boolean isAspectMaterialized() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -44,8 +44,7 @@ import org.springframework.util.CollectionUtils;

 /**
 * Base class for AOP proxy configuration managers.
- *
- * <p>These are not themselves AOP proxies, but subclasses of this class are
+ * These are not themselves AOP proxies, but subclasses of this class are
 * normally factories from which AOP proxy instances are obtained directly.
 *
 * <p>This class frees subclasses of the housekeeping of Advices
@@ -53,8 +52,7 @@ import org.springframework.util.CollectionUtils;
 * methods, which are provided by subclasses.
 *
 * <p>This class is serializable; subclasses need not be.
- *
- * <p>This class is used to hold snapshots of proxies.
+ * This class is used to hold snapshots of proxies.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -106,7 +104,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}

 	/**
-	 * Create an {@code AdvisedSupport} instance with the given parameters.
+	 * Create a AdvisedSupport instance with the given parameters.
 	 * @param interfaces the proxied interfaces
 	 */
 	public AdvisedSupport(Class<?>... interfaces) {
@@ -117,7 +115,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {

 	/**
 	 * Set the given object as target.
-	 * <p>Will create a SingletonTargetSource for the object.
+	 * Will create a SingletonTargetSource for the object.
 	 * @see #setTargetSource
 	 * @see org.springframework.aop.target.SingletonTargetSource
 	 */
@@ -346,7 +344,8 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	private void validateIntroductionAdvisor(IntroductionAdvisor advisor) {
 		advisor.validateInterfaces();
 		// If the advisor passed validation, we can make the change.
-		for (Class<?> ifc : advisor.getInterfaces()) {
+		Class<?>[] ifcs = advisor.getInterfaces();
+		for (Class<?> ifc : ifcs) {
 			addInterface(ifc);
 		}
 	}
@@ -492,9 +491,9 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}

 	/**
-	 * Copy the AOP configuration from the given {@link AdvisedSupport} object,
-	 * but allow substitution of a fresh {@link TargetSource} and a given interceptor chain.
-	 * @param other the {@code AdvisedSupport} object to take proxy configuration from
+	 * Copy the AOP configuration from the given AdvisedSupport object,
+	 * but allow substitution of a fresh TargetSource and a given interceptor chain.
+	 * @param other the AdvisedSupport object to take proxy configuration from
 	 * @param targetSource the new TargetSource
 	 * @param advisors the Advisors for the chain
 	 */
@@ -514,8 +513,8 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}

 	/**
-	 * Build a configuration-only copy of this {@link AdvisedSupport},
-	 * replacing the {@link TargetSource}.
+	 * Build a configuration-only copy of this AdvisedSupport,
+	 * replacing the TargetSource.
 	 */
 	AdvisedSupport getConfigurationOnlyCopy() {
 		AdvisedSupport copy = new AdvisedSupport();
@@ -424,9 +424,10 @@ class CglibAopProxy implements AopProxy, Serializable {


 	/**
-	 * Method interceptor used for static targets with no advice chain. The call is
-	 * passed directly back to the target. Used when the proxy needs to be exposed
-	 * and it can't be determined that the method won't return {@code this}.
+	 * Method interceptor used for static targets with no advice chain. The call
+	 * is passed directly back to the target. Used when the proxy needs to be
+	 * exposed and it can't be determined that the method won't return
+	 * {@code this}.
 	 */
 	private static class StaticUnadvisedInterceptor implements MethodInterceptor, Serializable {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -186,10 +186,10 @@ public abstract class AopUtils {
 	 * this method resolves bridge methods in order to retrieve attributes from
 	 * the <i>original</i> method definition.
 	 * @param method the method to be invoked, which may come from an interface
-	 * @param targetClass the target class for the current invocation
-	 * (can be {@code null} or may not even implement the method)
+	 * @param targetClass the target class for the current invocation.
+	 * May be {@code null} or may not even implement the method.
 	 * @return the specific target method, or the original method if the
-	 * {@code targetClass} does not implement it
+	 * {@code targetClass} doesn't implement it or is {@code null}
 	 * @see org.springframework.util.ClassUtils#getMostSpecificMethod
 	 */
 	public static Method getMostSpecificMethod(Method method, @Nullable Class<?> targetClass) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@ import java.util.Map;

 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.aspectj.weaver.tools.PointcutExpression;
+import org.aspectj.weaver.tools.PointcutPrimitive;
+import org.aspectj.weaver.tools.UnsupportedPointcutPrimitiveException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import test.annotation.EmptySpringAnnotation;
@@ -39,6 +42,7 @@ import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.beans.testfixture.beans.subpkg.DeepBean;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

@@ -61,7 +65,7 @@ public class AspectJExpressionPointcutTests {


 	@BeforeEach
-	public void setup() throws NoSuchMethodException {
+	public void setUp() throws NoSuchMethodException {
 		getAge = TestBean.class.getMethod("getAge");
 		setAge = TestBean.class.getMethod("setAge", int.class);
 		setSomeNumber = TestBean.class.getMethod("setSomeNumber", Number.class);
@@ -171,25 +175,25 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testFriendlyErrorOnNoLocationClassMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getClassFilter().matches(ITestBean.class))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(ITestBean.class))
+			.withMessageContaining("expression");
 	}

 	@Test
 	public void testFriendlyErrorOnNoLocation2ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(getAge, ITestBean.class))
+			.withMessageContaining("expression");
 	}

 	@Test
 	public void testFriendlyErrorOnNoLocation3ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
-		assertThatIllegalStateException()
-				.isThrownBy(() -> pc.getMethodMatcher().matches(getAge, ITestBean.class, (Object[]) null))
-				.withMessageContaining("expression");
+		assertThatIllegalStateException().isThrownBy(() ->
+				pc.matches(getAge, ITestBean.class, (Object[]) null))
+			.withMessageContaining("expression");
 	}


@@ -206,10 +210,8 @@ public class AspectJExpressionPointcutTests {
 		// not currently testable in a reliable fashion
 		//assertDoesNotMatchStringClass(classFilter);

-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 12D))
-				.as("Should match with setSomeNumber with Double input").isTrue();
-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 11))
-				.as("Should not match setSomeNumber with Integer input").isFalse();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 12D)).as("Should match with setSomeNumber with Double input").isTrue();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 11)).as("Should not match setSomeNumber with Integer input").isFalse();
 		assertThat(methodMatcher.matches(getAge, TestBean.class)).as("Should not match getAge").isFalse();
 		assertThat(methodMatcher.isRuntime()).as("Should be a runtime match").isTrue();
 	}
@@ -244,13 +246,14 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testInvalidExpression() {
 		String expression = "execution(void org.springframework.beans.testfixture.beans.TestBean.setSomeNumber(Number) && args(Double)";
-		assertThatIllegalArgumentException().isThrownBy(() -> getPointcut(expression).getClassFilter().matches(Object.class));
+		assertThatIllegalArgumentException().isThrownBy(
+				getPointcut(expression)::getClassFilter);  // call to getClassFilter forces resolution
 	}

 	private TestBean getAdvisedProxy(String pointcutExpression, CallCountingInterceptor interceptor) {
 		TestBean target = new TestBean();

-		AspectJExpressionPointcut pointcut = getPointcut(pointcutExpression);
+		Pointcut pointcut = getPointcut(pointcutExpression);

 		DefaultPointcutAdvisor advisor = new DefaultPointcutAdvisor();
 		advisor.setAdvice(interceptor);
@@ -274,29 +277,40 @@ public class AspectJExpressionPointcutTests {
 	@Test
 	public void testWithUnsupportedPointcutPrimitive() {
 		String expression = "call(int org.springframework.beans.testfixture.beans.TestBean.getAge())";
-		assertThat(getPointcut(expression).getClassFilter().matches(Object.class)).isFalse();
+		assertThatExceptionOfType(UnsupportedPointcutPrimitiveException.class).isThrownBy(() ->
+				getPointcut(expression).getClassFilter()) // call to getClassFilter forces resolution...
+			.satisfies(ex -> assertThat(ex.getUnsupportedPrimitive()).isEqualTo(PointcutPrimitive.CALL));
 	}

 	@Test
 	public void testAndSubstitution() {
-		AspectJExpressionPointcut pc = getPointcut("execution(* *(..)) and args(String)");
-		String expr = pc.getPointcutExpression().getPointcutExpression();
-		assertThat(expr).isEqualTo("execution(* *(..)) && args(String)");
+		Pointcut pc = getPointcut("execution(* *(..)) and args(String)");
+		PointcutExpression expr = ((AspectJExpressionPointcut) pc).getPointcutExpression();
+		assertThat(expr.getPointcutExpression()).isEqualTo("execution(* *(..)) && args(String)");
 	}

 	@Test
 	public void testMultipleAndSubstitutions() {
-		AspectJExpressionPointcut pc = getPointcut("execution(* *(..)) and args(String) and this(Object)");
-		String expr = pc.getPointcutExpression().getPointcutExpression();
-		assertThat(expr).isEqualTo("execution(* *(..)) && args(String) && this(Object)");
+		Pointcut pc = getPointcut("execution(* *(..)) and args(String) and this(Object)");
+		PointcutExpression expr = ((AspectJExpressionPointcut) pc).getPointcutExpression();
+		assertThat(expr.getPointcutExpression()).isEqualTo("execution(* *(..)) && args(String) && this(Object)");
 	}

-	private AspectJExpressionPointcut getPointcut(String expression) {
+	private Pointcut getPointcut(String expression) {
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 		pointcut.setExpression(expression);
 		return pointcut;
 	}

+
+	public static class OtherIOther implements IOther {
+
+		@Override
+		public void absquatulate() {
+			// Empty
+		}
+	}
+
 	@Test
 	public void testMatchGenericArgument() {
 		String expression = "execution(* set*(java.util.List<org.springframework.beans.testfixture.beans.TestBean>) )";
@@ -491,15 +505,6 @@ public class AspectJExpressionPointcutTests {
 	}


-	public static class OtherIOther implements IOther {
-
-		@Override
-		public void absquatulate() {
-			// Empty
-		}
-	}
-
-
 	public static class HasGeneric {

 		public void setFriends(List<TestBean> friends) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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,67 +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 annotationArgumentNameBinding() {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TransactionalBean());
-		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);
-		ITransactionalBean proxiedTestBean = proxyFactory.getProxy();
-
-		assertThatIllegalStateException()
-				.isThrownBy(proxiedTestBean::doInTransaction)
-				.withMessage("Invoked with @Transactional");
-	}
-
-	@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");
+		ITestBean proxiedTestBean = proxyFactory.getProxy();
+		assertThatIllegalArgumentException().isThrownBy(() ->
+				proxiedTestBean.setName("Supercalifragalisticexpialidocious"));
 	}

 	@Test
-	void bindingWithDynamicAdvice() {
-		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
-		proxyFactory.addAspect(DynamicPointcutWithArgs.class);
-		ITestBean proxiedTestBean = proxyFactory.getProxy();
+	public void testAnnotationArgumentNameBinding() {
+		TransactionalBean tb = new TransactionalBean();
+		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(tb);
+		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);

-		proxiedTestBean.applyName(1);
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> proxiedTestBean.applyName("enigma"))
-				.withMessage("enigma");
+		ITransactionalBean proxiedTestBean = proxyFactory.getProxy();
+		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
@@ -106,46 +95,38 @@ class ArgumentBindingTests {
 		}
 	}

+}

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


-	@Aspect
-	static class PointcutWithAnnotationArgument {
+@Aspect
+class PointcutWithAnnotationArgument {

-		@Around("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("pertarget(execution(* *(..)))")
-	static class DynamicPointcutWithArgs {
-
-		@Around("execution(* *(..)) && args(java.lang.String)")
-		public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
-			throw new IllegalArgumentException(String.valueOf(pjp.getArgs()[0]));
-		}
+	@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-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.
@@ -77,7 +77,9 @@ public class ThrowsAdviceInterceptorTests {
 		given(mi.getMethod()).willReturn(Object.class.getMethod("hashCode"));
 		given(mi.getThis()).willReturn(new Object());
 		given(mi.proceed()).willThrow(ex);
-		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() -> ti.invoke(mi)).isSameAs(ex);
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				ti.invoke(mi))
+			.isSameAs(ex);
 		assertThat(th.getCalls()).isEqualTo(1);
 		assertThat(th.getCalls("ioException")).isEqualTo(1);
 	}
@@ -90,7 +92,9 @@ public class ThrowsAdviceInterceptorTests {
 		ConnectException ex = new ConnectException("");
 		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willThrow(ex);
-		assertThatExceptionOfType(ConnectException.class).isThrownBy(() -> ti.invoke(mi)).isSameAs(ex);
+		assertThatExceptionOfType(ConnectException.class).isThrownBy(() ->
+				ti.invoke(mi))
+			.isSameAs(ex);
 		assertThat(th.getCalls()).isEqualTo(1);
 		assertThat(th.getCalls("remoteException")).isEqualTo(1);
 	}
@@ -113,7 +117,9 @@ public class ThrowsAdviceInterceptorTests {
 		ConnectException ex = new ConnectException("");
 		MethodInvocation mi = mock(MethodInvocation.class);
 		given(mi.proceed()).willThrow(ex);
-		assertThatExceptionOfType(Throwable.class).isThrownBy(() -> ti.invoke(mi)).isSameAs(t);
+		assertThatExceptionOfType(Throwable.class).isThrownBy(() ->
+				ti.invoke(mi))
+			.isSameAs(t);
 		assertThat(th.getCalls()).isEqualTo(1);
 		assertThat(th.getCalls("remoteException")).isEqualTo(1);
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -17,35 +17,29 @@
 package org.springframework.aop.support;

 import java.lang.reflect.Method;
-import java.util.List;

 import org.junit.jupiter.api.Test;

 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
-import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.target.EmptyTargetSource;
 import org.springframework.aop.testfixture.interceptor.NopInterceptor;
 import org.springframework.beans.testfixture.beans.TestBean;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ReflectionUtils;

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

 /**
 * @author Rod Johnson
 * @author Chris Beams
- * @author Sebastien Deleuze
- * @author Juergen Hoeller
 */
-class AopUtilsTests {
+public class AopUtilsTests {

 	@Test
-	void testPointcutCanNeverApply() {
+	public void testPointcutCanNeverApply() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
 			@Override
 			public boolean matches(Method method, @Nullable Class<?> clazzy) {
@@ -58,13 +52,13 @@ class AopUtilsTests {
 	}

 	@Test
-	void testPointcutAlwaysApplies() {
+	public void testPointcutAlwaysApplies() {
 		assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), Object.class)).isTrue();
 		assertThat(AopUtils.canApply(new DefaultPointcutAdvisor(new NopInterceptor()), TestBean.class)).isTrue();
 	}

 	@Test
-	void testPointcutAppliesToOneMethodOnObject() {
+	public void testPointcutAppliesToOneMethodOnObject() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
 			@Override
 			public boolean matches(Method method, @Nullable Class<?> clazz) {
@@ -84,7 +78,7 @@ class AopUtilsTests {
 	 * that's subverted the singleton construction limitation.
 	 */
 	@Test
-	void testCanonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception {
+	public void testCanonicalFrameworkClassesStillCanonicalOnDeserialization() throws Exception {
 		assertThat(SerializationTestUtils.serializeAndDeserialize(MethodMatcher.TRUE)).isSameAs(MethodMatcher.TRUE);
 		assertThat(SerializationTestUtils.serializeAndDeserialize(ClassFilter.TRUE)).isSameAs(ClassFilter.TRUE);
 		assertThat(SerializationTestUtils.serializeAndDeserialize(Pointcut.TRUE)).isSameAs(Pointcut.TRUE);
@@ -94,45 +88,4 @@ class AopUtilsTests {
 		assertThat(SerializationTestUtils.serializeAndDeserialize(ExposeInvocationInterceptor.INSTANCE)).isSameAs(ExposeInvocationInterceptor.INSTANCE);
 	}

-	@Test
-	void testInvokeJoinpointUsingReflection() throws Throwable {
-		String name = "foo";
-		TestBean testBean = new TestBean(name);
-		Method method = ReflectionUtils.findMethod(TestBean.class, "getName");
-		Object result = AopUtils.invokeJoinpointUsingReflection(testBean, method, new Object[0]);
-		assertThat(result).isEqualTo(name);
-	}
-
-	@Test  // gh-32365
-	void mostSpecificMethodBetweenJdkProxyAndTarget() throws Exception {
-		Class<?> proxyClass = new ProxyFactory(new WithInterface()).getProxy(getClass().getClassLoader()).getClass();
-		Method specificMethod = AopUtils.getMostSpecificMethod(proxyClass.getMethod("handle", List.class), WithInterface.class);
-		assertThat(ResolvableType.forMethodParameter(specificMethod, 0).getGeneric().toClass()).isEqualTo(String.class);
-	}
-
-	@Test  // gh-32365
-	void mostSpecificMethodBetweenCglibProxyAndTarget() throws Exception {
-		Class<?> proxyClass = new ProxyFactory(new WithoutInterface()).getProxy(getClass().getClassLoader()).getClass();
-		Method specificMethod = AopUtils.getMostSpecificMethod(proxyClass.getMethod("handle", List.class), WithoutInterface.class);
-		assertThat(ResolvableType.forMethodParameter(specificMethod, 0).getGeneric().toClass()).isEqualTo(String.class);
-	}
-
-
-	interface ProxyInterface {
-
-		void handle(List<String> list);
-	}
-
-	static class WithInterface implements ProxyInterface {
-
-		public void handle(List<String> list) {
-		}
-	}
-
-	static class WithoutInterface {
-
-		public void handle(List<String> list) {
-		}
-	}
-
 }
@@ -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.
@@ -1004,20 +1004,18 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 	 */
 	protected abstract static class PropertyHandler {

-		@Nullable
 		private final Class<?> propertyType;

 		private final boolean readable;

 		private final boolean writable;

-		public PropertyHandler(@Nullable Class<?> propertyType, boolean readable, boolean writable) {
+		public PropertyHandler(Class<?> propertyType, boolean readable, boolean writable) {
 			this.propertyType = propertyType;
 			this.readable = readable;
 			this.writable = writable;
 		}

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

-	private static boolean isAssignable(Method writeMethod, Method readMethod) {
-		Type paramType = writeMethod.getGenericParameterTypes()[0];
-		if (paramType instanceof Class) {
-			return ClassUtils.isAssignable((Class<?>) paramType, readMethod.getReturnType());
-		}
-		else if (paramType.equals(readMethod.getGenericReturnType())) {
-			return true;
-		}
-		else {
-			ResolvableType sourceType = ResolvableType.forMethodReturnType(readMethod);
-			ResolvableType targetType = ResolvableType.forMethodParameter(writeMethod, 0);
-			// Ignore generic types in assignable check if either ResolvableType has unresolvable generics.
-			return (sourceType.hasUnresolvableGenerics() || targetType.hasUnresolvableGenerics() ?
-					ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType()) :
-					targetType.isAssignableFrom(sourceType));
-		}
-	}
-

 	/**
 	 * Inner class to avoid a hard dependency on Kotlin at runtime.
@@ -902,6 +892,7 @@ public abstract class BeanUtils {
 			}
 			return kotlinConstructor.callBy(argParameters);
 		}
+
 	}

 }
@@ -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,22 +248,9 @@ public final class CachedIntrospectionResults {
 				return beanInfo;
 			}
 		}
-
-		BeanInfo beanInfo = (shouldIntrospectorIgnoreBeaninfoClasses ?
+		return (shouldIntrospectorIgnoreBeaninfoClasses ?
 				Introspector.getBeanInfo(beanClass, Introspector.IGNORE_ALL_BEANINFO) :
 				Introspector.getBeanInfo(beanClass));
-
-		// Immediately remove class from Introspector cache to allow for proper garbage
-		// collection on class loader shutdown; we cache it in CachedIntrospectionResults
-		// in a GC-friendly manner. This is necessary (again) for the JDK ClassInfo cache.
-		Class<?> classToFlush = beanClass;
-		do {
-			Introspector.flushFromCaches(classToFlush);
-			classToFlush = classToFlush.getSuperclass();
-		}
-		while (classToFlush != null && classToFlush != Object.class);
-
-		return beanInfo;
 	}


@@ -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.
@@ -129,6 +129,7 @@ public class DirectFieldAccessor extends AbstractNestablePropertyAccessor {
 				ReflectionUtils.makeAccessible(this.field);
 				return this.field.get(getWrappedInstance());
 			}
+
 			catch (IllegalAccessException ex) {
 				throw new InvalidPropertyException(getWrappedClass(),
 						this.field.getName(), "Field is not accessible", ex);
@@ -17,7 +17,6 @@
 package org.springframework.beans.factory.annotation;

 import java.beans.PropertyDescriptor;
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
@@ -63,10 +62,6 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.MethodMetadata;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -149,9 +144,6 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	@Nullable
 	private ConfigurableListableBeanFactory beanFactory;

-	@Nullable
-	private MetadataReaderFactory metadataReaderFactory;
-
 	private final Set<String> lookupMethodsChecked = Collections.newSetFromMap(new ConcurrentHashMap<>(256));

 	private final Map<Class<?>, Constructor<?>[]> candidateConstructorsCache = new ConcurrentHashMap<>(256);
@@ -246,7 +238,6 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 					"AutowiredAnnotationBeanPostProcessor requires a ConfigurableListableBeanFactory: " + beanFactory);
 		}
 		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
-		this.metadataReaderFactory = new SimpleMetadataReaderFactory(this.beanFactory.getBeanClassLoader());
 	}


@@ -472,11 +463,12 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 			return InjectionMetadata.EMPTY;
 		}

-		final List<InjectionMetadata.InjectedElement> elements = new ArrayList<>();
+		List<InjectionMetadata.InjectedElement> elements = new ArrayList<>();
 		Class<?> targetClass = clazz;

 		do {
-			final List<InjectionMetadata.InjectedElement> fieldElements = new ArrayList<>();
+			final List<InjectionMetadata.InjectedElement> currElements = new ArrayList<>();
+
 			ReflectionUtils.doWithLocalFields(targetClass, field -> {
 				MergedAnnotation<?> ann = findAutowiredAnnotation(field);
 				if (ann != null) {
@@ -487,11 +479,10 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 						return;
 					}
 					boolean required = determineRequiredStatus(ann);
-					fieldElements.add(new AutowiredFieldElement(field, required));
+					currElements.add(new AutowiredFieldElement(field, required));
 				}
 			});

-			final List<InjectionMetadata.InjectedElement> methodElements = new ArrayList<>();
 			ReflectionUtils.doWithLocalMethods(targetClass, method -> {
 				Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
 				if (!BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
@@ -513,12 +504,11 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 					}
 					boolean required = determineRequiredStatus(ann);
 					PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
-					methodElements.add(new AutowiredMethodElement(method, required, pd));
+					currElements.add(new AutowiredMethodElement(method, required, pd));
 				}
 			});

-			elements.addAll(0, sortMethodElements(methodElements, targetClass));
-			elements.addAll(0, fieldElements);
+			elements.addAll(0, currElements);
 			targetClass = targetClass.getSuperclass();
 		}
 		while (targetClass != null && targetClass != Object.class);
@@ -583,47 +573,6 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 		return BeanFactoryUtils.beansOfTypeIncludingAncestors(this.beanFactory, type);
 	}

-	/**
-	 * Sort the method elements via ASM for deterministic declaration order if possible.
-	 */
-	private List<InjectionMetadata.InjectedElement> sortMethodElements(
-			List<InjectionMetadata.InjectedElement> methodElements, Class<?> targetClass) {
-
-		if (this.metadataReaderFactory != null && methodElements.size() > 1) {
-			// Try reading the class file via ASM for deterministic declaration order...
-			// Unfortunately, the JVM's standard reflection returns methods in arbitrary
-			// order, even between different runs of the same application on the same JVM.
-			try {
-				AnnotationMetadata asm =
-						this.metadataReaderFactory.getMetadataReader(targetClass.getName()).getAnnotationMetadata();
-				Set<MethodMetadata> asmMethods = asm.getAnnotatedMethods(Autowired.class.getName());
-				if (asmMethods.size() >= methodElements.size()) {
-					List<InjectionMetadata.InjectedElement> candidateMethods = new ArrayList<>(methodElements);
-					List<InjectionMetadata.InjectedElement> selectedMethods = new ArrayList<>(asmMethods.size());
-					for (MethodMetadata asmMethod : asmMethods) {
-						for (Iterator<InjectionMetadata.InjectedElement> it = candidateMethods.iterator(); it.hasNext();) {
-							InjectionMetadata.InjectedElement element = it.next();
-							if (element.getMember().getName().equals(asmMethod.getMethodName())) {
-								selectedMethods.add(element);
-								it.remove();
-								break;
-							}
-						}
-					}
-					if (selectedMethods.size() == methodElements.size()) {
-						// All reflection-detected methods found in ASM method set -> proceed
-						return selectedMethods;
-					}
-				}
-			}
-			catch (IOException ex) {
-				logger.debug("Failed to read class file via ASM for determining @Autowired method order", ex);
-				// No worries, let's continue with the reflection metadata we started with...
-			}
-		}
-		return methodElements;
-	}
-
 	/**
 	 * Register the specified bean as dependent on the autowired beans.
 	 */
@@ -702,7 +651,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 		private Object resolveFieldValue(Field field, Object bean, @Nullable String beanName) {
 			DependencyDescriptor desc = new DependencyDescriptor(field, this.required);
 			desc.setContainingClass(bean.getClass());
-			Set<String> autowiredBeanNames = new LinkedHashSet<>(2);
+			Set<String> autowiredBeanNames = new LinkedHashSet<>(1);
 			Assert.state(beanFactory != null, "No BeanFactory available");
 			TypeConverter typeConverter = beanFactory.getTypeConverter();
 			Object value;
@@ -721,7 +670,8 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 							String autowiredBeanName = autowiredBeanNames.iterator().next();
 							if (beanFactory.containsBean(autowiredBeanName) &&
 									beanFactory.isTypeMatch(autowiredBeanName, field.getType())) {
-								cachedFieldValue = new ShortcutDependencyDescriptor(desc, autowiredBeanName);
+								cachedFieldValue = new ShortcutDependencyDescriptor(
+										desc, autowiredBeanName, field.getType());
 							}
 						}
 						this.cachedFieldValue = cachedFieldValue;
@@ -804,7 +754,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 			int argumentCount = method.getParameterCount();
 			Object[] arguments = new Object[argumentCount];
 			DependencyDescriptor[] descriptors = new DependencyDescriptor[argumentCount];
-			Set<String> autowiredBeanNames = new LinkedHashSet<>(argumentCount * 2);
+			Set<String> autowiredBeans = new LinkedHashSet<>(argumentCount);
 			Assert.state(beanFactory != null, "No BeanFactory available");
 			TypeConverter typeConverter = beanFactory.getTypeConverter();
 			for (int i = 0; i < arguments.length; i++) {
@@ -813,7 +763,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 				currDesc.setContainingClass(bean.getClass());
 				descriptors[i] = currDesc;
 				try {
-					Object arg = beanFactory.resolveDependency(currDesc, beanName, autowiredBeanNames, typeConverter);
+					Object arg = beanFactory.resolveDependency(currDesc, beanName, autowiredBeans, typeConverter);
 					if (arg == null && !this.required) {
 						arguments = null;
 						break;
@@ -828,16 +778,16 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 				if (!this.cached) {
 					if (arguments != null) {
 						DependencyDescriptor[] cachedMethodArguments = Arrays.copyOf(descriptors, argumentCount);
-						registerDependentBeans(beanName, autowiredBeanNames);
-						if (autowiredBeanNames.size() == argumentCount) {
-							Iterator<String> it = autowiredBeanNames.iterator();
+						registerDependentBeans(beanName, autowiredBeans);
+						if (autowiredBeans.size() == argumentCount) {
+							Iterator<String> it = autowiredBeans.iterator();
 							Class<?>[] paramTypes = method.getParameterTypes();
 							for (int i = 0; i < paramTypes.length; i++) {
 								String autowiredBeanName = it.next();
 								if (arguments[i] != null && beanFactory.containsBean(autowiredBeanName) &&
 										beanFactory.isTypeMatch(autowiredBeanName, paramTypes[i])) {
 									cachedMethodArguments[i] = new ShortcutDependencyDescriptor(
-											descriptors[i], autowiredBeanName);
+											descriptors[i], autowiredBeanName, paramTypes[i]);
 								}
 							}
 						}
@@ -863,14 +813,17 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA

 		private final String shortcut;

-		public ShortcutDependencyDescriptor(DependencyDescriptor original, String shortcut) {
+		private final Class<?> requiredType;
+
+		public ShortcutDependencyDescriptor(DependencyDescriptor original, String shortcut, Class<?> requiredType) {
 			super(original);
 			this.shortcut = shortcut;
+			this.requiredType = requiredType;
 		}

 		@Override
 		public Object resolveShortcut(BeanFactory beanFactory) {
-			return beanFactory.getBean(this.shortcut, getDependencyType());
+			return beanFactory.getBean(this.shortcut, this.requiredType);
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -292,7 +292,7 @@ public class QualifierAnnotationAutowireCandidateResolver extends GenericTypeAwa
 			if (actualValue != null) {
 				actualValue = typeConverter.convertIfNecessary(actualValue, expectedValue.getClass());
 			}
-			if (!ObjectUtils.nullSafeEquals(expectedValue, actualValue)) {
+			if (!expectedValue.equals(actualValue)) {
 				return false;
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -97,10 +97,10 @@ import org.springframework.util.StringUtils;
 * Supports autowiring constructors, properties by name, and properties by type.
 *
 * <p>The main template method to be implemented by subclasses is
- * {@link #resolveDependency(DependencyDescriptor, String, Set, TypeConverter)}, used for
- * autowiring. In case of a {@link org.springframework.beans.factory.ListableBeanFactory}
- * which is capable of searching its bean definitions, matching beans will typically be
- * implemented through such a search. Otherwise, simplified matching can be implemented.
+ * {@link #resolveDependency(DependencyDescriptor, String, Set, TypeConverter)},
+ * used for autowiring by type. In case of a factory which is capable of searching
+ * its bean definitions, matching beans will typically be implemented through such
+ * a search. For other factory styles, simplified matching algorithms can be implemented.
 *
 * <p>Note that this class does <i>not</i> assume or implement bean definition
 * registry capabilities. See {@link DefaultListableBeanFactory} for an implementation
@@ -675,7 +675,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		// Apply SmartInstantiationAwareBeanPostProcessors to predict the
 		// eventual type after a before-instantiation shortcut.
 		if (targetType != null && !mbd.isSynthetic() && hasInstantiationAwareBeanPostProcessors()) {
-			boolean matchingOnlyFactoryBean = (typesToMatch.length == 1 && typesToMatch[0] == FactoryBean.class);
+			boolean matchingOnlyFactoryBean = typesToMatch.length == 1 && typesToMatch[0] == FactoryBean.class;
 			for (SmartInstantiationAwareBeanPostProcessor bp : getBeanPostProcessorCache().smartInstantiationAware) {
 				Class<?> predicted = bp.predictBeanType(targetType, beanName);
 				if (predicted != null &&
@@ -835,11 +835,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	/**
 	 * This implementation attempts to query the FactoryBean's generic parameter metadata
 	 * if present to determine the object type. If not present, i.e. the FactoryBean is
-	 * declared as a raw type, it checks the FactoryBean's {@code getObjectType} method
+	 * declared as a raw type, checks the FactoryBean's {@code getObjectType} method
 	 * on a plain instance of the FactoryBean, without bean properties applied yet.
-	 * If this doesn't return a type yet and {@code allowInit} is {@code true}, full
-	 * creation of the FactoryBean is attempted as fallback (through delegation to the
-	 * superclass implementation).
+	 * If this doesn't return a type yet, and {@code allowInit} is {@code true} a
+	 * full creation of the FactoryBean is used as fallback (through delegation to the
+	 * superclass's implementation).
 	 * <p>The shortcut check for a FactoryBean is only applied in case of a singleton
 	 * FactoryBean. If the FactoryBean instance itself is not kept as singleton,
 	 * it will be fully created to check the type of its exposed object.
@@ -1504,8 +1504,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			converter = bw;
 		}

+		Set<String> autowiredBeanNames = new LinkedHashSet<>(4);
 		String[] propertyNames = unsatisfiedNonSimpleProperties(mbd, bw);
-		Set<String> autowiredBeanNames = new LinkedHashSet<>(propertyNames.length * 2);
 		for (String propertyName : propertyNames) {
 			try {
 				PropertyDescriptor pd = bw.getPropertyDescriptor(propertyName);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -166,9 +166,6 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/** Map from scope identifier String to corresponding Scope. */
 	private final Map<String, Scope> scopes = new LinkedHashMap<>(8);

-	/** Application startup metrics. **/
-	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;
-
 	/** Security context used when running with a SecurityManager. */
 	@Nullable
 	private SecurityContextProvider securityContextProvider;
@@ -183,6 +180,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	private final ThreadLocal<Object> prototypesCurrentlyInCreation =
 			new NamedThreadLocal<>("Prototype beans currently in creation");

+	/** Application startup metrics. **/
+	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;

 	/**
 	 * Create a new AbstractBeanFactory.
@@ -750,7 +749,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			aliases.add(fullBeanName);
 		}
 		String[] retrievedAliases = super.getAliases(beanName);
-		String prefix = (factoryPrefix ? FACTORY_BEAN_PREFIX : "");
+		String prefix = factoryPrefix ? FACTORY_BEAN_PREFIX : "";
 		for (String retrievedAlias : retrievedAliases) {
 			String alias = prefix + retrievedAlias;
 			if (!alias.equals(name)) {
@@ -1080,7 +1079,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp

 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
-		Assert.notNull(applicationStartup, "ApplicationStartup must not be null");
+		Assert.notNull(applicationStartup, "applicationStartup should not be null");
 		this.applicationStartup = applicationStartup;
 	}

@@ -1695,7 +1694,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * already. The implementation is allowed to instantiate the target factory bean if
 	 * {@code allowInit} is {@code true} and the type cannot be determined another way;
 	 * otherwise it is restricted to introspecting signatures and related metadata.
-	 * <p>If no {@link FactoryBean#OBJECT_TYPE_ATTRIBUTE} is set on the bean definition
+	 * <p>If no {@link FactoryBean#OBJECT_TYPE_ATTRIBUTE} if set on the bean definition
 	 * and {@code allowInit} is {@code true}, the default implementation will create
 	 * the FactoryBean via {@code getBean} to call its {@code getObjectType} method.
 	 * Subclasses are encouraged to optimize this, typically by inspecting the generic
@@ -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.
@@ -134,7 +134,7 @@ class BeanDefinitionValueResolver {
 			return resolveInnerBean(argName, innerBeanName, bd);
 		}
 		else if (value instanceof DependencyDescriptor) {
-			Set<String> autowiredBeanNames = new LinkedHashSet<>(2);
+			Set<String> autowiredBeanNames = new LinkedHashSet<>(4);
 			Object result = this.beanFactory.resolveDependency(
 					(DependencyDescriptor) value, this.beanName, autowiredBeanNames, this.typeConverter);
 			for (String autowiredBeanName : autowiredBeanNames) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@ import org.springframework.beans.TypeConverter;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.InjectionPoint;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
@@ -86,6 +85,12 @@ class ConstructorResolver {

 	private static final Object[] EMPTY_ARGS = new Object[0];

+	/**
+	 * Marker for autowired arguments in a cached argument array, to be replaced
+	 * by a {@linkplain #resolveAutowiredArgument resolved autowired argument}.
+	 */
+	private static final Object autowiredArgumentMarker = new Object();
+
 	private static final NamedThreadLocal<InjectionPoint> currentInjectionPoint =
 			new NamedThreadLocal<>("Current injection point");

@@ -107,7 +112,11 @@ class ConstructorResolver {

 	/**
 	 * "autowire constructor" (with constructor arguments by type) behavior.
-	 * Also applied if explicit constructor argument values are specified.
+	 * Also applied if explicit constructor argument values are specified,
+	 * matching all remaining arguments with beans from the bean factory.
+	 * <p>This corresponds to constructor injection: In this mode, a Spring
+	 * bean factory is able to host components that expect constructor-based
+	 * dependency resolution.
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
 	 * @param chosenCtors chosen candidate constructors (or {@code null} if none)
@@ -600,10 +609,13 @@ class ConstructorResolver {
 				String argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
 						"No matching factory method found on class [" + factoryClass.getName() + "]: " +
-						(mbd.getFactoryBeanName() != null ? "factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
+						(mbd.getFactoryBeanName() != null ?
+							"factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
 						"factory method '" + mbd.getFactoryMethodName() + "(" + argDesc + ")'. " +
-						"Check that a method with the specified name " + (minNrOfArgs > 0 ? "and arguments " : "") +
-						"exists and that it is " + (isStatic ? "static" : "non-static") + ".");
+						"Check that a method with the specified name " +
+						(minNrOfArgs > 0 ? "and arguments " : "") +
+						"exists and that it is " +
+						(isStatic ? "static" : "non-static") + ".");
 			}
 			else if (void.class == factoryMethodToUse.getReturnType()) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -717,7 +729,7 @@ class ConstructorResolver {

 		ArgumentsHolder args = new ArgumentsHolder(paramTypes.length);
 		Set<ConstructorArgumentValues.ValueHolder> usedValueHolders = new HashSet<>(paramTypes.length);
-		Set<String> allAutowiredBeanNames = new LinkedHashSet<>(paramTypes.length * 2);
+		Set<String> autowiredBeanNames = new LinkedHashSet<>(4);

 		for (int paramIndex = 0; paramIndex < paramTypes.length; paramIndex++) {
 			Class<?> paramType = paramTypes[paramIndex];
@@ -752,8 +764,8 @@ class ConstructorResolver {
 						throw new UnsatisfiedDependencyException(
 								mbd.getResourceDescription(), beanName, new InjectionPoint(methodParam),
 								"Could not convert argument value of type [" +
-								ObjectUtils.nullSafeClassName(valueHolder.getValue()) +
-								"] to required type [" + paramType.getName() + "]: " + ex.getMessage());
+										ObjectUtils.nullSafeClassName(valueHolder.getValue()) +
+										"] to required type [" + paramType.getName() + "]: " + ex.getMessage());
 					}
 					Object sourceHolder = valueHolder.getSource();
 					if (sourceHolder instanceof ConstructorArgumentValues.ValueHolder) {
@@ -776,17 +788,11 @@ class ConstructorResolver {
 							"] - did you specify the correct bean references as arguments?");
 				}
 				try {
-					ConstructorDependencyDescriptor desc = new ConstructorDependencyDescriptor(methodParam, true);
-					Set<String> autowiredBeanNames = new LinkedHashSet<>(2);
-					Object arg = resolveAutowiredArgument(
-							desc, paramType, beanName, autowiredBeanNames, converter, fallback);
-					if (arg != null) {
-						setShortcutIfPossible(desc, paramType, autowiredBeanNames);
-					}
-					allAutowiredBeanNames.addAll(autowiredBeanNames);
-					args.rawArguments[paramIndex] = arg;
-					args.arguments[paramIndex] = arg;
-					args.preparedArguments[paramIndex] = desc;
+					Object autowiredArgument = resolveAutowiredArgument(
+							methodParam, beanName, autowiredBeanNames, converter, fallback);
+					args.rawArguments[paramIndex] = autowiredArgument;
+					args.arguments[paramIndex] = autowiredArgument;
+					args.preparedArguments[paramIndex] = autowiredArgumentMarker;
 					args.resolveNecessary = true;
 				}
 				catch (BeansException ex) {
@@ -796,7 +802,14 @@ class ConstructorResolver {
 			}
 		}

-		registerDependentBeans(executable, beanName, allAutowiredBeanNames);
+		for (String autowiredBeanName : autowiredBeanNames) {
+			this.beanFactory.registerDependentBean(autowiredBeanName, beanName);
+			if (logger.isDebugEnabled()) {
+				logger.debug("Autowiring by type from bean name '" + beanName +
+						"' via " + (executable instanceof Constructor ? "constructor" : "factory method") +
+						" to bean named '" + autowiredBeanName + "'");
+			}
+		}

 		return args;
 	}
@@ -816,61 +829,31 @@ class ConstructorResolver {
 		Object[] resolvedArgs = new Object[argsToResolve.length];
 		for (int argIndex = 0; argIndex < argsToResolve.length; argIndex++) {
 			Object argValue = argsToResolve[argIndex];
-			Class<?> paramType = paramTypes[argIndex];
-			boolean convertNecessary = false;
-			if (argValue instanceof ConstructorDependencyDescriptor) {
-				ConstructorDependencyDescriptor descriptor = (ConstructorDependencyDescriptor) argValue;
-				try {
-					argValue = resolveAutowiredArgument(descriptor, paramType, beanName,
-							null, converter, true);
-				}
-				catch (BeansException ex) {
-					// Unexpected target bean mismatch for cached argument -> re-resolve
-					Set<String> autowiredBeanNames = null;
-					if (descriptor.hasShortcut()) {
-						// Reset shortcut and try to re-resolve it in this thread...
-						descriptor.setShortcut(null);
-						autowiredBeanNames = new LinkedHashSet<>(2);
-					}
-					logger.debug("Failed to resolve cached argument", ex);
-					argValue = resolveAutowiredArgument(descriptor, paramType, beanName,
-							autowiredBeanNames, converter, true);
-					if (autowiredBeanNames != null && !descriptor.hasShortcut()) {
-						// We encountered as stale shortcut before, and the shortcut has
-						// not been re-resolved by another thread in the meantime...
-						if (argValue != null) {
-							setShortcutIfPossible(descriptor, paramType, autowiredBeanNames);
-						}
-						registerDependentBeans(executable, beanName, autowiredBeanNames);
-					}
-				}
+			MethodParameter methodParam = MethodParameter.forExecutable(executable, argIndex);
+			if (argValue == autowiredArgumentMarker) {
+				argValue = resolveAutowiredArgument(methodParam, beanName, null, converter, true);
 			}
 			else if (argValue instanceof BeanMetadataElement) {
 				argValue = valueResolver.resolveValueIfNecessary("constructor argument", argValue);
-				convertNecessary = true;
 			}
 			else if (argValue instanceof String) {
 				argValue = this.beanFactory.evaluateBeanDefinitionString((String) argValue, mbd);
-				convertNecessary = true;
 			}
-			if (convertNecessary) {
-				MethodParameter methodParam = MethodParameter.forExecutable(executable, argIndex);
-				try {
-					argValue = converter.convertIfNecessary(argValue, paramType, methodParam);
-				}
-				catch (TypeMismatchException ex) {
-					throw new UnsatisfiedDependencyException(
-							mbd.getResourceDescription(), beanName, new InjectionPoint(methodParam),
-							"Could not convert argument value of type [" + ObjectUtils.nullSafeClassName(argValue) +
-							"] to required type [" + paramType.getName() + "]: " + ex.getMessage());
-				}
+			Class<?> paramType = paramTypes[argIndex];
+			try {
+				resolvedArgs[argIndex] = converter.convertIfNecessary(argValue, paramType, methodParam);
+			}
+			catch (TypeMismatchException ex) {
+				throw new UnsatisfiedDependencyException(
+						mbd.getResourceDescription(), beanName, new InjectionPoint(methodParam),
+						"Could not convert argument value of type [" + ObjectUtils.nullSafeClassName(argValue) +
+						"] to required type [" + paramType.getName() + "]: " + ex.getMessage());
 			}
-			resolvedArgs[argIndex] = argValue;
 		}
 		return resolvedArgs;
 	}

-	private Constructor<?> getUserDeclaredConstructor(Constructor<?> constructor) {
+	protected Constructor<?> getUserDeclaredConstructor(Constructor<?> constructor) {
 		Class<?> declaringClass = constructor.getDeclaringClass();
 		Class<?> userClass = ClassUtils.getUserClass(declaringClass);
 		if (userClass != declaringClass) {
@@ -886,22 +869,23 @@ class ConstructorResolver {
 	}

 	/**
-	 * Resolve the specified argument which is supposed to be autowired.
+	 * Template method for resolving the specified argument which is supposed to be autowired.
 	 */
 	@Nullable
-	Object resolveAutowiredArgument(DependencyDescriptor descriptor, Class<?> paramType, String beanName,
+	protected Object resolveAutowiredArgument(MethodParameter param, String beanName,
 			@Nullable Set<String> autowiredBeanNames, TypeConverter typeConverter, boolean fallback) {

+		Class<?> paramType = param.getParameterType();
 		if (InjectionPoint.class.isAssignableFrom(paramType)) {
 			InjectionPoint injectionPoint = currentInjectionPoint.get();
 			if (injectionPoint == null) {
-				throw new IllegalStateException("No current InjectionPoint available for " + descriptor);
+				throw new IllegalStateException("No current InjectionPoint available for " + param);
 			}
 			return injectionPoint;
 		}
-
 		try {
-			return this.beanFactory.resolveDependency(descriptor, beanName, autowiredBeanNames, typeConverter);
+			return this.beanFactory.resolveDependency(
+					new DependencyDescriptor(param, true), beanName, autowiredBeanNames, typeConverter);
 		}
 		catch (NoUniqueBeanDefinitionException ex) {
 			throw ex;
@@ -924,31 +908,6 @@ class ConstructorResolver {
 		}
 	}

-	private void setShortcutIfPossible(
-			ConstructorDependencyDescriptor descriptor, Class<?> paramType, Set<String> autowiredBeanNames) {
-
-		if (autowiredBeanNames.size() == 1) {
-			String autowiredBeanName = autowiredBeanNames.iterator().next();
-			if (this.beanFactory.containsBean(autowiredBeanName) &&
-					this.beanFactory.isTypeMatch(autowiredBeanName, paramType)) {
-				descriptor.setShortcut(autowiredBeanName);
-			}
-		}
-	}
-
-	private void registerDependentBeans(
-			Executable executable, String beanName, Set<String> autowiredBeanNames) {
-
-		for (String autowiredBeanName : autowiredBeanNames) {
-			this.beanFactory.registerDependentBean(autowiredBeanName, beanName);
-			if (logger.isDebugEnabled()) {
-				logger.debug("Autowiring by type from bean name '" + beanName + "' via " +
-						(executable instanceof Constructor ? "constructor" : "factory method") +
-						" to bean named '" + autowiredBeanName + "'");
-			}
-		}
-	}
-
 	static InjectionPoint setCurrentInjectionPoint(@Nullable InjectionPoint injectionPoint) {
 		InjectionPoint old = currentInjectionPoint.get();
 		if (injectionPoint != null) {
@@ -1047,35 +1006,4 @@ class ConstructorResolver {
 		}
 	}

-
-	/**
-	 * DependencyDescriptor marker for constructor arguments,
-	 * for differentiating between a provided DependencyDescriptor instance
-	 * and an internally built DependencyDescriptor for autowiring purposes.
-	 */
-	@SuppressWarnings("serial")
-	private static class ConstructorDependencyDescriptor extends DependencyDescriptor {
-
-		@Nullable
-		private volatile String shortcut;
-
-		public ConstructorDependencyDescriptor(MethodParameter methodParameter, boolean required) {
-			super(methodParameter, required);
-		}
-
-		public void setShortcut(@Nullable String shortcut) {
-			this.shortcut = shortcut;
-		}
-
-		public boolean hasShortcut() {
-			return (this.shortcut != null);
-		}
-
-		@Override
-		public Object resolveShortcut(BeanFactory beanFactory) {
-			String shortcut = this.shortcut;
-			return (shortcut != null ? beanFactory.getBean(shortcut, getDependencyType()) : null);
-		}
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -567,16 +567,16 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	 */
 	protected void destroyBean(String beanName, @Nullable DisposableBean bean) {
 		// Trigger destruction of dependent beans first...
-		Set<String> dependentBeanNames;
+		Set<String> dependencies;
 		synchronized (this.dependentBeanMap) {
 			// Within full synchronization in order to guarantee a disconnected Set
-			dependentBeanNames = this.dependentBeanMap.remove(beanName);
+			dependencies = this.dependentBeanMap.remove(beanName);
 		}
-		if (dependentBeanNames != null) {
+		if (dependencies != null) {
 			if (logger.isTraceEnabled()) {
-				logger.trace("Retrieved dependent beans for bean '" + beanName + "': " + dependentBeanNames);
+				logger.trace("Retrieved dependent beans for bean '" + beanName + "': " + dependencies);
 			}
-			for (String dependentBeanName : dependentBeanNames) {
+			for (String dependentBeanName : dependencies) {
 				destroySingleton(dependentBeanName);
 			}
 		}
@@ -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.
@@ -112,7 +112,7 @@ public class LookupOverride extends MethodOverride {

 	@Override
 	public int hashCode() {
-		return super.hashCode() * 29 + ObjectUtils.nullSafeHashCode(this.beanName);
+		return (29 * super.hashCode() + ObjectUtils.nullSafeHashCode(this.beanName));
 	}

 	@Override
@@ -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.
@@ -78,10 +78,8 @@ public class PathEditor extends PropertyEditorSupport {
 		if (nioPathCandidate && !text.startsWith("/")) {
 			try {
 				URI uri = new URI(text);
-				String scheme = uri.getScheme();
-				if (scheme != null) {
-					// No NIO candidate except for "C:" style drive letters
-					nioPathCandidate = (scheme.length() == 1);
+				if (uri.getScheme() != null) {
+					nioPathCandidate = false;
 					// Let's try NIO file system providers via Paths.get(URI)
 					setValue(Paths.get(uri).normalize());
 					return;
@@ -111,8 +109,7 @@ public class PathEditor extends PropertyEditorSupport {
 				setValue(resource.getFile().toPath());
 			}
 			catch (IOException ex) {
-				throw new IllegalArgumentException(
-						"Could not retrieve file for " + resource + ": " + ex.getMessage());
+				throw new IllegalArgumentException("Failed to retrieve file for " + resource, ex);
 			}
 		}
 	}
@@ -1271,11 +1271,10 @@ class DefaultListableBeanFactoryTests {
 		lbf.registerBeanDefinition("rod", bd);
 		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
 		lbf.registerBeanDefinition("rod2", bd2);
-
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
-				.isThrownBy(() -> lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false))
-				.withMessageContaining("rod")
-				.withMessageContaining("rod2");
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() ->
+				lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false))
+			.withMessageContaining("rod")
+			.withMessageContaining("rod2");
 	}

 	@Test
@@ -1337,12 +1336,11 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
 		bd2.setDependsOn("tb1");
 		lbf.registerBeanDefinition("tb2", bd2);
-
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> lbf.preInstantiateSingletons())
-				.withMessageContaining("Circular")
-				.withMessageContaining("'tb2'")
-				.withMessageContaining("'tb1'");
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
+				lbf.preInstantiateSingletons())
+			.withMessageContaining("Circular")
+			.withMessageContaining("'tb2'")
+			.withMessageContaining("'tb1'");
 	}

 	@Test
@@ -1356,12 +1354,11 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd3 = new RootBeanDefinition(TestBean.class);
 		bd3.setDependsOn("tb1");
 		lbf.registerBeanDefinition("tb3", bd3);
-
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(lbf::preInstantiateSingletons)
-				.withMessageContaining("Circular")
-				.withMessageContaining("'tb3'")
-				.withMessageContaining("'tb1'");
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(
+				lbf::preInstantiateSingletons)
+			.withMessageContaining("Circular")
+			.withMessageContaining("'tb3'")
+			.withMessageContaining("'tb1'");
 	}

 	@Test
@@ -1496,11 +1493,10 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd2 = new RootBeanDefinition(HighPriorityTestBean.class);
 		lbf.registerBeanDefinition("bd1", bd1);
 		lbf.registerBeanDefinition("bd2", bd2);
-
-		assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
-				.isThrownBy(() -> lbf.getBean(TestBean.class))
-				.withMessageContaining("Multiple beans found with the same priority")
-				.withMessageContaining("5"); // conflicting priority
+		assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(() ->
+				lbf.getBean(TestBean.class))
+			.withMessageContaining("Multiple beans found with the same priority")
+			.withMessageContaining("5"); // conflicting priority
 	}

 	@Test
@@ -1702,9 +1698,9 @@ class DefaultListableBeanFactoryTests {
 		lbf.registerBeanDefinition("bd1", bd1);
 		lbf.registerBeanDefinition("bd2", bd2);

-		assertThatExceptionOfType(NoUniqueBeanDefinitionException.class)
-				.isThrownBy(() -> lbf.getBean(ConstructorDependency.class, 42))
-				.withMessageContaining("more than one 'primary'");
+		assertThatExceptionOfType(NoUniqueBeanDefinitionException.class).isThrownBy(() ->
+				lbf.getBean(ConstructorDependency.class, 42))
+			.withMessageContaining("more than one 'primary'");
 	}

 	@Test
@@ -1885,11 +1881,10 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
 		lbf.registerBeanDefinition("test", bd);
 		lbf.registerBeanDefinition("spouse", bd2);
-
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
-				.isThrownBy(() -> lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
-				.withMessageContaining("test")
-				.withMessageContaining("spouse");
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() ->
+				lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
+			.withMessageContaining("test")
+			.withMessageContaining("spouse");
 	}

 	@Test
@@ -1951,11 +1946,10 @@ class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd2 = new RootBeanDefinition(HighPriorityTestBean.class);
 		lbf.registerBeanDefinition("test", bd);
 		lbf.registerBeanDefinition("spouse", bd2);
-
-		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
-				.isThrownBy(() -> lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
-				.withCauseExactlyInstanceOf(NoUniqueBeanDefinitionException.class)
-				.withMessageContaining("5");
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class).isThrownBy(() ->
+				lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true))
+			.withCauseExactlyInstanceOf(NoUniqueBeanDefinitionException.class)
+			.withMessageContaining("5");
 	}

 	@Test
@@ -2191,21 +2185,19 @@ class DefaultListableBeanFactoryTests {
 	@Test
 	void beanDefinitionWithInterface() {
 		lbf.registerBeanDefinition("test", new RootBeanDefinition(ITestBean.class));
-
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> lbf.getBean("test"))
-				.withMessageContaining("interface")
-				.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
+				lbf.getBean("test"))
+			.withMessageContaining("interface")
+			.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
 	}

 	@Test
 	void beanDefinitionWithAbstractClass() {
 		lbf.registerBeanDefinition("test", new RootBeanDefinition(AbstractBeanFactory.class));
-
-		assertThatExceptionOfType(BeanCreationException.class)
-				.isThrownBy(() -> lbf.getBean("test"))
-				.withMessageContaining("abstract")
-				.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
+		assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() ->
+				lbf.getBean("test"))
+			.withMessageContaining("abstract")
+			.satisfies(ex -> assertThat(ex.getBeanName()).isEqualTo("test"));
 	}

 	@Test
@@ -72,9 +72,6 @@ import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.testfixture.io.SerializationTestUtils;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -134,8 +131,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		bean = bf.getBean("annotatedBean", ResourceInjectionBean.class);
 		assertThat(bean.getTestBean()).isSameAs(tb);
 		assertThat(bean.getTestBean2()).isSameAs(tb);
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
 	}

 	@Test
@@ -157,12 +152,10 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getTestBean()).isNull();
 		assertThat(bean.getTestBean2()).isNull();
 		assertThat(bean.getTestBean3()).isNull();
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
 	}

 	@Test
-	void resourceInjectionWithSometimesNullBeanEarly() {
+	void resourceInjectionWithSometimesNullBean() {
 		RootBeanDefinition bd = new RootBeanDefinition(OptionalResourceInjectionBean.class);
 		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		bf.registerBeanDefinition("annotatedBean", bd);
@@ -177,55 +170,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getTestBean2()).isNull();
 		assertThat(bean.getTestBean3()).isNull();

-		SometimesNullFactoryMethods.active = false;
-		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNull();
-		assertThat(bean.getTestBean2()).isNull();
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNotNull();
-		assertThat(bean.getTestBean2()).isNotNull();
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNotNull();
-		assertThat(bean.getTestBean2()).isNotNull();
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNull();
-		assertThat(bean.getTestBean2()).isNull();
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNull();
-		assertThat(bean.getTestBean2()).isNull();
-		assertThat(bean.getTestBean3()).isNull();
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
-	}
-
-	@Test
-	void resourceInjectionWithSometimesNullBeanLate() {
-		RootBeanDefinition bd = new RootBeanDefinition(OptionalResourceInjectionBean.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("annotatedBean", bd);
-		RootBeanDefinition tb = new RootBeanDefinition(SometimesNullFactoryMethods.class);
-		tb.setFactoryMethodName("createTestBean");
-		tb.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("testBean", tb);
-
-		SometimesNullFactoryMethods.active = true;
-		OptionalResourceInjectionBean bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean()).isNotNull();
-		assertThat(bean.getTestBean2()).isNotNull();
-		assertThat(bean.getTestBean3()).isNotNull();
-
 		SometimesNullFactoryMethods.active = true;
 		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
 		assertThat(bean.getTestBean()).isNotNull();
@@ -250,13 +194,17 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getTestBean2()).isNotNull();
 		assertThat(bean.getTestBean3()).isNotNull();

+		SometimesNullFactoryMethods.active = true;
+		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
+		assertThat(bean.getTestBean()).isNotNull();
+		assertThat(bean.getTestBean2()).isNotNull();
+		assertThat(bean.getTestBean3()).isNotNull();
+
 		SometimesNullFactoryMethods.active = false;
 		bean = (OptionalResourceInjectionBean) bf.getBean("annotatedBean");
 		assertThat(bean.getTestBean()).isNull();
 		assertThat(bean.getTestBean2()).isNull();
 		assertThat(bean.getTestBean3()).isNull();
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
 	}

 	@Test
@@ -285,7 +233,10 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getNestedTestBean()).isSameAs(ntb);
 		assertThat(bean.getBeanFactory()).isSameAs(bf);

-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean", "nestedTestBean"});
+		String[] depBeans = bf.getDependenciesForBean("annotatedBean");
+		assertThat(depBeans.length).isEqualTo(2);
+		assertThat(depBeans[0]).isEqualTo("testBean");
+		assertThat(depBeans[1]).isEqualTo("nestedTestBean");
 	}

 	@Test
@@ -447,22 +398,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);

 		bf.destroySingleton("testBean");
-		bf.registerSingleton("testBeanX", tb);
-
-		bean = bf.getBean("annotatedBean", OptionalResourceInjectionBean.class);
-		assertThat(bean.getTestBean()).isSameAs(tb);
-		assertThat(bean.getTestBean2()).isSameAs(tb);
-		assertThat(bean.getTestBean3()).isSameAs(tb);
-		assertThat(bean.getTestBean4()).isSameAs(tb);
-		assertThat(bean.getIndexedTestBean()).isSameAs(itb);
-		assertThat(bean.getNestedTestBeans()).hasSize(2);
-		assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
-		assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
-		assertThat(bean.nestedTestBeansField).hasSize(2);
-		assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
-		assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
-
-		bf.destroySingleton("testBeanX");

 		bean = bf.getBean("annotatedBean", OptionalResourceInjectionBean.class);
 		assertThat(bean.getTestBean()).isNull();
@@ -520,22 +455,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);

 		bf.removeBeanDefinition("testBean");
-		bf.registerBeanDefinition("testBeanX", new RootBeanDefinition(TestBean.class));
-
-		bean = bf.getBean("annotatedBean", OptionalResourceInjectionBean.class);
-		assertThat(bean.getTestBean()).isSameAs(bf.getBean("testBeanX"));
-		assertThat(bean.getTestBean2()).isSameAs(bf.getBean("testBeanX"));
-		assertThat(bean.getTestBean3()).isSameAs(bf.getBean("testBeanX"));
-		assertThat(bean.getTestBean4()).isSameAs(bf.getBean("testBeanX"));
-		assertThat(bean.getIndexedTestBean()).isSameAs(itb);
-		assertThat(bean.getNestedTestBeans()).hasSize(2);
-		assertThat(bean.getNestedTestBeans()[0]).isSameAs(ntb1);
-		assertThat(bean.getNestedTestBeans()[1]).isSameAs(ntb2);
-		assertThat(bean.nestedTestBeansField).hasSize(2);
-		assertThat(bean.nestedTestBeansField[0]).isSameAs(ntb1);
-		assertThat(bean.nestedTestBeansField[1]).isSameAs(ntb2);
-
-		bf.removeBeanDefinition("testBeanX");

 		bean = bf.getBean("annotatedBean", OptionalResourceInjectionBean.class);
 		assertThat(bean.getTestBean()).isNull();
@@ -800,9 +719,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getTestBean4()).isSameAs(tb);
 		assertThat(bean.getNestedTestBean()).isSameAs(ntb);
 		assertThat(bean.getBeanFactory()).isSameAs(bf);
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(
-				new String[] {"testBean", "nestedTestBean", ObjectUtils.identityToString(bf)});
 	}

 	@Test
@@ -824,17 +740,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getBeanFactory()).isSameAs(bf);

 		bf.destroySingleton("nestedTestBean");
-		bf.registerSingleton("nestedTestBeanX", ntb);
-
-		bean = bf.getBean("annotatedBean", ConstructorResourceInjectionBean.class);
-		assertThat(bean.getTestBean()).isSameAs(tb);
-		assertThat(bean.getTestBean2()).isSameAs(tb);
-		assertThat(bean.getTestBean3()).isSameAs(tb);
-		assertThat(bean.getTestBean4()).isSameAs(tb);
-		assertThat(bean.getNestedTestBean()).isSameAs(ntb);
-		assertThat(bean.getBeanFactory()).isSameAs(bf);
-
-		bf.destroySingleton("nestedTestBeanX");

 		bean = bf.getBean("annotatedBean", ConstructorResourceInjectionBean.class);
 		assertThat(bean.getTestBean()).isSameAs(tb);
@@ -873,17 +778,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		assertThat(bean.getBeanFactory()).isSameAs(bf);

 		bf.removeBeanDefinition("nestedTestBean");
-		bf.registerBeanDefinition("nestedTestBeanX", new RootBeanDefinition(NestedTestBean.class));
-
-		bean = bf.getBean("annotatedBean", ConstructorResourceInjectionBean.class);
-		assertThat(bean.getTestBean()).isSameAs(tb);
-		assertThat(bean.getTestBean2()).isSameAs(tb);
-		assertThat(bean.getTestBean3()).isSameAs(tb);
-		assertThat(bean.getTestBean4()).isSameAs(tb);
-		assertThat(bean.getNestedTestBean()).isSameAs(bf.getBean("nestedTestBeanX"));
-		assertThat(bean.getBeanFactory()).isSameAs(bf);
-
-		bf.removeBeanDefinition("nestedTestBeanX");

 		bean = bf.getBean("annotatedBean", ConstructorResourceInjectionBean.class);
 		assertThat(bean.getTestBean()).isSameAs(tb);
@@ -987,80 +881,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 			.satisfies(methodParameterDeclaredOn(ConstructorWithoutFallbackBean.class));
 	}

-	@Test
-	void constructorResourceInjectionWithSometimesNullBeanEarly() {
-		RootBeanDefinition bd = new RootBeanDefinition(ConstructorWithNullableArgument.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("annotatedBean", bd);
-		RootBeanDefinition tb = new RootBeanDefinition(SometimesNullFactoryMethods.class);
-		tb.setFactoryMethodName("createTestBean");
-		tb.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("testBean", tb);
-
-		SometimesNullFactoryMethods.active = false;
-		ConstructorWithNullableArgument bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
-	}
-
-	@Test
-	void constructorResourceInjectionWithSometimesNullBeanLate() {
-		RootBeanDefinition bd = new RootBeanDefinition(ConstructorWithNullableArgument.class);
-		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("annotatedBean", bd);
-		RootBeanDefinition tb = new RootBeanDefinition(SometimesNullFactoryMethods.class);
-		tb.setFactoryMethodName("createTestBean");
-		tb.setScope(BeanDefinition.SCOPE_PROTOTYPE);
-		bf.registerBeanDefinition("testBean", tb);
-
-		SometimesNullFactoryMethods.active = true;
-		ConstructorWithNullableArgument bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		SometimesNullFactoryMethods.active = true;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNotNull();
-
-		SometimesNullFactoryMethods.active = false;
-		bean = (ConstructorWithNullableArgument) bf.getBean("annotatedBean");
-		assertThat(bean.getTestBean3()).isNull();
-
-		assertThat(bf.getDependenciesForBean("annotatedBean")).isEqualTo(new String[] {"testBean"});
-	}
-
 	@Test
 	public void testConstructorResourceInjectionWithCollectionAndNullFromFactoryBean() {
 		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(
@@ -2621,12 +2441,13 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		@Autowired(required = false)
 		private TestBean testBean;

-		TestBean testBean2;
+		private TestBean testBean2;

 		@Autowired
 		public void setTestBean2(TestBean testBean2) {
-			Assert.state(this.testBean != null, "Wrong initialization order");
-			Assert.state(this.testBean2 == null, "Already called");
+			if (this.testBean2 != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.testBean2 = testBean2;
 		}

@@ -2661,7 +2482,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		@Required
 		@SuppressWarnings("deprecation")
 		public void setTestBean2(TestBean testBean2) {
-			this.testBean2 = testBean2;
+			super.setTestBean2(testBean2);
 		}

 		@Autowired
@@ -2677,7 +2498,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {

 		@Autowired
 		protected void initBeanFactory(BeanFactory beanFactory) {
-			Assert.state(this.baseInjected, "Wrong initialization order");
 			this.beanFactory = beanFactory;
 		}

@@ -2984,21 +2804,6 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 	}


-	public static class ConstructorWithNullableArgument {
-
-		protected ITestBean testBean3;
-
-		@Autowired(required = false)
-		public ConstructorWithNullableArgument(@Nullable ITestBean testBean3) {
-			this.testBean3 = testBean3;
-		}
-
-		public ITestBean getTestBean3() {
-			return this.testBean3;
-		}
-	}
-
-
 	public static class ConstructorsCollectionResourceInjectionBean {

 		protected ITestBean testBean3;
@@ -4101,7 +3906,9 @@ public class AutowiredAnnotationBeanPostProcessorTests {
 		private RT obj;

 		protected void setObj(RT obj) {
-			Assert.state(this.obj == null, "Already called");
+			if (this.obj != null) {
+				throw new IllegalStateException("Already called");
+			}
 			this.obj = obj;
 		}
 	}
@@ -4,27 +4,25 @@
 <beans default-lazy-init="true">

 	<bean name="beta" class="org.springframework.beans.factory.FactoryBeanTests$Beta" autowire="byType">
-		<property name="name" value="${myName}"/>
+        <property name="name" value="${myName}"/>
 	</bean>

 	<bean id="alpha" class="org.springframework.beans.factory.FactoryBeanTests$Alpha" autowire="byType"/>

 	<bean id="gamma" class="org.springframework.beans.factory.FactoryBeanTests$Gamma"/>

-	<bean id="betaFactory" class="org.springframework.beans.factory.FactoryBeanTests$BetaFactoryBean" autowire="constructor">
-    	<property name="beta" ref="beta"/>
-	</bean>
+  <bean id="betaFactory" class="org.springframework.beans.factory.FactoryBeanTests$BetaFactoryBean" autowire="constructor">
+    <property name="beta" ref="beta"/>
+  </bean>

-	<bean id="gammaFactory" factory-bean="${gammaFactory}" factory-method="${gamma}"/>
+  <bean id="gammaFactory" factory-bean="betaFactory" factory-method="getGamma"/>

-	<bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="properties">
-			<props>
-				<prop key="myName">yourName</prop>
-				<prop key="gammaFactory">betaFactory</prop>
-				<prop key="gamma">getGamma</prop>
-			</props>
-		</property>
-	</bean>
+  <bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="properties">
+      <props>
+        <prop key="myName">yourName</prop>
+      </props>
+    </property>
+  </bean>

 </beans>
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -33,10 +33,6 @@ public interface ITestBean extends AgeHolder {

 	void setName(String name);

-	default void applyName(Object name) {
-		setName(String.valueOf(name));
-	}
-
 	ITestBean getSpouse();

 	void setSpouse(ITestBean spouse);
@@ -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.
@@ -477,7 +477,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt

 	@Override
 	public int hashCode() {
-		return TestBean.class.hashCode();
+		return this.age;
 	}

 	@Override
@@ -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.
@@ -59,8 +59,8 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
 	 * given internal {@link com.github.benmanes.caffeine.cache.Cache} to use.
 	 * @param name the name of the cache
 	 * @param cache the backing Caffeine Cache instance
-	 * @param allowNullValues whether to accept and convert {@code null} values
-	 * for this cache
+	 * @param allowNullValues whether to accept and convert {@code null}
+	 * values for this cache
 	 */
 	public CaffeineCache(String name, com.github.benmanes.caffeine.cache.Cache<Object, Object> cache,
 			boolean allowNullValues) {
@@ -86,7 +86,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
 	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
-	public <T> T get(Object key, Callable<T> valueLoader) {
+	public <T> T get(Object key, final Callable<T> valueLoader) {
 		return (T) fromStoreValue(this.cache.get(key, new LoadFunction(valueLoader)));
 	}

@@ -106,7 +106,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache {

 	@Override
 	@Nullable
-	public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
+	public ValueWrapper putIfAbsent(Object key, @Nullable final Object value) {
 		PutIfAbsentFunction callable = new PutIfAbsentFunction(value);
 		Object result = this.cache.get(key, callable);
 		return (callable.called ? null : toValueWrapper(result));
@@ -140,7 +140,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
 		@Nullable
 		private final Object value;

-		boolean called;
+		private boolean called;

 		public PutIfAbsentFunction(@Nullable Object value) {
 			this.value = value;
@@ -159,17 +159,16 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
 		private final Callable<?> valueLoader;

 		public LoadFunction(Callable<?> valueLoader) {
-			Assert.notNull(valueLoader, "Callable must not be null");
 			this.valueLoader = valueLoader;
 		}

 		@Override
-		public Object apply(Object key) {
+		public Object apply(Object o) {
 			try {
 				return toStoreValue(this.valueLoader.call());
 			}
 			catch (Exception ex) {
-				throw new ValueRetrievalException(key, this.valueLoader, ex);
+				throw new ValueRetrievalException(o, this.valueLoader, ex);
 			}
 		}
 	}
@@ -110,7 +110,7 @@ public class CaffeineCacheManager implements CacheManager {
 	 * Set the Caffeine to use for building each individual
 	 * {@link CaffeineCache} instance.
 	 * @see #createNativeCaffeineCache
-	 * @see Caffeine#build()
+	 * @see com.github.benmanes.caffeine.cache.Caffeine#build()
 	 */
 	public void setCaffeine(Caffeine<Object, Object> caffeine) {
 		Assert.notNull(caffeine, "Caffeine must not be null");
@@ -121,7 +121,7 @@ public class CaffeineCacheManager implements CacheManager {
 	 * Set the {@link CaffeineSpec} to use for building each individual
 	 * {@link CaffeineCache} instance.
 	 * @see #createNativeCaffeineCache
-	 * @see Caffeine#from(CaffeineSpec)
+	 * @see com.github.benmanes.caffeine.cache.Caffeine#from(CaffeineSpec)
 	 */
 	public void setCaffeineSpec(CaffeineSpec caffeineSpec) {
 		doSetCaffeine(Caffeine.from(caffeineSpec));
@@ -132,7 +132,7 @@ public class CaffeineCacheManager implements CacheManager {
 	 * individual {@link CaffeineCache} instance. The given value needs to
 	 * comply with Caffeine's {@link CaffeineSpec} (see its javadoc).
 	 * @see #createNativeCaffeineCache
-	 * @see Caffeine#from(String)
+	 * @see com.github.benmanes.caffeine.cache.Caffeine#from(String)
 	 */
 	public void setCacheSpecification(String cacheSpecification) {
 		doSetCaffeine(Caffeine.from(cacheSpecification));
@@ -149,7 +149,7 @@ public class CaffeineCacheManager implements CacheManager {
 	 * Set the Caffeine CacheLoader to use for building each individual
 	 * {@link CaffeineCache} instance, turning it into a LoadingCache.
 	 * @see #createNativeCaffeineCache
-	 * @see Caffeine#build(CacheLoader)
+	 * @see com.github.benmanes.caffeine.cache.Caffeine#build(CacheLoader)
 	 * @see com.github.benmanes.caffeine.cache.LoadingCache
 	 */
 	public void setCacheLoader(CacheLoader<Object, Object> cacheLoader) {
@@ -236,7 +236,7 @@ public class CaffeineCacheManager implements CacheManager {
 	 * Build a common {@link CaffeineCache} instance for the specified cache name,
 	 * using the common Caffeine configuration specified on this cache manager.
 	 * <p>Delegates to {@link #adaptCaffeineCache} as the adaptation method to
-	 * Spring's cache abstraction (allowing for centralized decoration etc.),
+	 * Spring's cache abstraction (allowing for centralized decoration etc),
 	 * passing in a freshly built native Caffeine Cache instance.
 	 * @param name the name of the cache
 	 * @return the Spring CaffeineCache adapter (or a decorator thereof)
@@ -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.
@@ -38,17 +38,19 @@ public class CaffeineCacheManagerTests {
 	@Test
 	public void testDynamicMode() {
 		CacheManager cm = new CaffeineCacheManager();
-
 		Cache cache1 = cm.getCache("c1");
-		assertThat(cache1).isInstanceOf(CaffeineCache.class);
+		boolean condition2 = cache1 instanceof CaffeineCache;
+		assertThat(condition2).isTrue();
 		Cache cache1again = cm.getCache("c1");
 		assertThat(cache1).isSameAs(cache1again);
 		Cache cache2 = cm.getCache("c2");
-		assertThat(cache2).isInstanceOf(CaffeineCache.class);
+		boolean condition1 = cache2 instanceof CaffeineCache;
+		assertThat(condition1).isTrue();
 		Cache cache2again = cm.getCache("c2");
 		assertThat(cache2).isSameAs(cache2again);
 		Cache cache3 = cm.getCache("c3");
-		assertThat(cache3).isInstanceOf(CaffeineCache.class);
+		boolean condition = cache3 instanceof CaffeineCache;
+		assertThat(condition).isTrue();
 		Cache cache3again = cm.getCache("c3");
 		assertThat(cache3).isSameAs(cache3again);

@@ -60,23 +62,19 @@ public class CaffeineCacheManagerTests {
 		assertThat(cache1.get("key3").get()).isNull();
 		cache1.evict("key3");
 		assertThat(cache1.get("key3")).isNull();
-		assertThat(cache1.get("key3", () -> "value3")).isEqualTo("value3");
-		assertThat(cache1.get("key3", () -> "value3")).isEqualTo("value3");
-		cache1.evict("key3");
-		assertThat(cache1.get("key3", () -> (String) null)).isNull();
-		assertThat(cache1.get("key3", () -> (String) null)).isNull();
 	}

 	@Test
 	public void testStaticMode() {
 		CaffeineCacheManager cm = new CaffeineCacheManager("c1", "c2");
-
 		Cache cache1 = cm.getCache("c1");
-		assertThat(cache1).isInstanceOf(CaffeineCache.class);
+		boolean condition3 = cache1 instanceof CaffeineCache;
+		assertThat(condition3).isTrue();
 		Cache cache1again = cm.getCache("c1");
 		assertThat(cache1).isSameAs(cache1again);
 		Cache cache2 = cm.getCache("c2");
-		assertThat(cache2).isInstanceOf(CaffeineCache.class);
+		boolean condition2 = cache2 instanceof CaffeineCache;
+		assertThat(condition2).isTrue();
 		Cache cache2again = cm.getCache("c2");
 		assertThat(cache2).isSameAs(cache2again);
 		Cache cache3 = cm.getCache("c3");
@@ -93,11 +91,13 @@ public class CaffeineCacheManagerTests {

 		cm.setAllowNullValues(false);
 		Cache cache1x = cm.getCache("c1");
-		assertThat(cache1x).isInstanceOf(CaffeineCache.class);
-		assertThat(cache1x).isNotSameAs(cache1);
+		boolean condition1 = cache1x instanceof CaffeineCache;
+		assertThat(condition1).isTrue();
+		assertThat(cache1x != cache1).isTrue();
 		Cache cache2x = cm.getCache("c2");
-		assertThat(cache2x).isInstanceOf(CaffeineCache.class);
-		assertThat(cache2x).isNotSameAs(cache2);
+		boolean condition = cache2x instanceof CaffeineCache;
+		assertThat(condition).isTrue();
+		assertThat(cache2x != cache2).isTrue();
 		Cache cache3x = cm.getCache("c3");
 		assertThat(cache3x).isNull();

@@ -190,7 +190,7 @@ public class CaffeineCacheManagerTests {
 		assertThat(value.get()).isEqualTo("pong");

 		assertThatIllegalArgumentException().isThrownBy(() -> assertThat(cache1.get("foo")).isNull())
-				.withMessageContaining("I only know ping");
+			.withMessageContaining("I only know ping");
 	}

 	@Test
@@ -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.
@@ -114,7 +114,7 @@ class QuartzSupportTests {
 		trigger.setName("myTrigger");
 		trigger.setJobDetail(jobDetail);
 		trigger.setStartDelay(1);
-		trigger.setRepeatInterval(100);
+		trigger.setRepeatInterval(500);
 		trigger.setRepeatCount(1);
 		trigger.afterPropertiesSet();

@@ -126,14 +126,14 @@ class QuartzSupportTests {
 		bean.start();

 		Thread.sleep(500);
-		assertThat(DummyJob.count).as("DummyJob should have been executed at least once.").isGreaterThan(0);
+		assertThat(DummyJob.count > 0).as("DummyJob should have been executed at least once.").isTrue();
 		assertThat(taskExecutor.count).isEqualTo(DummyJob.count);

 		bean.destroy();
 	}

 	@Test
-	@SuppressWarnings({"unchecked", "rawtypes"})
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	void jobDetailWithRunnableInsteadOfJob() {
 		JobDetailImpl jobDetail = new JobDetailImpl();
 		assertThatIllegalArgumentException().isThrownBy(() ->
@@ -156,7 +156,7 @@ class QuartzSupportTests {
 		trigger.setName("myTrigger");
 		trigger.setJobDetail(jobDetail);
 		trigger.setStartDelay(1);
-		trigger.setRepeatInterval(100);
+		trigger.setRepeatInterval(500);
 		trigger.setRepeatCount(1);
 		trigger.afterPropertiesSet();

@@ -168,7 +168,7 @@ class QuartzSupportTests {

 		Thread.sleep(500);
 		assertThat(DummyJobBean.param).isEqualTo(10);
-		assertThat(DummyJobBean.count).isGreaterThan(0);
+		assertThat(DummyJobBean.count > 0).isTrue();

 		bean.destroy();
 	}
@@ -190,7 +190,7 @@ class QuartzSupportTests {
 		trigger.setName("myTrigger");
 		trigger.setJobDetail(jobDetail);
 		trigger.setStartDelay(1);
-		trigger.setRepeatInterval(100);
+		trigger.setRepeatInterval(500);
 		trigger.setRepeatCount(1);
 		trigger.afterPropertiesSet();

@@ -203,7 +203,7 @@ class QuartzSupportTests {

 		Thread.sleep(500);
 		assertThat(DummyJob.param).isEqualTo(10);
-		assertThat(DummyJob.count).as("DummyJob should have been executed at least once.").isGreaterThan(0);
+		assertThat(DummyJob.count > 0).as("DummyJob should have been executed at least once.").isTrue();

 		bean.destroy();
 	}
@@ -225,7 +225,7 @@ class QuartzSupportTests {
 		trigger.setName("myTrigger");
 		trigger.setJobDetail(jobDetail);
 		trigger.setStartDelay(1);
-		trigger.setRepeatInterval(100);
+		trigger.setRepeatInterval(500);
 		trigger.setRepeatCount(1);
 		trigger.afterPropertiesSet();

@@ -239,7 +239,7 @@ class QuartzSupportTests {

 		Thread.sleep(500);
 		assertThat(DummyJob.param).isEqualTo(0);
-		assertThat(DummyJob.count).isEqualTo(0);
+		assertThat(DummyJob.count == 0).isTrue();

 		bean.destroy();
 	}
@@ -260,7 +260,7 @@ class QuartzSupportTests {
 		trigger.setName("myTrigger");
 		trigger.setJobDetail(jobDetail);
 		trigger.setStartDelay(1);
-		trigger.setRepeatInterval(100);
+		trigger.setRepeatInterval(500);
 		trigger.setRepeatCount(1);
 		trigger.afterPropertiesSet();

@@ -273,7 +273,7 @@ class QuartzSupportTests {

 		Thread.sleep(500);
 		assertThat(DummyJobBean.param).isEqualTo(10);
-		assertThat(DummyJobBean.count).isGreaterThan(0);
+		assertThat(DummyJobBean.count > 0).isTrue();

 		bean.destroy();
 	}
@@ -292,7 +292,7 @@ class QuartzSupportTests {

 		Thread.sleep(500);
 		assertThat(DummyJob.param).isEqualTo(10);
-		assertThat(DummyJob.count).as("DummyJob should have been executed at least once.").isGreaterThan(0);
+		assertThat(DummyJob.count > 0).as("DummyJob should have been executed at least once.").isTrue();

 		bean.destroy();
 	}
@@ -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.
@@ -23,20 +23,14 @@ import org.springframework.lang.Nullable;
 /**
 * Interface that defines common cache operations.
 *
- * <p>Serves as an SPI for Spring's annotation-based caching model
- * ({@link org.springframework.cache.annotation.Cacheable} and co)
- * as well as an API for direct usage in applications.
- *
- * <p><b>Note:</b> Due to the generic use of caching, it is recommended
- * that implementations allow storage of {@code null} values
- * (for example to cache methods that return {@code null}).
+ * <b>Note:</b> Due to the generic use of caching, it is recommended that
+ * implementations allow storage of {@code null} values (for example to
+ * cache methods that return {@code null}).
 *
 * @author Costin Leau
 * @author Juergen Hoeller
 * @author Stephane Nicoll
 * @since 3.1
- * @see CacheManager
- * @see org.springframework.cache.annotation.Cacheable
 */
 public interface Cache {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import java.lang.annotation.Target;
 * @author Stephane Nicoll
 * @author Sam Brannen
 * @since 4.1
- * @see Cacheable
 */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@@ -43,10 +42,8 @@ public @interface CacheConfig {
 	 * Names of the default caches to consider for caching operations defined
 	 * in the annotated class.
 	 * <p>If none is set at the operation level, these are used instead of the default.
-	 * <p>Names may be used to determine the target cache(s), to be resolved via the
-	 * configured {@link #cacheResolver()} which typically delegates to
-	 * {@link org.springframework.cache.CacheManager#getCache}.
-	 * For further details see {@link Cacheable#cacheNames()}.
+	 * <p>May be used to determine the target cache (or caches), matching the
+	 * qualifier value or the bean names of a specific bean definition.
 	 */
 	String[] cacheNames() default {};

@@ -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.
@@ -68,12 +68,8 @@ public @interface Cacheable {

 	/**
 	 * Names of the caches in which method invocation results are stored.
-	 * <p>Names may be used to determine the target cache(s), to be resolved via the
-	 * configured {@link #cacheResolver()} which typically delegates to
-	 * {@link org.springframework.cache.CacheManager#getCache}.
-	 * <p>This will usually be a single cache name. If multiple names are specified,
-	 * they will be consulted for a cache hit in the order of definition, and they
-	 * will all receive a put/evict request for the same newly cached value.
+	 * <p>Names may be used to determine the target cache (or caches), matching
+	 * the qualifier value or bean name of a specific bean definition.
 	 * @since 4.2
 	 * @see #value
 	 * @see CacheConfig#cacheNames
@@ -179,9 +175,9 @@ public @interface Cacheable {
 	 * <li>Only one cache may be specified</li>
 	 * <li>No other cache-related operation can be combined</li>
 	 * </ol>
-	 * This is effectively a hint and the chosen cache provider might not actually
-	 * support it in a synchronized fashion. Check your provider documentation for
-	 * more details on the actual semantics.
+	 * This is effectively a hint and the actual cache provider that you are
+	 * using may not support it in a synchronized fashion. Check your provider
+	 * documentation for more details on the actual semantics.
 	 * @since 4.3
 	 * @see org.springframework.cache.Cache#get(Object, Callable)
 	 */
@@ -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.
@@ -82,12 +82,12 @@ public abstract class AbstractCacheInvoker {
 	 * Execute {@link Cache#put(Object, Object)} on the specified {@link Cache}
 	 * and invoke the error handler if an exception occurs.
 	 */
-	protected void doPut(Cache cache, Object key, @Nullable Object value) {
+	protected void doPut(Cache cache, Object key, @Nullable Object result) {
 		try {
-			cache.put(key, value);
+			cache.put(key, result);
 		}
 		catch (RuntimeException ex) {
-			getErrorHandler().handleCachePutError(ex, cache, key, value);
+			getErrorHandler().handleCachePutError(ex, cache, key, result);
 		}
 	}

@@ -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.
@@ -214,7 +214,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 	@Override
 	public void afterSingletonsInstantiated() {
 		if (getCacheResolver() == null) {
-			// Lazily initialize cache resolver via default cache manager
+			// Lazily initialize cache resolver via default cache manager...
 			Assert.state(this.beanFactory != null, "CacheResolver or BeanFactory must be set on cache aspect");
 			try {
 				setCacheManager(this.beanFactory.getBean(CacheManager.class));
@@ -307,22 +307,22 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 	}

 	/**
-	 * Retrieve a bean with the specified name and type.
-	 * Used to resolve services that are referenced by name in a {@link CacheOperation}.
-	 * @param name the name of the bean, as defined by the cache operation
-	 * @param serviceType the type expected by the operation's service reference
-	 * @return the bean matching the expected type, qualified by the given name
+	 * Return a bean with the specified name and type. Used to resolve services that
+	 * are referenced by name in a {@link CacheOperation}.
+	 * @param beanName the name of the bean, as defined by the operation
+	 * @param expectedType type for the bean
+	 * @return the bean matching that name
 	 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException if such bean does not exist
 	 * @see CacheOperation#getKeyGenerator()
 	 * @see CacheOperation#getCacheManager()
 	 * @see CacheOperation#getCacheResolver()
 	 */
-	protected <T> T getBean(String name, Class<T> serviceType) {
+	protected <T> T getBean(String beanName, Class<T> expectedType) {
 		if (this.beanFactory == null) {
 			throw new IllegalStateException(
-					"BeanFactory must be set on cache aspect for " + serviceType.getSimpleName() + " retrieval");
+					"BeanFactory must be set on cache aspect for " + expectedType.getSimpleName() + " retrieval");
 		}
-		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(this.beanFactory, serviceType, name);
+		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(this.beanFactory, expectedType, beanName);
 	}

 	/**
@@ -388,20 +388,21 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 				}
 			}
 			else {
-				// No caching required, just call the underlying method
+				// No caching required, only call the underlying method
 				return invokeOperation(invoker);
 			}
 		}

+
 		// Process any early evictions
 		processCacheEvicts(contexts.get(CacheEvictOperation.class), true,
 				CacheOperationExpressionEvaluator.NO_RESULT);

-		// Check if we have a cached value matching the conditions
+		// Check if we have a cached item matching the conditions
 		Cache.ValueWrapper cacheHit = findCachedItem(contexts.get(CacheableOperation.class));

-		// Collect puts from any @Cacheable miss, if no cached value is found
-		List<CachePutRequest> cachePutRequests = new ArrayList<>(1);
+		// Collect puts from any @Cacheable miss, if no cached item is found
+		List<CachePutRequest> cachePutRequests = new ArrayList<>();
 		if (cacheHit == null) {
 			collectPutRequests(contexts.get(CacheableOperation.class),
 					CacheOperationExpressionEvaluator.NO_RESULT, cachePutRequests);
@@ -468,7 +469,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 	private boolean hasCachePut(CacheOperationContexts contexts) {
 		// Evaluate the conditions *without* the result object because we don't have it yet...
 		Collection<CacheOperationContext> cachePutContexts = contexts.get(CachePutOperation.class);
-		Collection<CacheOperationContext> excluded = new ArrayList<>(1);
+		Collection<CacheOperationContext> excluded = new ArrayList<>();
 		for (CacheOperationContext context : cachePutContexts) {
 			try {
 				if (!context.isConditionPassing(CacheOperationExpressionEvaluator.RESULT_UNAVAILABLE)) {
@@ -521,9 +522,9 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 	}

 	/**
-	 * Find a cached value only for {@link CacheableOperation} that passes the condition.
+	 * Find a cached item only for {@link CacheableOperation} that passes the condition.
 	 * @param contexts the cacheable operations
-	 * @return a {@link Cache.ValueWrapper} holding the cached value,
+	 * @return a {@link Cache.ValueWrapper} holding the cached item,
 	 * or {@code null} if none is found
 	 */
 	@Nullable
@@ -547,10 +548,10 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 	}

 	/**
-	 * Collect a {@link CachePutRequest} for every {@link CacheOperation}
-	 * using the specified result value.
+	 * Collect the {@link CachePutRequest} for all {@link CacheOperation} using
+	 * the specified result item.
 	 * @param contexts the contexts to handle
-	 * @param result the result value
+	 * @param result the result item (never {@code null})
 	 * @param putRequests the collection to update
 	 */
 	private void collectPutRequests(Collection<CacheOperationContext> contexts,
@@ -640,22 +641,21 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 			if (syncEnabled) {
 				if (this.contexts.size() > 1) {
 					throw new IllegalStateException(
-							"A sync=true operation cannot be combined with other cache operations on '" + method + "'");
+							"@Cacheable(sync=true) cannot be combined with other cache operations on '" + method + "'");
 				}
 				if (cacheOperationContexts.size() > 1) {
 					throw new IllegalStateException(
-							"Only one sync=true operation is allowed on '" + method + "'");
+							"Only one @Cacheable(sync=true) entry is allowed on '" + method + "'");
 				}
 				CacheOperationContext cacheOperationContext = cacheOperationContexts.iterator().next();
-				CacheOperation operation = cacheOperationContext.getOperation();
+				CacheableOperation operation = (CacheableOperation) cacheOperationContext.getOperation();
 				if (cacheOperationContext.getCaches().size() > 1) {
 					throw new IllegalStateException(
-							"A sync=true operation is restricted to a single cache on '" + operation + "'");
+							"@Cacheable(sync=true) only allows a single cache on '" + operation + "'");
 				}
-				if (operation instanceof CacheableOperation &&
-						StringUtils.hasText(((CacheableOperation) operation).getUnless())) {
+				if (StringUtils.hasText(operation.getUnless())) {
 					throw new IllegalStateException(
-							"A sync=true operation does not support the unless attribute on '" + operation + "'");
+							"@Cacheable(sync=true) does not support unless attribute on '" + operation + "'");
 				}
 				return true;
 			}
@@ -722,7 +722,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 			this.args = extractArgs(metadata.method, args);
 			this.target = target;
 			this.caches = CacheAspectSupport.this.getCaches(this, metadata.cacheResolver);
-			this.cacheNames = prepareCacheNames(this.caches);
+			this.cacheNames = createCacheNames(this.caches);
 		}

 		@Override
@@ -810,8 +810,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 			return this.cacheNames;
 		}

-		private Collection<String> prepareCacheNames(Collection<? extends Cache> caches) {
-			Collection<String> names = new ArrayList<>(caches.size());
+		private Collection<String> createCacheNames(Collection<? extends Cache> caches) {
+			Collection<String> names = new ArrayList<>();
 			for (Cache cache : caches) {
 				names.add(cache.getName());
 			}
@@ -885,13 +885,13 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 		}
 	}

-
 	/**
 	 * Internal holder class for recording that a cache method was invoked.
 	 */
 	private static class InvocationAwareResult {

 		boolean invoked;
+
 	}

 }
@@ -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.
@@ -22,7 +22,7 @@ import org.springframework.lang.Nullable;
 * Abstract the invocation of a cache operation.
 *
 * <p>Does not provide a way to transmit checked exceptions but
- * provides a special exception that should be used to wrap any
+ * provide a special exception that should be used to wrap any
 * exception that was thrown by the underlying invocation.
 * Callers are expected to handle this issue type specifically.
 *
@@ -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.
@@ -24,16 +24,14 @@ import org.springframework.cache.Cache;
 /**
 * Simple cache manager working against a given collection of caches.
 * Useful for testing or simple caching declarations.
- *
- * <p>When using this implementation directly, i.e. not via a regular
+ * <p>
+ * When using this implementation directly, i.e. not via a regular
 * bean registration, {@link #initializeCaches()} should be invoked
 * to initialize its internal state once the
 * {@linkplain #setCaches(Collection) caches have been provided}.
 *
 * @author Costin Leau
 * @since 3.1
- * @see NoOpCache
- * @see org.springframework.cache.concurrent.ConcurrentMapCache
 */
 public class SimpleCacheManager extends AbstractCacheManager {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -121,7 +121,7 @@ public interface SmartLifecycle extends Lifecycle, Phased {
 	/**
 	 * Return the phase that this lifecycle object is supposed to run in.
 	 * <p>The default implementation returns {@link #DEFAULT_PHASE} in order to
-	 * let {@code stop()} callbacks execute before regular {@code Lifecycle}
+	 * let {@code stop()} callbacks execute after regular {@code Lifecycle}
 	 * implementations.
 	 * @see #isAutoStartup()
 	 * @see #start()
@@ -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.
@@ -65,7 +65,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex
 	 * through {@link #register} calls and then manually {@linkplain #refresh refreshed}.
 	 */
 	public AnnotationConfigApplicationContext() {
-		StartupStep createAnnotatedBeanDefReader = getApplicationStartup().start("spring.context.annotated-bean-reader.create");
+		StartupStep createAnnotatedBeanDefReader = this.getApplicationStartup().start("spring.context.annotated-bean-reader.create");
 		this.reader = new AnnotatedBeanDefinitionReader(this);
 		createAnnotatedBeanDefReader.end();
 		this.scanner = new ClassPathBeanDefinitionScanner(this);
@@ -163,7 +163,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex
 	@Override
 	public void register(Class<?>... componentClasses) {
 		Assert.notEmpty(componentClasses, "At least one component class must be specified");
-		StartupStep registerComponentClass = getApplicationStartup().start("spring.context.component-classes.register")
+		StartupStep registerComponentClass = this.getApplicationStartup().start("spring.context.component-classes.register")
 				.tag("classes", () -> Arrays.toString(componentClasses));
 		this.reader.register(componentClasses);
 		registerComponentClass.end();
@@ -180,7 +180,7 @@ public class AnnotationConfigApplicationContext extends GenericApplicationContex
 	@Override
 	public void scan(String... basePackages) {
 		Assert.notEmpty(basePackages, "At least one base package must be specified");
-		StartupStep scanPackages = getApplicationStartup().start("spring.context.base-packages.scan")
+		StartupStep scanPackages = this.getApplicationStartup().start("spring.context.base-packages.scan")
 				.tag("packages", () -> Arrays.toString(basePackages));
 		this.scanner.scan(basePackages);
 		scanPackages.end();
@@ -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.
@@ -39,7 +39,6 @@ final class BeanMethod extends ConfigurationMethod {
 		super(metadata, configurationClass);
 	}

-
 	@Override
 	public void validate(ProblemReporter problemReporter) {
 		if (getMetadata().isStatic()) {
@@ -56,9 +55,9 @@ final class BeanMethod extends ConfigurationMethod {
 	}

 	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof BeanMethod &&
-				this.metadata.equals(((BeanMethod) other).metadata)));
+	public boolean equals(@Nullable Object obj) {
+		return ((this == obj) || ((obj instanceof BeanMethod) &&
+				this.metadata.equals(((BeanMethod) obj).metadata)));
 	}

 	@Override
@@ -71,7 +70,6 @@ final class BeanMethod extends ConfigurationMethod {
 		return "BeanMethod: " + this.metadata;
 	}

-
 	private class NonOverridableMethodError extends Problem {

 		NonOverridableMethodError() {
@@ -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.
@@ -329,8 +329,8 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo
 	 * @return {@code true} if the bean can be registered as-is;
 	 * {@code false} if it should be skipped because there is an
 	 * existing, compatible bean definition for the specified name
-	 * @throws IllegalStateException if an existing, incompatible bean definition
-	 * has been found for the specified name
+	 * @throws ConflictingBeanDefinitionException if an existing, incompatible
+	 * bean definition has been found for the specified name
 	 */
 	protected boolean checkCandidate(String beanName, BeanDefinition beanDefinition) throws IllegalStateException {
 		if (!this.registry.containsBeanDefinition(beanName)) {
@@ -354,16 +354,16 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo
 	 * the given existing bean definition.
 	 * <p>The default implementation considers them as compatible when the existing
 	 * bean definition comes from the same source or from a non-scanning source.
-	 * @param newDef the new bean definition, originated from scanning
-	 * @param existingDef the existing bean definition, potentially an
+	 * @param newDefinition the new bean definition, originated from scanning
+	 * @param existingDefinition the existing bean definition, potentially an
 	 * explicitly defined one or a previously generated one from scanning
 	 * @return whether the definitions are considered as compatible, with the
 	 * new definition to be skipped in favor of the existing definition
 	 */
-	protected boolean isCompatible(BeanDefinition newDef, BeanDefinition existingDef) {
-		return (!(existingDef instanceof ScannedGenericBeanDefinition) ||  // explicitly registered overriding bean
-				(newDef.getSource() != null && newDef.getSource().equals(existingDef.getSource())) ||  // scanned same file twice
-				newDef.equals(existingDef));  // scanned equivalent class twice
+	protected boolean isCompatible(BeanDefinition newDefinition, BeanDefinition existingDefinition) {
+		return (!(existingDefinition instanceof ScannedGenericBeanDefinition) ||  // explicitly registered overriding bean
+				(newDefinition.getSource() != null && newDefinition.getSource().equals(existingDefinition.getSource())) ||  // scanned same file twice
+				newDefinition.equals(existingDefinition));  // scanned equivalent class twice
 	}


@@ -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.
@@ -62,13 +62,11 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

 /**
- * A component provider that scans for candidate components starting from a
- * specified base package. Can use the {@linkplain CandidateComponentsIndex component
- * index}, if it is available, and scans the classpath otherwise.
- *
- * <p>Candidate components are identified by applying exclude and include filters.
- * {@link AnnotationTypeFilter} and {@link AssignableTypeFilter} include filters
- * for an annotation/target-type that is annotated with {@link Indexed} are
+ * A component provider that provides candidate components from a base package. Can
+ * use {@link CandidateComponentsIndex the index} if it is available of scans the
+ * classpath otherwise. Candidate components are identified by applying exclude and
+ * include filters. {@link AnnotationTypeFilter}, {@link AssignableTypeFilter} include
+ * filters on an annotation/superclass that are annotated with {@link Indexed} are
 * supported: if any other include filter is specified, the index is ignored and
 * classpath scanning is used instead.
 *
@@ -306,7 +304,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC


 	/**
-	 * Scan the component index or class path for candidate components.
+	 * Scan the class path for candidate components.
 	 * @param basePackage the package to check for annotated classes
 	 * @return a corresponding Set of autodetected bean definitions
 	 */
@@ -320,7 +318,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 	}

 	/**
-	 * Determine if the component index can be used by this instance.
+	 * Determine if the index can be used by this instance.
 	 * @return {@code true} if the index is available and the configuration of this
 	 * instance is supported by it, {@code false} otherwise
 	 * @since 5.0
@@ -456,7 +454,8 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 					}
 				}
 				catch (Throwable ex) {
-					throw new BeanDefinitionStoreException("Failed to read candidate component class: " + resource, ex);
+					throw new BeanDefinitionStoreException(
+							"Failed to read candidate component class: " + resource, ex);
 				}
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -402,8 +402,8 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 				if (!BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
 					return;
 				}
-				if (webServiceRefClass != null && bridgedMethod.isAnnotationPresent(webServiceRefClass)) {
-					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+				if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+					if (webServiceRefClass != null && bridgedMethod.isAnnotationPresent(webServiceRefClass)) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@WebServiceRef annotation is not supported on static methods");
 						}
@@ -413,9 +413,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 						PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
 						currElements.add(new WebServiceRefElement(method, bridgedMethod, pd));
 					}
-				}
-				else if (ejbClass != null && bridgedMethod.isAnnotationPresent(ejbClass)) {
-					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+					else if (ejbClass != null && bridgedMethod.isAnnotationPresent(ejbClass)) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@EJB annotation is not supported on static methods");
 						}
@@ -425,9 +423,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 						PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
 						currElements.add(new EjbRefElement(method, bridgedMethod, pd));
 					}
-				}
-				else if (bridgedMethod.isAnnotationPresent(Resource.class)) {
-					if (method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+					else if (bridgedMethod.isAnnotationPresent(Resource.class)) {
 						if (Modifier.isStatic(method.getModifiers())) {
 							throw new IllegalStateException("@Resource annotation is not supported on static methods");
 						}
@@ -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.
@@ -104,8 +104,8 @@ import org.springframework.stereotype.Component;
 *
 * }</pre>
 *
- * <p>{@code @Configuration} classes may not only be bootstrapped using component
- * scanning, but may also themselves <em>configure</em> component scanning using
+ * <p>{@code @Configuration} classes may not only be bootstrapped using
+ * component scanning, but may also themselves <em>configure</em> component scanning using
 * the {@link ComponentScan @ComponentScan} annotation:
 *
 * <pre class="code">
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -72,6 +72,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param metadataReader reader used to parse the underlying {@link Class}
 	 * @param beanName must not be {@code null}
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(MetadataReader metadataReader, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -85,10 +86,10 @@ final class ConfigurationClass {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if importedBy is not {@code null}).
 	 * @param metadataReader reader used to parse the underlying {@link Class}
-	 * @param importedBy the configuration class importing this one
+	 * @param importedBy the configuration class importing this one or {@code null}
 	 * @since 3.1.1
 	 */
-	ConfigurationClass(MetadataReader metadataReader, ConfigurationClass importedBy) {
+	ConfigurationClass(MetadataReader metadataReader, @Nullable ConfigurationClass importedBy) {
 		this.metadata = metadataReader.getAnnotationMetadata();
 		this.resource = metadataReader.getResource();
 		this.importedBy.add(importedBy);
@@ -98,6 +99,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param clazz the underlying {@link Class} to represent
 	 * @param beanName name of the {@code @Configuration} class bean
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(Class<?> clazz, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -111,10 +113,10 @@ final class ConfigurationClass {
 	 * using the {@link Import} annotation or automatically processed as a nested
 	 * configuration class (if imported is {@code true}).
 	 * @param clazz the underlying {@link Class} to represent
-	 * @param importedBy the configuration class importing this one
+	 * @param importedBy the configuration class importing this one (or {@code null})
 	 * @since 3.1.1
 	 */
-	ConfigurationClass(Class<?> clazz, ConfigurationClass importedBy) {
+	ConfigurationClass(Class<?> clazz, @Nullable ConfigurationClass importedBy) {
 		this.metadata = AnnotationMetadata.introspect(clazz);
 		this.resource = new DescriptiveResource(clazz.getName());
 		this.importedBy.add(importedBy);
@@ -124,6 +126,7 @@ final class ConfigurationClass {
 	 * Create a new {@link ConfigurationClass} with the given name.
 	 * @param metadata the metadata for the underlying class to represent
 	 * @param beanName name of the {@code @Configuration} class bean
+	 * @see ConfigurationClass#ConfigurationClass(Class, ConfigurationClass)
 	 */
 	ConfigurationClass(AnnotationMetadata metadata, String beanName) {
 		Assert.notNull(beanName, "Bean name must not be null");
@@ -145,12 +148,12 @@ final class ConfigurationClass {
 		return ClassUtils.getShortName(getMetadata().getClassName());
 	}

-	void setBeanName(@Nullable String beanName) {
+	void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}

 	@Nullable
-	String getBeanName() {
+	public String getBeanName() {
 		return this.beanName;
 	}

@@ -160,7 +163,7 @@ final class ConfigurationClass {
 	 * @since 3.1.1
 	 * @see #getImportedBy()
 	 */
-	boolean isImported() {
+	public boolean isImported() {
 		return !this.importedBy.isEmpty();
 	}

@@ -194,10 +197,6 @@ final class ConfigurationClass {
 		this.importedResources.put(importedResource, readerClass);
 	}

-	Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {
-		return this.importedResources;
-	}
-
 	void addImportBeanDefinitionRegistrar(ImportBeanDefinitionRegistrar registrar, AnnotationMetadata importingClassMetadata) {
 		this.importBeanDefinitionRegistrars.put(registrar, importingClassMetadata);
 	}
@@ -206,6 +205,10 @@ final class ConfigurationClass {
 		return this.importBeanDefinitionRegistrars;
 	}

+	Map<String, Class<? extends BeanDefinitionReader>> getImportedResources() {
+		return this.importedResources;
+	}
+
 	void validate(ProblemReporter problemReporter) {
 		// A configuration class may not be final (CGLIB limitation) unless it declares proxyBeanMethods=false
 		Map<String, Object> attributes = this.metadata.getAnnotationAttributes(Configuration.class.getName());
@@ -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.
@@ -424,7 +424,6 @@ class ConfigurationClassBeanDefinitionReader {

 		public ConfigurationClassBeanDefinition(RootBeanDefinition original,
 				ConfigurationClass configClass, MethodMetadata beanMethodMetadata, String derivedBeanName) {
-
 			super(original);
 			this.annotationMetadata = configClass.getMetadata();
 			this.factoryMethodMetadata = beanMethodMetadata;
@@ -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.
@@ -409,14 +409,11 @@ class ConfigurationClassParser {
 						this.metadataReaderFactory.getMetadataReader(original.getClassName()).getAnnotationMetadata();
 				Set<MethodMetadata> asmMethods = asm.getAnnotatedMethods(Bean.class.getName());
 				if (asmMethods.size() >= beanMethods.size()) {
-					Set<MethodMetadata> candidateMethods = new LinkedHashSet<>(beanMethods);
 					Set<MethodMetadata> selectedMethods = new LinkedHashSet<>(asmMethods.size());
 					for (MethodMetadata asmMethod : asmMethods) {
-						for (Iterator<MethodMetadata> it = candidateMethods.iterator(); it.hasNext();) {
-							MethodMetadata beanMethod = it.next();
+						for (MethodMetadata beanMethod : beanMethods) {
 							if (beanMethod.getMethodName().equals(asmMethod.getMethodName())) {
 								selectedMethods.add(beanMethod);
-								it.remove();
 								break;
 							}
 						}
@@ -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.
@@ -79,11 +79,10 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM
 	 * to invoke each listener with.
 	 * <p>Default is equivalent to {@link org.springframework.core.task.SyncTaskExecutor},
 	 * executing all listeners synchronously in the calling thread.
-	 * <p>Consider specifying an asynchronous task executor here to not block the caller
-	 * until all listeners have been executed. However, note that asynchronous execution
-	 * will not participate in the caller's thread context (class loader, transaction context)
-	 * unless the TaskExecutor explicitly supports this.
-	 * @since 2.0
+	 * <p>Consider specifying an asynchronous task executor here to not block the
+	 * caller until all listeners have been executed. However, note that asynchronous
+	 * execution will not participate in the caller's thread context (class loader,
+	 * transaction association) unless the TaskExecutor explicitly supports this.
 	 * @see org.springframework.core.task.SyncTaskExecutor
 	 * @see org.springframework.core.task.SimpleAsyncTaskExecutor
 	 */
@@ -93,7 +92,6 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM

 	/**
 	 * Return the current task executor for this multicaster.
-	 * @since 2.0
 	 */
 	@Nullable
 	protected Executor getTaskExecutor() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -137,40 +137,31 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		implements ConfigurableApplicationContext {

 	/**
-	 * The name of the {@link MessageSource} bean in the context.
+	 * Name of the MessageSource bean in the factory.
 	 * If none is supplied, message resolution is delegated to the parent.
-	 * @see org.springframework.context.MessageSource
-	 * @see org.springframework.context.support.ResourceBundleMessageSource
-	 * @see org.springframework.context.support.ReloadableResourceBundleMessageSource
-	 * @see #getMessage(MessageSourceResolvable, Locale)
+	 * @see MessageSource
 	 */
 	public static final String MESSAGE_SOURCE_BEAN_NAME = "messageSource";

 	/**
-	 * The name of the {@link ApplicationEventMulticaster} bean in the context.
-	 * If none is supplied, a {@link SimpleApplicationEventMulticaster} is used.
+	 * Name of the LifecycleProcessor bean in the factory.
+	 * If none is supplied, a DefaultLifecycleProcessor is used.
+	 * @see org.springframework.context.LifecycleProcessor
+	 * @see org.springframework.context.support.DefaultLifecycleProcessor
+	 */
+	public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor";
+
+	/**
+	 * Name of the ApplicationEventMulticaster bean in the factory.
+	 * If none is supplied, a default SimpleApplicationEventMulticaster is used.
 	 * @see org.springframework.context.event.ApplicationEventMulticaster
 	 * @see org.springframework.context.event.SimpleApplicationEventMulticaster
-	 * @see #publishEvent(ApplicationEvent)
-	 * @see #addApplicationListener(ApplicationListener)
 	 */
 	public static final String APPLICATION_EVENT_MULTICASTER_BEAN_NAME = "applicationEventMulticaster";

 	/**
-	 * The name of the {@link LifecycleProcessor} bean in the context.
-	 * If none is supplied, a {@link DefaultLifecycleProcessor} is used.
-	 * @since 3.0
-	 * @see org.springframework.context.LifecycleProcessor
-	 * @see org.springframework.context.support.DefaultLifecycleProcessor
-	 * @see #start()
-	 * @see #stop()
-	 */
-	public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor";
-
-
-	/**
-	 * Boolean flag controlled by a {@code spring.spel.ignore} system property that
-	 * instructs Spring to ignore SpEL, i.e. to not initialize the SpEL infrastructure.
+	 * Boolean flag controlled by a {@code spring.spel.ignore} system property that instructs Spring to
+	 * ignore SpEL, i.e. to not initialize the SpEL infrastructure.
 	 * <p>The default is "false".
 	 */
 	private static final boolean shouldIgnoreSpel = SpringProperties.getFlag("spring.spel.ignore");
@@ -212,7 +203,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	/** Flag that indicates whether this context has been closed already. */
 	private final AtomicBoolean closed = new AtomicBoolean();

-	/** Synchronization monitor for "refresh" and "close". */
+	/** Synchronization monitor for the "refresh" and "destroy". */
 	private final Object startupShutdownMonitor = new Object();

 	/** Reference to the JVM shutdown hook, if registered. */
@@ -220,7 +211,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	private Thread shutdownHook;

 	/** ResourcePatternResolver used by this context. */
-	private final ResourcePatternResolver resourcePatternResolver;
+	private ResourcePatternResolver resourcePatternResolver;

 	/** LifecycleProcessor for managing the lifecycle of beans within this context. */
 	@Nullable
@@ -571,6 +562,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 				StartupStep beanPostProcess = this.applicationStartup.start("spring.context.beans.post-process");
 				// Invoke factory processors registered as beans in the context.
 				invokeBeanFactoryPostProcessors(beanFactory);
+
 				// Register bean processors that intercept bean creation.
 				registerBeanPostProcessors(beanFactory);
 				beanPostProcess.end();
@@ -774,9 +766,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link MessageSource}.
-	 * <p>Uses parent's {@code MessageSource} if none defined in this context.
-	 * @see #MESSAGE_SOURCE_BEAN_NAME
+	 * Initialize the MessageSource.
+	 * Use parent's if none defined in this context.
 	 */
 	protected void initMessageSource() {
 		ConfigurableListableBeanFactory beanFactory = getBeanFactory();
@@ -808,9 +799,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link ApplicationEventMulticaster}.
-	 * <p>Uses {@link SimpleApplicationEventMulticaster} if none defined in the context.
-	 * @see #APPLICATION_EVENT_MULTICASTER_BEAN_NAME
+	 * Initialize the ApplicationEventMulticaster.
+	 * Uses SimpleApplicationEventMulticaster if none defined in the context.
 	 * @see org.springframework.context.event.SimpleApplicationEventMulticaster
 	 */
 	protected void initApplicationEventMulticaster() {
@@ -833,16 +823,15 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}

 	/**
-	 * Initialize the {@link LifecycleProcessor}.
-	 * <p>Uses {@link DefaultLifecycleProcessor} if none defined in the context.
-	 * @since 3.0
-	 * @see #LIFECYCLE_PROCESSOR_BEAN_NAME
+	 * Initialize the LifecycleProcessor.
+	 * Uses DefaultLifecycleProcessor if none defined in the context.
 	 * @see org.springframework.context.support.DefaultLifecycleProcessor
 	 */
 	protected void initLifecycleProcessor() {
 		ConfigurableListableBeanFactory beanFactory = getBeanFactory();
 		if (beanFactory.containsLocalBean(LIFECYCLE_PROCESSOR_BEAN_NAME)) {
-			this.lifecycleProcessor = beanFactory.getBean(LIFECYCLE_PROCESSOR_BEAN_NAME, LifecycleProcessor.class);
+			this.lifecycleProcessor =
+					beanFactory.getBean(LIFECYCLE_PROCESSOR_BEAN_NAME, LifecycleProcessor.class);
 			if (logger.isTraceEnabled()) {
 				logger.trace("Using LifecycleProcessor [" + this.lifecycleProcessor + "]");
 			}
@@ -1094,9 +1083,6 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 			// Let subclasses do some final clean-up if they wish...
 			onClose();

-			// Reset common introspection caches to avoid class reference leaks.
-			resetCommonCaches();
-
 			// Reset local application listeners to pre-refresh state.
 			if (this.earlyApplicationListeners != null) {
 				this.applicationListeners.clear();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -126,7 +126,6 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl
 		try {
 			DefaultListableBeanFactory beanFactory = createBeanFactory();
 			beanFactory.setSerializationId(getId());
-			beanFactory.setApplicationStartup(getApplicationStartup());
 			customizeBeanFactory(beanFactory);
 			loadBeanDefinitions(beanFactory);
 			this.beanFactory = beanFactory;
@@ -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.
@@ -20,7 +20,6 @@ import java.io.IOException;

 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.BeanDefinitionDocumentReader;
 import org.springframework.beans.factory.xml.ResourceEntityResolver;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
@@ -85,7 +84,7 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC

 		// Configure the bean definition reader with this context's
 		// resource loading environment.
-		beanDefinitionReader.setEnvironment(getEnvironment());
+		beanDefinitionReader.setEnvironment(this.getEnvironment());
 		beanDefinitionReader.setResourceLoader(this);
 		beanDefinitionReader.setEntityResolver(new ResourceEntityResolver(this));

@@ -96,13 +95,12 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC
 	}

 	/**
-	 * Initialize the bean definition reader used for loading the bean definitions
-	 * of this context. The default implementation sets the validating flag.
+	 * Initialize the bean definition reader used for loading the bean
+	 * definitions of this context. Default implementation is empty.
 	 * <p>Can be overridden in subclasses, e.g. for turning off XML validation
-	 * or using a different {@link BeanDefinitionDocumentReader} implementation.
+	 * or using a different XmlBeanDefinitionParser implementation.
 	 * @param reader the bean definition reader used by this context
-	 * @see XmlBeanDefinitionReader#setValidating
-	 * @see XmlBeanDefinitionReader#setDocumentReaderClass
+	 * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader#setDocumentReaderClass
 	 */
 	protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) {
 		reader.setValidating(this.validating);
@@ -55,7 +55,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart
 		// override classes that have not been loaded yet. If not accessible, we will
 		// always override requested classes, even when the classes have been loaded
 		// by the parent ClassLoader already and cannot be transformed anymore anyway.
-		Method method;
+		Method method = null;
 		try {
 			method = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
 			ReflectionUtils.makeAccessible(method);
@@ -63,7 +63,6 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart
 		catch (Throwable ex) {
 			// Typically a JDK 9+ InaccessibleObjectException...
 			// Avoid through JVM startup with --add-opens=java.base/java.lang=ALL-UNNAMED
-			method = null;
 			LogFactory.getLog(ContextTypeMatchClassLoader.class).debug(
 					"ClassLoader.findLoadedClass not accessible -> will always override requested class", ex);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -27,7 +27,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;

 import org.springframework.context.ResourceLoaderAware;
@@ -144,7 +143,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased

 	/**
 	 * Set the PropertiesPersister to use for parsing properties files.
-	 * <p>The default is {@code ResourcePropertiesPersister}.
+	 * <p>The default is ResourcePropertiesPersister.
 	 * @see ResourcePropertiesPersister#INSTANCE
 	 */
 	public void setPropertiesPersister(@Nullable PropertiesPersister propertiesPersister) {
@@ -402,7 +401,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased

 	/**
 	 * Refresh the PropertiesHolder for the given bundle filename.
-	 * <p>The holder can be {@code null} if not cached before, or a timed-out cache entry
+	 * The holder can be {@code null} if not cached before, or a timed-out cache entry
 	 * (potentially getting re-validated against the current last-modified timestamp).
 	 * @param filename the bundle filename (basename + Locale)
 	 * @param propHolder the current PropertiesHolder for the bundle
@@ -563,7 +562,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased

 		private volatile long refreshTimestamp = -2;

-		private final Lock refreshLock = new ReentrantLock();
+		private final ReentrantLock refreshLock = new ReentrantLock();

 		/** Cache to hold already generated MessageFormats per message code. */
 		private final ConcurrentMap<String, Map<Locale, MessageFormat>> cachedMessageFormats =
@@ -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.
@@ -29,7 +29,7 @@ import org.springframework.lang.Nullable;
 * {@link Runnable Runnables} based on different kinds of triggers.
 *
 * <p>This interface is separate from {@link SchedulingTaskExecutor} since it
- * usually represents a different kind of backend, i.e. a thread pool with
+ * usually represents for a different kind of backend, i.e. a thread pool with
 * different characteristics and capabilities. Implementations may implement
 * both interfaces if they can handle both kinds of execution characteristics.
 *
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;

 /**
 * Annotation that marks a method to be scheduled. Exactly one of the
- * {@link #cron}, {@link #fixedDelay}, or {@link #fixedRate} attributes
- * must be specified.
+ * {@link #cron}, {@link #fixedDelay}, or {@link #fixedRate} attributes must be
+ * specified.
 *
 * <p>The annotated method must expect no arguments. It will typically have
 * a {@code void} return type; if not, the returned value will be ignored
@@ -40,12 +40,6 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 * done manually or, more conveniently, through the {@code <task:annotation-driven/>}
 * XML element or {@link EnableScheduling @EnableScheduling} annotation.
 *
- * <p>This annotation can be used as a <em>{@linkplain Repeatable repeatable}</em>
- * annotation. If several scheduled declarations are found on the same method,
- * each of them will be processed independently, with a separate trigger firing
- * for each of them. As a consequence, such co-located schedules may overlap
- * and execute multiple times in parallel or in immediate succession.
- *
 * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
 * <em>composed annotations</em> with attribute overrides.
 *
@@ -100,9 +94,9 @@ public @interface Scheduled {

 	/**
 	 * A time zone for which the cron expression will be resolved. By default, this
-	 * attribute is the empty String (i.e. the scheduler's time zone will be used).
+	 * attribute is the empty String (i.e. the server's local time zone will be used).
 	 * @return a zone id accepted by {@link java.util.TimeZone#getTimeZone(String)},
-	 * or an empty String to indicate the scheduler's default time zone
+	 * or an empty String to indicate the server's default time zone
 	 * @since 4.0
 	 * @see org.springframework.scheduling.support.CronTrigger#CronTrigger(String, java.util.TimeZone)
 	 * @see java.util.TimeZone
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -27,6 +27,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -83,7 +84,7 @@ import org.springframework.util.StringValueResolver;
 * "fixedRate", "fixedDelay", or "cron" expression provided via the annotation.
 *
 * <p>This post-processor is automatically registered by Spring's
- * {@code <task:annotation-driven>} XML element and also by the
+ * {@code <task:annotation-driven>} XML element, and also by the
 * {@link EnableScheduling @EnableScheduling} annotation.
 *
 * <p>Autodetects any {@link SchedulingConfigurer} instances in the container,
@@ -159,7 +160,7 @@ public class ScheduledAnnotationBeanPostProcessor
 	 * @since 5.1
 	 */
 	public ScheduledAnnotationBeanPostProcessor(ScheduledTaskRegistrar registrar) {
-		Assert.notNull(registrar, "ScheduledTaskRegistrar must not be null");
+		Assert.notNull(registrar, "ScheduledTaskRegistrar is required");
 		this.registrar = registrar;
 	}

@@ -433,14 +434,14 @@ public class ScheduledAnnotationBeanPostProcessor
 					Assert.isTrue(initialDelay == -1, "'initialDelay' not supported for cron triggers");
 					processedSchedule = true;
 					if (!Scheduled.CRON_DISABLED.equals(cron)) {
-						CronTrigger trigger;
+						TimeZone timeZone;
 						if (StringUtils.hasText(zone)) {
-							trigger = new CronTrigger(cron, StringUtils.parseTimeZoneString(zone));
+							timeZone = StringUtils.parseTimeZoneString(zone);
 						}
 						else {
-							trigger = new CronTrigger(cron);
+							timeZone = TimeZone.getDefault();
 						}
-						tasks.add(this.registrar.scheduleCronTask(new CronTask(runnable, trigger)));
+						tasks.add(this.registrar.scheduleCronTask(new CronTask(runnable, new CronTrigger(cron, timeZone))));
 					}
 				}
 			}
@@ -579,7 +580,7 @@ public class ScheduledAnnotationBeanPostProcessor
 		}
 		if (tasks != null) {
 			for (ScheduledTask task : tasks) {
-				task.cancel(false);
+				task.cancel();
 			}
 		}
 	}
@@ -597,7 +598,7 @@ public class ScheduledAnnotationBeanPostProcessor
 			Collection<Set<ScheduledTask>> allTasks = this.scheduledTasks.values();
 			for (Set<ScheduledTask> tasks : allTasks) {
 				for (ScheduledTask task : tasks) {
-					task.cancel(false);
+					task.cancel();
 				}
 			}
 			this.scheduledTasks.clear();
@@ -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.
@@ -40,10 +40,10 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 public interface SchedulingConfigurer {

 	/**
-	 * Callback allowing a {@link org.springframework.scheduling.TaskScheduler}
-	 * and specific {@link org.springframework.scheduling.config.Task} instances
-	 * to be registered against the given the {@link ScheduledTaskRegistrar}.
-	 * @param taskRegistrar the registrar to be configured
+	 * Callback allowing a {@link org.springframework.scheduling.TaskScheduler
+	 * TaskScheduler} and specific {@link org.springframework.scheduling.config.Task Task}
+	 * instances to be registered against the given the {@link ScheduledTaskRegistrar}.
+	 * @param taskRegistrar the registrar to be configured.
 	 */
 	void configureTasks(ScheduledTaskRegistrar taskRegistrar);

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -133,6 +133,11 @@ public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, Sche
 	 * execution callback (which may be a wrapper around the user-supplied task).
 	 * <p>The primary use case is to set some execution context around the task's
 	 * invocation, or to provide some monitoring/statistics for task execution.
+	 * <p><b>NOTE:</b> Exception handling in {@code TaskDecorator} implementations
+	 * is limited to plain {@code Runnable} execution via {@code execute} calls.
+	 * In case of {@code #submit} calls, the exposed {@code Runnable} will be a
+	 * {@code FutureTask} which does not propagate any exceptions; you might
+	 * have to cast it and call {@code Future#get} to evaluate exceptions.
 	 * @since 4.3
 	 */
 	public final void setTaskDecorator(TaskDecorator taskDecorator) {
@@ -173,10 +178,11 @@ public class ConcurrentTaskExecutor implements AsyncListenableTaskExecutor, Sche
 	}


-	private TaskExecutorAdapter getAdaptedExecutor(Executor originalExecutor) {
-		TaskExecutorAdapter adapter =
-				(managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(originalExecutor) ?
-						new ManagedTaskExecutorAdapter(originalExecutor) : new TaskExecutorAdapter(originalExecutor));
+	private TaskExecutorAdapter getAdaptedExecutor(Executor concurrentExecutor) {
+		if (managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(concurrentExecutor)) {
+			return new ManagedTaskExecutorAdapter(concurrentExecutor);
+		}
+		TaskExecutorAdapter adapter = new TaskExecutorAdapter(concurrentExecutor);
 		if (this.taskDecorator != null) {
 			adapter.setTaskDecorator(this.taskDecorator);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -177,7 +177,6 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 	 * @see Clock#systemDefaultZone()
 	 */
 	public void setClock(Clock clock) {
-		Assert.notNull(clock, "Clock must not be null");
 		this.clock = clock;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -45,9 +45,8 @@ import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureTask;

 /**
- * A standard implementation of Spring's {@link TaskScheduler} interface, wrapping
- * a native {@link java.util.concurrent.ScheduledThreadPoolExecutor} and providing
- * all applicable configuration options for it.
+ * Implementation of Spring's {@link TaskScheduler} interface, wrapping
+ * a native {@link java.util.concurrent.ScheduledThreadPoolExecutor}.
 *
 * @author Juergen Hoeller
 * @author Mark Fisher
@@ -155,7 +154,6 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 	 * @see Clock#systemDefaultZone()
 	 */
 	public void setClock(Clock clock) {
-		Assert.notNull(clock, "Clock must not be null");
 		this.clock = clock;
 	}

@@ -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.
@@ -41,8 +41,8 @@ import org.springframework.util.CollectionUtils;
 * Helper bean for registering tasks with a {@link TaskScheduler}, typically using cron
 * expressions.
 *
- * <p>{@code ScheduledTaskRegistrar} has a more prominent user-facing role when used in
- * conjunction with the {@link
+ * <p>As of Spring 3.1, {@code ScheduledTaskRegistrar} has a more prominent user-facing
+ * role when used in conjunction with the {@link
 * org.springframework.scheduling.annotation.EnableAsync @EnableAsync} annotation and its
 * {@link org.springframework.scheduling.annotation.SchedulingConfigurer
 * SchedulingConfigurer} callback interface.
@@ -552,7 +552,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing
 	@Override
 	public void destroy() {
 		for (ScheduledTask task : this.scheduledTasks) {
-			task.cancel(false);
+			task.cancel();
 		}
 		if (this.localExecutor != null) {
 			this.localExecutor.shutdownNow();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -29,15 +29,17 @@ import org.springframework.util.StringUtils;
 * Created using the {@code parse*} methods.
 *
 * @author Arjen Poutsma
- * @author Juergen Hoeller
 * @since 5.3
 */
 final class BitsCronField extends CronField {

-	public static final BitsCronField ZERO_NANOS = forZeroNanos();
-
 	private static final long MASK = 0xFFFFFFFFFFFFFFFFL;

+
+	@Nullable
+	private static BitsCronField zeroNanos = null;
+
+
 	// we store at most 60 bits, for seconds and minutes, so a 64-bit long suffices
 	private long bits;

@@ -46,14 +48,16 @@ final class BitsCronField extends CronField {
 		super(type);
 	}

-
 	/**
 	 * Return a {@code BitsCronField} enabled for 0 nanoseconds.
 	 */
-	private static BitsCronField forZeroNanos() {
-		BitsCronField field = new BitsCronField(Type.NANO);
-		field.setBit(0);
-		return field;
+	public static BitsCronField zeroNanos() {
+		if (zeroNanos == null) {
+			BitsCronField field = new BitsCronField(Type.NANO);
+			field.setBit(0);
+			zeroNanos = field;
+		}
+		return zeroNanos;
 	}

 	/**
@@ -104,6 +108,7 @@ final class BitsCronField extends CronField {
 		return result;
 	}

+
 	private static BitsCronField parseDate(String value, BitsCronField.Type type) {
 		if (value.equals("?")) {
 			value = "*";
@@ -169,7 +174,6 @@ final class BitsCronField extends CronField {
 		}
 	}

-
 	@Nullable
 	@Override
 	public <T extends Temporal & Comparable<? super T>> T nextOrSame(T temporal) {
@@ -213,6 +217,7 @@ final class BitsCronField extends CronField {
 		else {
 			return -1;
 		}
+
 	}

 	private void setBits(ValueRange range) {
@@ -242,20 +247,7 @@ final class BitsCronField extends CronField {
 	}

 	private void clearBit(int index) {
-		this.bits &= ~(1L << index);
-	}
-
-
-	@Override
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof BitsCronField)) {
-			return false;
-		}
-		BitsCronField otherField = (BitsCronField) other;
-		return (type() == otherField.type() && this.bits == otherField.bits);
+		this.bits &=  ~(1L << index);
 	}

 	@Override
@@ -263,6 +255,18 @@ final class BitsCronField extends CronField {
 		return Long.hashCode(this.bits);
 	}

+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof BitsCronField)) {
+			return false;
+		}
+		BitsCronField other = (BitsCronField) o;
+		return type() == other.type() && this.bits == other.bits;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder(type().toString());
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -29,14 +29,9 @@ import org.springframework.util.StringUtils;
 * <a href="https://www.manpagez.com/man/5/crontab/">crontab expression</a>
 * that can calculate the next time it matches.
 *
- * <p>{@code CronExpression} instances are created through {@link #parse(String)};
- * the next match is determined with {@link #next(Temporal)}.
- *
- * <p>Supports a Quartz day-of-month/week field with an L/# expression. Follows
- * common cron conventions in every other respect, including 0-6 for SUN-SAT
- * (plus 7 for SUN as well). Note that Quartz deviates from the day-of-week
- * convention in cron through 1-7 for SUN-SAT whereas Spring strictly follows
- * cron even in combination with the optional Quartz-specific L/# expressions.
+ * <p>{@code CronExpression} instances are created through
+ * {@link #parse(String)}; the next match is determined with
+ * {@link #next(Temporal)}.
 *
 * @author Arjen Poutsma
 * @since 5.3
@@ -62,12 +57,18 @@ public final class CronExpression {
 	private final String expression;


-	private CronExpression(CronField seconds, CronField minutes, CronField hours,
-			CronField daysOfMonth, CronField months, CronField daysOfWeek, String expression) {
+	private CronExpression(
+			CronField seconds,
+			CronField minutes,
+			CronField hours,
+			CronField daysOfMonth,
+			CronField months,
+			CronField daysOfWeek,
+			String expression) {

-		// Reverse order, to make big changes first.
-		// To make sure we end up at 0 nanos, we add an extra field.
-		this.fields = new CronField[] {daysOfWeek, months, daysOfMonth, hours, minutes, seconds, CronField.zeroNanos()};
+		// reverse order, to make big changes first
+		// to make sure we end up at 0 nanos, we add an extra field
+		this.fields = new CronField[]{daysOfWeek, months, daysOfMonth, hours, minutes, seconds, CronField.zeroNanos()};
 		this.expression = expression;
 	}

@@ -120,8 +121,11 @@ public final class CronExpression {
 	 * {@code LW}), it means "the last weekday of the month".
 	 * </li>
 	 * <li>
-	 * In the "day of week" field, {@code dL} or {@code DDDL} stands for
-	 * "the last day of week {@code d} (or {@code DDD}) in the month".
+	 * In the "day of week" field, {@code L} stands for "the last day of the
+	 * week".
+	 * If prefixed by a number or three-letter name (i.e. {@code dL} or
+	 * {@code DDDL}), it means "the last day of week {@code d} (or {@code DDD})
+	 * in the month".
 	 * </li>
 	 * </ul>
 	 * </li>
@@ -173,7 +177,7 @@ public final class CronExpression {
 	 * the cron format
 	 */
 	public static CronExpression parse(String expression) {
-		Assert.hasLength(expression, "Expression must not be empty");
+		Assert.hasLength(expression, "Expression string must not be empty");

 		expression = resolveMacros(expression);

@@ -266,19 +270,28 @@ public final class CronExpression {
 	}


-	@Override
-	public boolean equals(@Nullable Object other) {
-		return (this == other || (other instanceof CronExpression &&
-				Arrays.equals(this.fields, ((CronExpression) other).fields)));
-	}
-
 	@Override
 	public int hashCode() {
 		return Arrays.hashCode(this.fields);
 	}

+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o instanceof CronExpression) {
+			CronExpression other = (CronExpression) o;
+			return Arrays.equals(this.fields, other.fields);
+		}
+		else {
+			return false;
+		}
+	}
+
 	/**
 	 * Return the expression string used to create this {@code CronExpression}.
+	 * @return the expression string
 	 */
 	@Override
 	public String toString() {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -29,24 +29,17 @@ import org.springframework.util.StringUtils;

 /**
 * Single field in a cron pattern. Created using the {@code parse*} methods,
- * the main and only entry point is {@link #nextOrSame(Temporal)}.
- *
- * <p>Supports a Quartz day-of-month/week field with an L/# expression. Follows
- * common cron conventions in every other respect, including 0-6 for SUN-SAT
- * (plus 7 for SUN as well). Note that Quartz deviates from the day-of-week
- * convention in cron through 1-7 for SUN-SAT whereas Spring strictly follows
- * cron even in combination with the optional Quartz-specific L/# expressions.
+ * main and only entry point is {@link #nextOrSame(Temporal)}.
 *
 * @author Arjen Poutsma
 * @since 5.3
 */
 abstract class CronField {

-	private static final String[] MONTHS = new String[]
-			{"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"};
+	private static final String[] MONTHS = new String[]{"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP",
+			"OCT", "NOV", "DEC"};

-	private static final String[] DAYS = new String[]
-			{"MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"};
+	private static final String[] DAYS = new String[]{"MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"};

 	private final Type type;

@@ -55,12 +48,11 @@ abstract class CronField {
 		this.type = type;
 	}

-
 	/**
 	 * Return a {@code CronField} enabled for 0 nanoseconds.
 	 */
 	public static CronField zeroNanos() {
-		return BitsCronField.ZERO_NANOS;
+		return BitsCronField.zeroNanos();
 	}

 	/**
@@ -177,7 +169,6 @@ abstract class CronField {
 	 * day-of-month, month, day-of-week.
 	 */
 	protected enum Type {
-
 		NANO(ChronoField.NANO_OF_SECOND, ChronoUnit.SECONDS),
 		SECOND(ChronoField.SECOND_OF_MINUTE, ChronoUnit.MINUTES, ChronoField.NANO_OF_SECOND),
 		MINUTE(ChronoField.MINUTE_OF_HOUR, ChronoUnit.HOURS, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
@@ -186,18 +177,21 @@ abstract class CronField {
 		MONTH(ChronoField.MONTH_OF_YEAR, ChronoUnit.YEARS, ChronoField.DAY_OF_MONTH, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND),
 		DAY_OF_WEEK(ChronoField.DAY_OF_WEEK, ChronoUnit.WEEKS, ChronoField.HOUR_OF_DAY, ChronoField.MINUTE_OF_HOUR, ChronoField.SECOND_OF_MINUTE, ChronoField.NANO_OF_SECOND);

+
 		private final ChronoField field;

 		private final ChronoUnit higherOrder;

 		private final ChronoField[] lowerOrders;

+
 		Type(ChronoField field, ChronoUnit higherOrder, ChronoField... lowerOrders) {
 			this.field = field;
 			this.higherOrder = higherOrder;
 			this.lowerOrders = lowerOrders;
 		}

+
 		/**
 		 * Return the value of this type for the given temporal.
 		 * @return the value of this type
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -27,14 +27,8 @@ import org.springframework.scheduling.TriggerContext;
 import org.springframework.util.Assert;

 /**
- * {@link Trigger} implementation for cron expressions. Wraps a
- * {@link CronExpression} which parses according to common crontab conventions.
- *
- * <p>Supports a Quartz day-of-month/week field with an L/# expression. Follows
- * common cron conventions in every other respect, including 0-6 for SUN-SAT
- * (plus 7 for SUN as well). Note that Quartz deviates from the day-of-week
- * convention in cron through 1-7 for SUN-SAT whereas Spring strictly follows
- * cron even in combination with the optional Quartz-specific L/# expressions.
+ * {@link Trigger} implementation for cron expressions.
+ * Wraps a {@link CronExpression}.
 *
 * @author Juergen Hoeller
 * @author Arjen Poutsma
@@ -45,7 +39,6 @@ public class CronTrigger implements Trigger {

 	private final CronExpression expression;

-	@Nullable
 	private final ZoneId zoneId;


@@ -55,8 +48,7 @@ public class CronTrigger implements Trigger {
 	 * expression conventions
 	 */
 	public CronTrigger(String expression) {
-		this.expression = CronExpression.parse(expression);
-		this.zoneId = null;
+		this(expression, ZoneId.systemDefault());
 	}

 	/**
@@ -66,9 +58,7 @@ public class CronTrigger implements Trigger {
 	 * @param timeZone a time zone in which the trigger times will be generated
 	 */
 	public CronTrigger(String expression, TimeZone timeZone) {
-		this.expression = CronExpression.parse(expression);
-		Assert.notNull(timeZone, "TimeZone must not be null");
-		this.zoneId = timeZone.toZoneId();
+		this(expression, timeZone.toZoneId());
 	}

 	/**
@@ -80,8 +70,10 @@ public class CronTrigger implements Trigger {
 	 * @see CronExpression#parse(String)
 	 */
 	public CronTrigger(String expression, ZoneId zoneId) {
-		this.expression = CronExpression.parse(expression);
+		Assert.hasLength(expression, "Expression must not be empty");
 		Assert.notNull(zoneId, "ZoneId must not be null");
+
+		this.expression = CronExpression.parse(expression);
 		this.zoneId = zoneId;
 	}

@@ -102,23 +94,22 @@ public class CronTrigger implements Trigger {
 	 */
 	@Override
 	public Date nextExecutionTime(TriggerContext triggerContext) {
-		Date timestamp = triggerContext.lastCompletionTime();
-		if (timestamp != null) {
+		Date date = triggerContext.lastCompletionTime();
+		if (date != null) {
 			Date scheduled = triggerContext.lastScheduledExecutionTime();
-			if (scheduled != null && timestamp.before(scheduled)) {
+			if (scheduled != null && date.before(scheduled)) {
 				// Previous task apparently executed too early...
 				// Let's simply use the last calculated execution time then,
 				// in order to prevent accidental re-fires in the same second.
-				timestamp = scheduled;
+				date = scheduled;
 			}
 		}
 		else {
-			timestamp = new Date(triggerContext.getClock().millis());
+			date = new Date(triggerContext.getClock().millis());
 		}
-		ZoneId zone = (this.zoneId != null ? this.zoneId : triggerContext.getClock().getZone());
-		ZonedDateTime zonedTimestamp = ZonedDateTime.ofInstant(timestamp.toInstant(), zone);
-		ZonedDateTime nextTimestamp = this.expression.next(zonedTimestamp);
-		return (nextTimestamp != null ? Date.from(nextTimestamp.toInstant()) : null);
+		ZonedDateTime dateTime = ZonedDateTime.ofInstant(date.toInstant(), this.zoneId);
+		ZonedDateTime next = this.expression.next(dateTime);
+		return (next != null ? Date.from(next.toInstant()) : null);
 	}


@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 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.
@@ -29,16 +29,10 @@ import org.springframework.util.Assert;

 /**
 * Extension of {@link CronField} for
- * <a href="https://www.quartz-scheduler.org">Quartz</a>-specific fields.
+ * <a href="https://www.quartz-scheduler.org>Quartz</a> -specific fields.
 * Created using the {@code parse*} methods, uses a {@link TemporalAdjuster}
 * internally.
 *
- * <p>Supports a Quartz day-of-month/week field with an L/# expression. Follows
- * common cron conventions in every other respect, including 0-6 for SUN-SAT
- * (plus 7 for SUN as well). Note that Quartz deviates from the day-of-week
- * convention in cron through 1-7 for SUN-SAT whereas Spring strictly follows
- * cron even in combination with the optional Quartz-specific L/# expressions.
- *
 * @author Arjen Poutsma
 * @since 5.3
 */
@@ -66,18 +60,16 @@ final class QuartzCronField extends CronField {
 		this.rollForwardType = rollForwardType;
 	}

-
 	/**
-	 * Determine whether the given value is a Quartz day-of-month field.
+	 * Returns whether the given value is a Quartz day-of-month field.
 	 */
 	public static boolean isQuartzDaysOfMonthField(String value) {
 		return value.contains("L") || value.contains("W");
 	}

 	/**
-	 * Parse the given value into a days of months {@code QuartzCronField},
-	 * the fourth entry of a cron expression.
-	 * <p>Expects a "L" or "W" in the given value.
+	 * Parse the given value into a days of months {@code QuartzCronField}, the fourth entry of a cron expression.
+	 * Expects a "L" or "W" in the given value.
 	 */
 	public static QuartzCronField parseDaysOfMonth(String value) {
 		int idx = value.lastIndexOf('L');
@@ -86,14 +78,14 @@ final class QuartzCronField extends CronField {
 			if (idx != 0) {
 				throw new IllegalArgumentException("Unrecognized characters before 'L' in '" + value + "'");
 			}
-			else if (value.length() == 2 && value.charAt(1) == 'W') {  // "LW"
+			else if (value.length() == 2 && value.charAt(1) == 'W') { // "LW"
 				adjuster = lastWeekdayOfMonth();
 			}
 			else {
-				if (value.length() == 1) {  // "L"
+				if (value.length() == 1) { // "L"
 					adjuster = lastDayOfMonth();
 				}
-				else {  // "L-[0-9]+"
+				else { // "L-[0-9]+"
 					int offset = Integer.parseInt(value.substring(idx + 1));
 					if (offset >= 0) {
 						throw new IllegalArgumentException("Offset '" + offset + " should be < 0 '" + value + "'");
@@ -111,7 +103,7 @@ final class QuartzCronField extends CronField {
 			else if (idx != value.length() - 1) {
 				throw new IllegalArgumentException("Unrecognized characters after 'W' in '" + value + "'");
 			}
-			else {  // "[0-9]+W"
+			else { // "[0-9]+W"
 				int dayOfMonth = Integer.parseInt(value.substring(0, idx));
 				dayOfMonth = Type.DAY_OF_MONTH.checkValidValue(dayOfMonth);
 				TemporalAdjuster adjuster = weekdayNearestTo(dayOfMonth);
@@ -122,16 +114,15 @@ final class QuartzCronField extends CronField {
 	}

 	/**
-	 * Determine whether the given value is a Quartz day-of-week field.
+	 * Returns whether the given value is a Quartz day-of-week field.
 	 */
 	public static boolean isQuartzDaysOfWeekField(String value) {
 		return value.contains("L") || value.contains("#");
 	}

 	/**
-	 * Parse the given value into a days of week {@code QuartzCronField},
-	 * the sixth entry of a cron expression.
-	 * <p>Expects a "L" or "#" in the given value.
+	 * Parse the given value into a days of week {@code QuartzCronField}, the sixth entry of a cron expression.
+	 * Expects a "L" or "#" in the given value.
 	 */
 	public static QuartzCronField parseDaysOfWeek(String value) {
 		int idx = value.lastIndexOf('L');
@@ -144,7 +135,7 @@ final class QuartzCronField extends CronField {
 				if (idx == 0) {
 					throw new IllegalArgumentException("No day-of-week before 'L' in '" + value + "'");
 				}
-				else {  // "[0-7]L"
+				else { // "[0-7]L"
 					DayOfWeek dayOfWeek = parseDayOfWeek(value.substring(0, idx));
 					adjuster = lastInMonth(dayOfWeek);
 				}
@@ -166,6 +157,7 @@ final class QuartzCronField extends CronField {
 				throw new IllegalArgumentException("Ordinal '" + ordinal + "' in '" + value +
 						"' must be positive number ");
 			}
+
 			TemporalAdjuster adjuster = dayOfWeekInMonth(ordinal, dayOfWeek);
 			return new QuartzCronField(Type.DAY_OF_WEEK, Type.DAY_OF_MONTH, adjuster, value);
 		}
@@ -175,13 +167,14 @@ final class QuartzCronField extends CronField {
 	private static DayOfWeek parseDayOfWeek(String value) {
 		int dayOfWeek = Integer.parseInt(value);
 		if (dayOfWeek == 0) {
-			dayOfWeek = 7;  // cron is 0 based; java.time 1 based
+			dayOfWeek = 7; // cron is 0 based; java.time 1 based
 		}
 		try {
 			return DayOfWeek.of(dayOfWeek);
 		}
 		catch (DateTimeException ex) {
-			throw new IllegalArgumentException(ex.getMessage() + " '" + value + "'", ex);
+			String msg = ex.getMessage() + " '" + value + "'";
+			throw new IllegalArgumentException(msg, ex);
 		}
 	}

@@ -220,10 +213,10 @@ final class QuartzCronField extends CronField {
 			Temporal lastDom = adjuster.adjustInto(temporal);
 			Temporal result;
 			int dow = lastDom.get(ChronoField.DAY_OF_WEEK);
-			if (dow == 6) {  // Saturday
+			if (dow == 6) { // Saturday
 				result = lastDom.minus(1, ChronoUnit.DAYS);
 			}
-			else if (dow == 7) {  // Sunday
+			else if (dow == 7) { // Sunday
 				result = lastDom.minus(2, ChronoUnit.DAYS);
 			}
 			else {
@@ -234,7 +227,7 @@ final class QuartzCronField extends CronField {
 	}

 	/**
-	 * Returns a temporal adjuster that finds the nth-to-last day of the month.
+	 * Return a temporal adjuster that finds the nth-to-last day of the month.
 	 * @param offset the negative offset, i.e. -3 means third-to-last
 	 * @return a nth-to-last day-of-month adjuster
 	 */
@@ -248,7 +241,7 @@ final class QuartzCronField extends CronField {
 	}

 	/**
-	 * Returns a temporal adjuster that finds the weekday nearest to the given
+	 * Return a temporal adjuster that finds the weekday nearest to the given
 	 * day-of-month. If {@code dayOfMonth} falls on a Saturday, the date is
 	 * moved back to Friday; if it falls on a Sunday (or if {@code dayOfMonth}
 	 * is 1 and it falls on a Saturday), it is moved forward to Monday.
@@ -260,10 +253,10 @@ final class QuartzCronField extends CronField {
 			int current = Type.DAY_OF_MONTH.get(temporal);
 			DayOfWeek dayOfWeek = DayOfWeek.from(temporal);

-			if ((current == dayOfMonth && isWeekday(dayOfWeek)) ||  // dayOfMonth is a weekday
-					(dayOfWeek == DayOfWeek.FRIDAY && current == dayOfMonth - 1) ||  // dayOfMonth is a Saturday, so Friday before
-					(dayOfWeek == DayOfWeek.MONDAY && current == dayOfMonth + 1) ||  // dayOfMonth is a Sunday, so Monday after
-					(dayOfWeek == DayOfWeek.MONDAY && dayOfMonth == 1 && current == 3)) {  // dayOfMonth is Saturday 1st, so Monday 3rd
+			if ((current == dayOfMonth && isWeekday(dayOfWeek)) || // dayOfMonth is a weekday
+					(dayOfWeek == DayOfWeek.FRIDAY && current == dayOfMonth - 1) || // dayOfMonth is a Saturday, so Friday before
+					(dayOfWeek == DayOfWeek.MONDAY && current == dayOfMonth + 1) || // dayOfMonth is a Sunday, so Monday after
+					(dayOfWeek == DayOfWeek.MONDAY && dayOfMonth == 1 && current == 3)) { // dayOfMonth is Saturday 1st, so Monday 3rd
 				return temporal;
 			}
 			int count = 0;
@@ -299,7 +292,7 @@ final class QuartzCronField extends CronField {
 	}

 	/**
-	 * Returns a temporal adjuster that finds the last of the given day-of-week
+	 * Return a temporal adjuster that finds the last of the given doy-of-week
 	 * in a month.
 	 */
 	private static TemporalAdjuster lastInMonth(DayOfWeek dayOfWeek) {
@@ -336,7 +329,6 @@ final class QuartzCronField extends CronField {
 		}
 	}

-
 	@Override
 	public <T extends Temporal & Comparable<? super T>> T nextOrSame(T temporal) {
 		T result = adjust(temporal);
@@ -353,6 +345,7 @@ final class QuartzCronField extends CronField {
 		return result;
 	}

+
 	@Nullable
 	@SuppressWarnings("unchecked")
 	private <T extends Temporal & Comparable<? super T>> T adjust(T temporal) {
@@ -360,26 +353,28 @@ final class QuartzCronField extends CronField {
 	}


-	@Override
-	public boolean equals(@Nullable Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof QuartzCronField)) {
-			return false;
-		}
-		QuartzCronField otherField = (QuartzCronField) other;
-		return (type() == otherField.type() && this.value.equals(otherField.value));
-	}
-
 	@Override
 	public int hashCode() {
 		return this.value.hashCode();
 	}

+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof QuartzCronField)) {
+			return false;
+		}
+		QuartzCronField other = (QuartzCronField) o;
+		return type() == other.type() &&
+				this.value.equals(other.value);
+	}
+
 	@Override
 	public String toString() {
 		return type() + " '" + this.value + "'";
+
 	}

 }
@@ -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.
@@ -102,8 +102,8 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	}

 	@Override
-	public void rejectValue(@Nullable String field, String errorCode,
-			@Nullable Object[] errorArgs, @Nullable String defaultMessage) {
+	public void rejectValue(@Nullable String field, String errorCode, @Nullable Object[] errorArgs,
+			@Nullable String defaultMessage) {

 		if (!StringUtils.hasLength(getNestedPath()) && !StringUtils.hasLength(field)) {
 			// We're at the top of the nested object hierarchy,
@@ -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.
@@ -28,14 +28,13 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;

 /**
- * Abstract implementation of the {@link Errors} interface.
- * Provides nested path handling but does not define concrete management
+ * Abstract implementation of the {@link Errors} interface. Provides common
+ * access to evaluated errors; however, does not define concrete management
 * of {@link ObjectError ObjectErrors} and {@link FieldError FieldErrors}.
 *
 * @author Juergen Hoeller
 * @author Rossen Stoyanchev
 * @since 2.5.3
- * @see AbstractBindingResult
 */
@SuppressWarnings("serial")
 public abstract class AbstractErrors implements Errors, Serializable {
@@ -82,8 +81,8 @@ public abstract class AbstractErrors implements Errors, Serializable {
 			nestedPath = "";
 		}
 		nestedPath = canonicalFieldName(nestedPath);
-		if (nestedPath.length() > 0 && !nestedPath.endsWith(NESTED_PATH_SEPARATOR)) {
-			nestedPath += NESTED_PATH_SEPARATOR;
+		if (nestedPath.length() > 0 && !nestedPath.endsWith(Errors.NESTED_PATH_SEPARATOR)) {
+			nestedPath += Errors.NESTED_PATH_SEPARATOR;
 		}
 		this.nestedPath = nestedPath;
 	}
@@ -98,7 +97,7 @@ public abstract class AbstractErrors implements Errors, Serializable {
 		}
 		else {
 			String path = getNestedPath();
-			return (path.endsWith(NESTED_PATH_SEPARATOR) ?
+			return (path.endsWith(Errors.NESTED_PATH_SEPARATOR) ?
 					path.substring(0, path.length() - NESTED_PATH_SEPARATOR.length()) : path);
 		}
 	}
@@ -202,9 +201,9 @@ public abstract class AbstractErrors implements Errors, Serializable {
 		List<FieldError> fieldErrors = getFieldErrors();
 		List<FieldError> result = new ArrayList<>();
 		String fixedField = fixedField(field);
-		for (FieldError fieldError : fieldErrors) {
-			if (isMatchingFieldError(fixedField, fieldError)) {
-				result.add(fieldError);
+		for (FieldError error : fieldErrors) {
+			if (isMatchingFieldError(fixedField, error)) {
+				result.add(error);
 			}
 		}
 		return Collections.unmodifiableList(result);
@@ -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.
@@ -55,7 +55,7 @@ public class BeanPropertyBindingResult extends AbstractPropertyBindingResult imp


 	/**
-	 * Create a new {@code BeanPropertyBindingResult} for the given target.
+	 * Creates a new instance of the {@link BeanPropertyBindingResult} class.
 	 * @param target the target bean to bind onto
 	 * @param objectName the name of the target object
 	 */
@@ -64,7 +64,7 @@ public class BeanPropertyBindingResult extends AbstractPropertyBindingResult imp
 	}

 	/**
-	 * Create a new {@code BeanPropertyBindingResult} for the given target.
+	 * Creates a new instance of the {@link BeanPropertyBindingResult} class.
 	 * @param target the target bean to bind onto
 	 * @param objectName the name of the target object
 	 * @param autoGrowNestedPaths whether to "auto-grow" a nested path that contains a null value
--- a/Show More
+++ b/Show More