Release v5.3.22

2026-06-08 17:33:33 +00:00 · 2022-07-14 08:39:33 +00:00
364 changed files with 2966 additions and 4873 deletions
@@ -1,13 +1,10 @@
 name: "Validate Gradle Wrapper"
 on: [push, pull_request]

-permissions:
-  contents: read
-
 jobs:
  validation:
    name: "Validation"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
      - uses: gradle/wrapper-validation-action@v1
@@ -24,7 +24,6 @@ buildSrc/build
 /spring-core/graalvm/build
 /spring-core/kotlin-coroutines/build
 /framework-bom/build
-/framework-docs/build
 /integration-tests/build
 /src/asciidoc/build
 target/
@@ -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.352-librca
+java=8.0.333-librca
@@ -1,17 +1,17 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id 'io.freefair.aspectj' version '6.2.0' apply false
+	id "io.freefair.aspectj" version '6.2.0' apply false
 	id 'org.jetbrains.dokka' version '1.6.10' apply false
 	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
-	id 'org.jetbrains.kotlin.plugin.serialization' version "1.5.32" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.32" apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-	id 'org.unbroken-dome.xjc' version '2.0.0' apply false
-	id 'com.github.ben-manes.versions' version '0.39.0'
-	id 'com.github.johnrengelman.shadow' version '7.0.0' apply false
+	id "org.unbroken-dome.xjc" version '2.0.0' apply false
+	id "com.github.ben-manes.versions" version '0.39.0'
+	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
 	id 'de.undercouch.download' version '4.1.2'
-	id 'me.champeau.jmh' version "0.6.6" apply false
+	id "me.champeau.jmh" version "0.6.6" apply false
 }

 ext {
@@ -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.86.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.27"
+			mavenBom "io.netty:netty-bom:4.1.79.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.21"
 			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
-			mavenBom "io.rsocket:rsocket-bom:1.1.3"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.50.v20221201"
+			mavenBom "io.rsocket:rsocket-bom:1.1.2"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.48.v20220622"
 			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.19.0') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.18.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -67,8 +67,8 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.5"
-			dependency "io.smallrye.reactive:mutiny:1.8.0"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.4"
+			dependency "io.smallrye.reactive:mutiny:1.4.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"

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

 			dependency "com.h2database:h2:2.1.214"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
-			dependency "com.github.librepdf:openpdf:1.3.30"
+			dependency "com.github.librepdf:openpdf:1.3.29"
 			dependency "com.rometools:rome:1.18.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.4"
@@ -124,22 +124,22 @@ configure(allprojects) { project ->
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
 			dependency "org.hibernate:hibernate-core:5.4.33.Final"
-			dependency "org.hibernate:hibernate-validator:6.2.5.Final"
+			dependency "org.hibernate:hibernate-validator:6.2.3.Final"
 			dependency "org.webjars:webjars-locator-core:0.48"
 			dependency "org.webjars:underscorejs:1.8.3"

-			dependencySet(group: 'org.apache.tomcat', version: '9.0.70') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.64') {
 				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.70') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.64') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.22.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.18.Final') {
 				entry 'undertow-core'
 				entry('undertow-servlet') {
 					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
@@ -150,7 +150,7 @@ configure(allprojects) { project ->
 				}
 			}

-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.13"
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.12"
 			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
 			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
 			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
@@ -191,14 +191,14 @@ configure(allprojects) { project ->
 			dependency "org.junit.support:testng-engine:1.0.4"
 			dependency "org.hamcrest:hamcrest:2.2"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.24.1"
+			dependency "org.assertj:assertj-core:3.23.0"
 			dependencySet(group: 'org.xmlunit', version: '2.9.0') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.9.0') {  // spring-beans tests fail with 4.10+
+			dependencySet(group: 'org.mockito', version: '4.6.1') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -206,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.1"

-			dependency("net.sourceforge.htmlunit:htmlunit:2.69.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.63.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.67.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.63.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -217,7 +217,7 @@ configure(allprojects) { project ->
 				exclude group: "io.netty", name: "netty"
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
-			dependency "com.jayway.jsonpath:json-path:2.7.0"
+			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk18on:1.71"

 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
@@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project ->
 	}

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

@@ -380,7 +380,8 @@ configure([rootProject] + javaProjects) { project ->
 			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
-			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
+			// TODO Uncomment once httpclient5 API docs are again online.
+			// "https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
 			// Disabling linking to JUnit 5.8.2, since the `package-list` file no longer exists due to
@@ -413,9 +414,11 @@ configure(rootProject) {

 	nohttp {
 		source.exclude "**/test-output/**"
+		source.exclude "spring-core/graalvm/build/**" // only available on `main`
+		source.exclude "spring-core-test/build/**" // only available on `main`
 		allowlistFile = project.file("src/nohttp/allowlist.lines")
 		def rootPath = file(rootDir).toPath()
-		def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/spring-core-test" + "${rootDir}/buildSrc" + "${rootDir}/framework-docs"
+		def projectDirs = allprojects.collect { it.projectDir } + "${rootDir}/buildSrc"
 		projectDirs.forEach { dir ->
 			[ 'bin', 'build', 'out', '.settings' ]
 				.collect { rootPath.relativize(new File(dir, it).toPath()) }
@@ -426,10 +429,6 @@ configure(rootProject) {
 		}
 	}

-	tasks.named("checkstyleNohttp").configure {
-		maxHeapSize = "1g"
-	}
-
 	publishing {
 		publications {
 			mavenJava(MavenPublication) {
@@ -439,5 +438,4 @@ configure(rootProject) {
 			}
 		}
 	}
-
 }
@@ -15,6 +15,3 @@ changelog:
      sort: "title"
      labels:
        - "type: dependency-upgrade"
-  contributors:
-    exclude:
-      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll"]
@@ -1,10 +1,11 @@
-FROM ubuntu:focal-20220922
+FROM ubuntu:focal-20220531

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 RUN ./setup.sh java8

 ENV JAVA_HOME /opt/openjdk/java8
+ENV JDK11 /opt/openjdk/java11
 ENV JDK17 /opt/openjdk/java17

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

 case "$1" in
 	java8)
-		 echo "https://github.com/bell-sw/Liberica/releases/download/8u345+1/bellsoft-jdk8u345+1-linux-amd64.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/8u333+2/bellsoft-jdk8u333+2-linux-amd64.tar.gz"
+	;;
+	java11)
+		 echo "https://github.com/bell-sw/Liberica/releases/download/11.0.15.1+2/bellsoft-jdk11.0.15.1+2-linux-amd64.tar.gz"
 	;;
 	java17)
-		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.3.1+2/bellsoft-jdk17.0.3.1+2-linux-amd64.tar.gz"
+	;;
+	java18)
+		echo "https://github.com/bell-sw/Liberica/releases/download/18.0.1.1+2/bellsoft-jdk18.0.1.1+2-linux-amd64.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"
@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c

 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java17
+for jdk in java8 java11 java17
 do
  JDK_URL=$( /get-jdk-url.sh $jdk )
  mkdir $jdk
@@ -125,6 +125,14 @@ resources:
    access_token: ((github-ci-status-token))
    branch: ((branch))
    context: build
+- name: repo-status-jdk11-build
+  type: github-status-resource
+  icon: eye-check-outline
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-ci-status-token))
+    branch: ((branch))
+    context: jdk11-build
 - name: repo-status-jdk17-build
  type: github-status-resource
  icon: eye-check-outline
@@ -229,6 +237,34 @@ jobs:
          "zip.type": "schema"
    get_params:
      threads: 8
+- name: jdk11-build
+  serial: true
+  public: true
+  plan:
+  - get: ci-image
+  - get: git-repo
+  - get: every-morning
+    trigger: true
+  - put: repo-status-jdk11-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: 11
+        <<: *build-project-task-params
+    on_failure:
+      do:
+      - put: repo-status-jdk11-build
+        params: { state: "failure", commit: "git-repo" }
+      - put: slack-alert
+        params:
+          <<: *slack-fail-params
+  - put: repo-status-jdk11-build
+    params: { state: "success", commit: "git-repo" }
 - name: jdk17-build
  serial: true
  public: true
@@ -246,7 +282,7 @@ jobs:
        privileged: true
        timeout: ((task-timeout))
        params:
-          TEST_TOOLCHAIN: 17
+          TEST_TOOLCHAIN: 15
          <<: *build-project-task-params
      on_failure:
        do:
@@ -435,7 +471,7 @@ jobs:

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

 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK11,JDK15 \
  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
 popd > /dev/null
@@ -1,4 +1,4 @@
-version=5.3.25
+version=5.3.22
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.caching=true
 org.gradle.parallel=true
@@ -153,7 +153,7 @@ asciidoctorPdf {
 task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
-			"for deployment at https://docs.spring.io/spring-framework/docs/."
+			"for deployment at https://docs.spring.io/spring-framework/docs."

 	archiveBaseName.set("spring-framework")
 	archiveClassifier.set("docs")
@@ -81,10 +81,6 @@ plugins.withType(JavaPlugin) {
 			javaLauncher = javaToolchains.launcherFor {
 				languageVersion = testLanguageVersion
 			}
-			if(testLanguageVersion == JavaLanguageVersion.of(17)) {
-				jvmArgs(["--add-opens=java.base/java.lang=ALL-UNNAMED",
-						 "--add-opens=java.base/java.util=ALL-UNNAMED"])
-			}
 		}
 	}
 }
@@ -134,6 +130,21 @@ pluginManager.withPlugin("kotlin") {
 			}
 		}
 	}
+
+	if (testToolchainConfigured()) {
+		def testLanguageVersion = testToolchainLanguageVersion()
+		def compiler = javaToolchains.compilerFor {
+			languageVersion = testLanguageVersion
+		}
+		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
+		def javaVersion = testLanguageVersion.toString() == '8' ? '1.8' : testLanguageVersion.toString()
+		compileTestKotlin {
+			kotlinOptions {
+				jvmTarget = javaVersion
+				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
+			}
+		}
+	}
 }

 // Configure the JMH plugin to use the toolchain for generating and running JMH bytecode
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -31,6 +31,6 @@ You'll notice these files are already intentionally in .gitignore. The same poli

 ## FAQ

-Q. What about IntelliJ IDEA's own [Gradle support](https://www.jetbrains.com/help/idea/gradle.html)?
+Q. What about IntelliJ IDEA's own [Gradle support](https://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?

 A. Keep an eye on https://youtrack.jetbrains.com/issue/IDEA-53476
@@ -7,8 +7,8 @@ pluginManagement {
 }

 plugins {
-	id "com.gradle.enterprise" version "3.11.1"
-	id "io.spring.ge.conventions" version "0.0.11"
+	id "com.gradle.enterprise" version "3.10.2"
+	id "io.spring.ge.conventions" version "0.0.10"
 }

 include "spring-aop"
@@ -147,7 +147,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 	/**
 	 * Set whether the proxy should be frozen, preventing advice
 	 * from being added to it once it is created.
-	 * <p>Overridden from the superclass to prevent the proxy configuration
+	 * <p>Overridden from the super class to prevent the proxy configuration
 	 * from being frozen before the proxy is created.
 	 */
 	@Override
@@ -35,7 +35,7 @@ public abstract aspect AbstractDependencyInjectionAspect {
 			mostSpecificSubTypeConstruction() && !preConstructionConfiguration();

 	/**
-	 * Select least specific supertype that is marked for DI
+	 * Select least specific super type that is marked for DI
 	 * (so that injection occurs only once with pre-construction injection).
 	 */
 	public abstract pointcut leastSpecificSuperTypeConstruction();
@@ -62,7 +62,7 @@ import org.springframework.util.StringUtils;
 * <p>Mainly for internal use within the framework, but to some degree also
 * useful for application classes. Consider
 * <a href="https://commons.apache.org/proper/commons-beanutils/">Apache Commons BeanUtils</a>,
- * <a href="https://github.com/ExpediaGroup/bull">BULL - Bean Utils Light Library</a>,
+ * <a href="https://hotelsdotcom.github.io/bull/">BULL - Bean Utils Light Library</a>,
 * or similar third-party frameworks for more comprehensive bean utilities.
 *
 * @author Rod Johnson
@@ -97,6 +97,8 @@ public final class CachedIntrospectionResults {
 	 */
 	public static final String IGNORE_BEANINFO_PROPERTY_NAME = "spring.beaninfo.ignore";

+	private static final PropertyDescriptor[] EMPTY_PROPERTY_DESCRIPTOR_ARRAY = {};
+

 	private static final boolean shouldIntrospectorIgnoreBeaninfoClasses =
 			SpringProperties.getFlag(IGNORE_BEANINFO_PROPERTY_NAME);
@@ -295,7 +297,7 @@ public final class CachedIntrospectionResults {
 					// Only allow URL attribute introspection, not content resolution
 					continue;
 				}
-				if (pd.getWriteMethod() == null && isInvalidReadOnlyPropertyType(pd.getPropertyType(), beanClass)) {
+				if (pd.getWriteMethod() == null && isInvalidReadOnlyPropertyType(pd.getPropertyType())) {
 					// Ignore read-only properties such as ClassLoader - no need to bind to those
 					continue;
 				}
@@ -345,8 +347,7 @@ public final class CachedIntrospectionResults {
 						// GenericTypeAwarePropertyDescriptor leniently resolves a set* write method
 						// against a declared read method, so we prefer read method descriptors here.
 						pd = buildGenericTypeAwarePropertyDescriptor(beanClass, pd);
-						if (pd.getWriteMethod() == null &&
-								isInvalidReadOnlyPropertyType(pd.getPropertyType(), beanClass)) {
+						if (pd.getWriteMethod() == null && isInvalidReadOnlyPropertyType(pd.getPropertyType())) {
 							// Ignore read-only properties such as ClassLoader - no need to bind to those
 							continue;
 						}
@@ -379,7 +380,7 @@ public final class CachedIntrospectionResults {
 		if (Modifier.isStatic(method.getModifiers()) ||
 				method.getDeclaringClass() == Object.class || method.getDeclaringClass() == Class.class ||
 				method.getParameterCount() > 0 || method.getReturnType() == void.class ||
-				isInvalidReadOnlyPropertyType(method.getReturnType(), method.getDeclaringClass())) {
+				isInvalidReadOnlyPropertyType(method.getReturnType())) {
 			return false;
 		}
 		try {
@@ -392,11 +393,10 @@ public final class CachedIntrospectionResults {
 		}
 	}

-	private boolean isInvalidReadOnlyPropertyType(@Nullable Class<?> returnType, Class<?> beanClass) {
-		return (returnType != null && (ClassLoader.class.isAssignableFrom(returnType) ||
-				ProtectionDomain.class.isAssignableFrom(returnType) ||
-				(AutoCloseable.class.isAssignableFrom(returnType) &&
-						!AutoCloseable.class.isAssignableFrom(beanClass))));
+	private boolean isInvalidReadOnlyPropertyType(@Nullable Class<?> returnType) {
+		return (returnType != null && (AutoCloseable.class.isAssignableFrom(returnType) ||
+				ClassLoader.class.isAssignableFrom(returnType) ||
+				ProtectionDomain.class.isAssignableFrom(returnType)));
 	}


@@ -422,7 +422,7 @@ public final class CachedIntrospectionResults {
 	}

 	PropertyDescriptor[] getPropertyDescriptors() {
-		return this.propertyDescriptors.values().toArray(PropertyDescriptorUtils.EMPTY_PROPERTY_DESCRIPTOR_ARRAY);
+		return this.propertyDescriptors.values().toArray(EMPTY_PROPERTY_DESCRIPTOR_ARRAY);
 	}

 	private PropertyDescriptor buildGenericTypeAwarePropertyDescriptor(Class<?> beanClass, PropertyDescriptor pd) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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,15 +17,9 @@
 package org.springframework.beans;

 import java.beans.IntrospectionException;
-import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;

 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
@@ -38,80 +32,6 @@ import org.springframework.util.ObjectUtils;
 */
 abstract class PropertyDescriptorUtils {

-	public static final PropertyDescriptor[] EMPTY_PROPERTY_DESCRIPTOR_ARRAY = {};
-
-
-	/**
-	 * Simple introspection algorithm for basic set/get/is accessor methods,
-	 * building corresponding JavaBeans property descriptors for them.
-	 * <p>This just supports the basic JavaBeans conventions, without indexed
-	 * properties or any customizers, and without other BeanInfo metadata.
-	 * For standard JavaBeans introspection, use the JavaBeans Introspector.
-	 * @param beanClass the target class to introspect
-	 * @return a collection of property descriptors
-	 * @throws IntrospectionException from introspecting the given bean class
-	 * @since 5.3.24
-	 * @see SimpleBeanInfoFactory
-	 * @see java.beans.Introspector#getBeanInfo(Class)
-	 */
-	public static Collection<? extends PropertyDescriptor> determineBasicProperties(Class<?> beanClass)
-			throws IntrospectionException {
-
-		Map<String, BasicPropertyDescriptor> pdMap = new TreeMap<>();
-
-		for (Method method : beanClass.getMethods()) {
-			String methodName = method.getName();
-
-			boolean setter;
-			int nameIndex;
-			if (methodName.startsWith("set") && method.getParameterCount() == 1) {
-				setter = true;
-				nameIndex = 3;
-			}
-			else if (methodName.startsWith("get") && method.getParameterCount() == 0 && method.getReturnType() != Void.TYPE) {
-				setter = false;
-				nameIndex = 3;
-			}
-			else if (methodName.startsWith("is") && method.getParameterCount() == 0 && method.getReturnType() == boolean.class) {
-				setter = false;
-				nameIndex = 2;
-			}
-			else {
-				continue;
-			}
-
-			String propertyName = Introspector.decapitalize(methodName.substring(nameIndex));
-			if (propertyName.isEmpty()) {
-				continue;
-			}
-
-			BasicPropertyDescriptor pd = pdMap.get(propertyName);
-			if (pd != null) {
-				if (setter) {
-					if (pd.getWriteMethod() == null ||
-							pd.getWriteMethod().getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {
-						pd.setWriteMethod(method);
-					}
-					else {
-						pd.addWriteMethod(method);
-					}
-				}
-				else {
-					if (pd.getReadMethod() == null ||
-							(pd.getReadMethod().getReturnType() == method.getReturnType() && method.getName().startsWith("is"))) {
-						pd.setReadMethod(method);
-					}
-				}
-			}
-			else {
-				pd = new BasicPropertyDescriptor(propertyName, (!setter ? method : null), (setter ? method : null));
-				pdMap.put(propertyName, pd);
-			}
-		}
-
-		return pdMap.values();
-	}
-
 	/**
 	 * See {@link java.beans.FeatureDescriptor}.
 	 */
@@ -253,72 +173,4 @@ abstract class PropertyDescriptorUtils {
 				pd.isBound() == otherPd.isBound() && pd.isConstrained() == otherPd.isConstrained());
 	}

-
-	/**
-	 * PropertyDescriptor for {@link #determineBasicProperties(Class)},
-	 * not performing any early type determination for
-	 * {@link #setReadMethod}/{@link #setWriteMethod}.
-	 * @since 5.3.24
-	 */
-	private static class BasicPropertyDescriptor extends PropertyDescriptor {
-
-		@Nullable
-		private Method readMethod;
-
-		@Nullable
-		private Method writeMethod;
-
-		private final List<Method> alternativeWriteMethods = new ArrayList<>();
-
-		public BasicPropertyDescriptor(String propertyName, @Nullable Method readMethod, @Nullable Method writeMethod)
-				throws IntrospectionException {
-
-			super(propertyName, readMethod, writeMethod);
-		}
-
-		@Override
-		public void setReadMethod(@Nullable Method readMethod) {
-			this.readMethod = readMethod;
-		}
-
-		@Override
-		@Nullable
-		public Method getReadMethod() {
-			return this.readMethod;
-		}
-
-		@Override
-		public void setWriteMethod(@Nullable Method writeMethod) {
-			this.writeMethod = writeMethod;
-		}
-
-		public void addWriteMethod(Method writeMethod) {
-			if (this.writeMethod != null) {
-				this.alternativeWriteMethods.add(this.writeMethod);
-				this.writeMethod = null;
-			}
-			this.alternativeWriteMethods.add(writeMethod);
-		}
-
-		@Override
-		@Nullable
-		public Method getWriteMethod() {
-			if (this.writeMethod == null && !this.alternativeWriteMethods.isEmpty()) {
-				if (this.readMethod == null) {
-					return this.alternativeWriteMethods.get(0);
-				}
-				else {
-					for (Method method : this.alternativeWriteMethods) {
-						if (this.readMethod.getReturnType().isAssignableFrom(method.getParameterTypes()[0])) {
-							this.writeMethod = method;
-							break;
-						}
-					}
-				}
-			}
-			return this.writeMethod;
-		}
-	}
-
-
 }
@@ -1,71 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.beans.BeanDescriptor;
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
-import java.beans.SimpleBeanInfo;
-import java.util.Collection;
-
-import org.springframework.core.Ordered;
-import org.springframework.lang.NonNull;
-
-/**
- * {@link BeanInfoFactory} implementation that bypasses the standard {@link java.beans.Introspector}
- * for faster introspection, reduced to basic property determination (as commonly needed in Spring).
- *
- * <p>To be configured via a {@code META-INF/spring.factories} file with the following content,
- * overriding other custom {@code org.springframework.beans.BeanInfoFactory} declarations:
- * {@code org.springframework.beans.BeanInfoFactory=org.springframework.beans.SimpleBeanInfoFactory}
- *
- * <p>Ordered at {@code Ordered.LOWEST_PRECEDENCE - 1} to override {@link ExtendedBeanInfoFactory}
- * (registered by default in 5.3) if necessary while still allowing other user-defined
- * {@link BeanInfoFactory} types to take precedence.
- *
- * @author Juergen Hoeller
- * @since 5.3.24
- * @see ExtendedBeanInfoFactory
- * @see CachedIntrospectionResults
- */
-public class SimpleBeanInfoFactory implements BeanInfoFactory, Ordered {
-
-	@Override
-	@NonNull
-	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
-		Collection<? extends PropertyDescriptor> pds =
-				PropertyDescriptorUtils.determineBasicProperties(beanClass);
-
-		return new SimpleBeanInfo() {
-			@Override
-			public BeanDescriptor getBeanDescriptor() {
-				return new BeanDescriptor(beanClass);
-			}
-			@Override
-			public PropertyDescriptor[] getPropertyDescriptors() {
-				return pds.toArray(PropertyDescriptorUtils.EMPTY_PROPERTY_DESCRIPTOR_ARRAY);
-			}
-		};
-	}
-
-	@Override
-	public int getOrder() {
-		return Ordered.LOWEST_PRECEDENCE - 1;
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -438,6 +438,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 		}
 	}

+
 	private InjectionMetadata findAutowiringMetadata(String beanName, Class<?> clazz, @Nullable PropertyValues pvs) {
 		// Fall back to class name as cache key, for backwards compatibility with custom callers.
 		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
@@ -562,9 +563,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	 * @param type the type of the bean
 	 * @return the target beans, or an empty Collection if no bean of this type is found
 	 * @throws BeansException if bean retrieval failed
-	 * @deprecated since 5.3.24 since it is unused in the meantime
 	 */
-	@Deprecated
 	protected <T> Map<String, T> findAutowireCandidates(Class<T> type) throws BeansException {
 		if (this.beanFactory == null) {
 			throw new IllegalStateException("No BeanFactory configured - " +
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -161,7 +161,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp

 	/** Cache of pre-filtered post-processors. */
 	@Nullable
-	private BeanPostProcessorCache beanPostProcessorCache;
+	private volatile BeanPostProcessorCache beanPostProcessorCache;

 	/** Map from scope identifier String to corresponding Scope. */
 	private final Map<String, Scope> scopes = new LinkedHashMap<>(8);
@@ -944,12 +944,10 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	@Override
 	public void addBeanPostProcessor(BeanPostProcessor beanPostProcessor) {
 		Assert.notNull(beanPostProcessor, "BeanPostProcessor must not be null");
-		synchronized (this.beanPostProcessors) {
-			// Remove from old position, if any
-			this.beanPostProcessors.remove(beanPostProcessor);
-			// Add to end of list
-			this.beanPostProcessors.add(beanPostProcessor);
-		}
+		// Remove from old position, if any
+		this.beanPostProcessors.remove(beanPostProcessor);
+		// Add to end of list
+		this.beanPostProcessors.add(beanPostProcessor);
 	}

 	/**
@@ -959,12 +957,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @see #addBeanPostProcessor
 	 */
 	public void addBeanPostProcessors(Collection<? extends BeanPostProcessor> beanPostProcessors) {
-		synchronized (this.beanPostProcessors) {
-			// Remove from old position, if any
-			this.beanPostProcessors.removeAll(beanPostProcessors);
-			// Add to end of list
-			this.beanPostProcessors.addAll(beanPostProcessors);
-		}
+		this.beanPostProcessors.removeAll(beanPostProcessors);
+		this.beanPostProcessors.addAll(beanPostProcessors);
 	}

 	@Override
@@ -986,34 +980,26 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @since 5.3
 	 */
 	BeanPostProcessorCache getBeanPostProcessorCache() {
-		synchronized (this.beanPostProcessors) {
-			BeanPostProcessorCache bppCache = this.beanPostProcessorCache;
-			if (bppCache == null) {
-				bppCache = new BeanPostProcessorCache();
-				for (BeanPostProcessor bpp : this.beanPostProcessors) {
-					if (bpp instanceof InstantiationAwareBeanPostProcessor) {
-						bppCache.instantiationAware.add((InstantiationAwareBeanPostProcessor) bpp);
-						if (bpp instanceof SmartInstantiationAwareBeanPostProcessor) {
-							bppCache.smartInstantiationAware.add((SmartInstantiationAwareBeanPostProcessor) bpp);
-						}
-					}
-					if (bpp instanceof DestructionAwareBeanPostProcessor) {
-						bppCache.destructionAware.add((DestructionAwareBeanPostProcessor) bpp);
-					}
-					if (bpp instanceof MergedBeanDefinitionPostProcessor) {
-						bppCache.mergedDefinition.add((MergedBeanDefinitionPostProcessor) bpp);
+		BeanPostProcessorCache bpCache = this.beanPostProcessorCache;
+		if (bpCache == null) {
+			bpCache = new BeanPostProcessorCache();
+			for (BeanPostProcessor bp : this.beanPostProcessors) {
+				if (bp instanceof InstantiationAwareBeanPostProcessor) {
+					bpCache.instantiationAware.add((InstantiationAwareBeanPostProcessor) bp);
+					if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
+						bpCache.smartInstantiationAware.add((SmartInstantiationAwareBeanPostProcessor) bp);
 					}
 				}
-				this.beanPostProcessorCache = bppCache;
+				if (bp instanceof DestructionAwareBeanPostProcessor) {
+					bpCache.destructionAware.add((DestructionAwareBeanPostProcessor) bp);
+				}
+				if (bp instanceof MergedBeanDefinitionPostProcessor) {
+					bpCache.mergedDefinition.add((MergedBeanDefinitionPostProcessor) bp);
+				}
 			}
-			return bppCache;
-		}
-	}
-
-	private void resetBeanPostProcessorCache() {
-		synchronized (this.beanPostProcessors) {
-			this.beanPostProcessorCache = null;
+			this.beanPostProcessorCache = bpCache;
 		}
+		return bpCache;
 	}

 	/**
@@ -2028,27 +2014,27 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		@Override
 		public BeanPostProcessor set(int index, BeanPostProcessor element) {
 			BeanPostProcessor result = super.set(index, element);
-			resetBeanPostProcessorCache();
+			beanPostProcessorCache = null;
 			return result;
 		}

 		@Override
 		public boolean add(BeanPostProcessor o) {
 			boolean success = super.add(o);
-			resetBeanPostProcessorCache();
+			beanPostProcessorCache = null;
 			return success;
 		}

 		@Override
 		public void add(int index, BeanPostProcessor element) {
 			super.add(index, element);
-			resetBeanPostProcessorCache();
+			beanPostProcessorCache = null;
 		}

 		@Override
 		public BeanPostProcessor remove(int index) {
 			BeanPostProcessor result = super.remove(index);
-			resetBeanPostProcessorCache();
+			beanPostProcessorCache = null;
 			return result;
 		}

@@ -2056,7 +2042,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean remove(Object o) {
 			boolean success = super.remove(o);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2065,7 +2051,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean removeAll(Collection<?> c) {
 			boolean success = super.removeAll(c);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2074,7 +2060,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean retainAll(Collection<?> c) {
 			boolean success = super.retainAll(c);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2083,7 +2069,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean addAll(Collection<? extends BeanPostProcessor> c) {
 			boolean success = super.addAll(c);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2092,7 +2078,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean addAll(int index, Collection<? extends BeanPostProcessor> c) {
 			boolean success = super.addAll(index, c);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2101,7 +2087,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		public boolean removeIf(Predicate<? super BeanPostProcessor> filter) {
 			boolean success = super.removeIf(filter);
 			if (success) {
-				resetBeanPostProcessorCache();
+				beanPostProcessorCache = null;
 			}
 			return success;
 		}
@@ -2109,7 +2095,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		@Override
 		public void replaceAll(UnaryOperator<BeanPostProcessor> operator) {
 			super.replaceAll(operator);
-			resetBeanPostProcessorCache();
+			beanPostProcessorCache = null;
 		}
 	}

@@ -2167,25 +2167,20 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		@Nullable
 		public Object getOrderSource(Object obj) {
 			String beanName = this.instancesToBeanNames.get(obj);
-			if (beanName == null) {
+			if (beanName == null || !containsBeanDefinition(beanName)) {
 				return null;
 			}
-			try {
-				RootBeanDefinition beanDefinition = (RootBeanDefinition) getMergedBeanDefinition(beanName);
-				List<Object> sources = new ArrayList<>(2);
-				Method factoryMethod = beanDefinition.getResolvedFactoryMethod();
-				if (factoryMethod != null) {
-					sources.add(factoryMethod);
-				}
-				Class<?> targetType = beanDefinition.getTargetType();
-				if (targetType != null && targetType != obj.getClass()) {
-					sources.add(targetType);
-				}
-				return sources.toArray();
+			RootBeanDefinition beanDefinition = getMergedLocalBeanDefinition(beanName);
+			List<Object> sources = new ArrayList<>(2);
+			Method factoryMethod = beanDefinition.getResolvedFactoryMethod();
+			if (factoryMethod != null) {
+				sources.add(factoryMethod);
 			}
-			catch (NoSuchBeanDefinitionException ex) {
-				return null;
+			Class<?> targetType = beanDefinition.getTargetType();
+			if (targetType != null && targetType != obj.getClass()) {
+				sources.add(targetType);
 			}
+			return sources.toArray();
 		}
 	}

@@ -77,21 +77,6 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
 	}

-	@Test
-	void replaceWrappedInstance() {
-		GetterBean target = new GetterBean();
-		BeanWrapperImpl accessor = createAccessor(target);
-		accessor.setPropertyValue("name", "tom");
-		assertThat(target.getAliasedName()).isEqualTo("tom");
-		assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
-
-		target = new GetterBean();
-		accessor.setWrappedInstance(target);
-		accessor.setPropertyValue("name", "tom");
-		assertThat(target.getAliasedName()).isEqualTo("tom");
-		assertThat(accessor.getPropertyValue("aliasedName")).isEqualTo("tom");
-	}
-
 	@Test
 	void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
 		TestBean target = new TestBean();
@@ -168,16 +153,6 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		assertThat(accessor.getPropertyValue("object")).isEqualTo(8);
 	}

-	@Test
-	void setterOverload() {
-		SetterOverload target = new SetterOverload();
-		BeanWrapper accessor = createAccessor(target);
-		accessor.setPropertyValue("object", "a String");
-		assertThat(target.value).isEqualTo("a String");
-		assertThat(target.getObject()).isEqualTo("a String");
-		assertThat(accessor.getPropertyValue("object")).isEqualTo("a String");
-	}
-
 	@Test
 	void propertyDescriptors() throws Exception {
 		TestBean target = new TestBean();
@@ -231,10 +206,6 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		assertThat(accessor.isReadableProperty("inputStream")).isFalse();
 		assertThat(accessor.isReadableProperty("filename")).isTrue();
 		assertThat(accessor.isReadableProperty("description")).isTrue();
-
-		accessor = createAccessor(new ActiveResource());
-
-		assertThat(accessor.isReadableProperty("resource")).isTrue();
 	}

 	@Test
@@ -377,36 +348,6 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}


-	public static class SetterOverload {
-
-		public String value;
-
-		public void setObject(Integer length) {
-			this.value = length.toString();
-		}
-
-		public void setObject(String object) {
-			this.value = object;
-		}
-
-		public String getObject() {
-			return this.value;
-		}
-	}
-
-
-	public static class ActiveResource implements AutoCloseable {
-
-		public ActiveResource getResource() {
-			return this;
-		}
-
-		@Override
-		public void close() throws Exception {
-		}
-	}
-
-
 	public static class GetterWithOptional {

 		public TestBean value;
@@ -1982,21 +1982,6 @@ class DefaultListableBeanFactoryTests {
 		assertThat(bean.getSpouse()).isEqualTo(lbf.getBean("spouse"));
 	}

-	@Test
-	void beanProviderWithParentBeanFactoryReuseOrder() {
-		DefaultListableBeanFactory parentBf = new DefaultListableBeanFactory();
-		parentBf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
-		parentBf.registerBeanDefinition("regular", new RootBeanDefinition(TestBean.class));
-		parentBf.registerBeanDefinition("test", new RootBeanDefinition(HighPriorityTestBean.class));
-		lbf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
-		lbf.setParentBeanFactory(parentBf);
-		lbf.registerBeanDefinition("low", new RootBeanDefinition(LowPriorityTestBean.class));
-		List<Class<?>> orderedTypes = lbf.getBeanProvider(TestBean.class).orderedStream()
-				.map(Object::getClass).collect(Collectors.toList());
-		assertThat(orderedTypes).containsExactly(
-				HighPriorityTestBean.class, LowPriorityTestBean.class, TestBean.class);
-	}
-
 	@Test
 	void autowireExistingBeanByName() {
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.DependencyDescriptor;
-import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.util.ClassUtils;

@@ -148,7 +148,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 		lbf.registerBeanDefinition(MARK, person2);
 		MethodParameter param = new MethodParameter(QualifiedTestBean.class.getDeclaredConstructor(Person.class), 0);
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(param, false);
-		param.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
+		param.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
 		assertThat(param.getParameterName()).isEqualTo("tpb");
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, qualifiedDescriptor)).isTrue();
@@ -174,9 +174,9 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 				new MethodParameter(QualifiedTestBean.class.getDeclaredMethod("autowireNonqualified", Person.class), 0);
 		DependencyDescriptor qualifiedDescriptor = new DependencyDescriptor(qualifiedParam, false);
 		DependencyDescriptor nonqualifiedDescriptor = new DependencyDescriptor(nonqualifiedParam, false);
-		qualifiedParam.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
+		qualifiedParam.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
 		assertThat(qualifiedParam.getParameterName()).isEqualTo("tpb");
-		nonqualifiedParam.initParameterNameDiscovery(new DefaultParameterNameDiscoverer());
+		nonqualifiedParam.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
 		assertThat(nonqualifiedParam.getParameterName()).isEqualTo("tpb");
 		assertThat(lbf.isAutowireCandidate(JUERGEN, null)).isTrue();
 		assertThat(lbf.isAutowireCandidate(JUERGEN, nonqualifiedDescriptor)).isTrue();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -502,7 +502,7 @@ class CustomEditorTests {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);

-		bw.setPropertyValue("myChar", 'c');
+		bw.setPropertyValue("myChar", new Character('c'));
 		assertThat(cb.getMyChar()).isEqualTo('c');

 		bw.setPropertyValue("myChar", "c");
@@ -526,16 +526,16 @@ class CustomEditorTests {
 		bw.registerCustomEditor(Character.class, new CharacterEditor(true));

 		bw.setPropertyValue("myCharacter", 'c');
-		assertThat(cb.getMyCharacter()).isEqualTo('c');
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));

 		bw.setPropertyValue("myCharacter", "c");
-		assertThat(cb.getMyCharacter()).isEqualTo('c');
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));

 		bw.setPropertyValue("myCharacter", "\u0041");
-		assertThat(cb.getMyCharacter()).isEqualTo('A');
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('A'));

 		bw.setPropertyValue("myCharacter", " ");
-		assertThat(cb.getMyCharacter()).isEqualTo(' ');
+		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf(' '));

 		bw.setPropertyValue("myCharacter", "");
 		assertThat(cb.getMyCharacter()).isNull();
@@ -722,7 +722,7 @@ class CustomEditorTests {

 	@Test
 	void testCustomDateEditor() {
-		CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), false);
+		CustomDateEditor editor = new CustomDateEditor(null, false);
 		editor.setValue(null);
 		assertThat(editor.getValue()).isNull();
 		assertThat(editor.getAsText()).isEmpty();
@@ -730,7 +730,7 @@ class CustomEditorTests {

 	@Test
 	void testCustomDateEditorWithEmptyAsNull() {
-		CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), true);
+		CustomDateEditor editor = new CustomDateEditor(null, true);
 		editor.setValue(null);
 		assertThat(editor.getValue()).isNull();
 		assertThat(editor.getAsText()).isEmpty();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -81,7 +81,7 @@ class TypeHelper {
 	}

 	/**
-	 * Return the superclass of the specified {@link Element} or null if this
+	 * Return the super class of the specified {@link Element} or null if this
 	 * {@code element} represents {@link Object}.
 	 */
 	public Element getSuperClass(Element element) {
@@ -100,7 +100,7 @@ class TypeHelper {
 	public List<Element> getDirectInterfaces(Element element) {
 		List<? extends TypeMirror> superTypes = this.types.directSupertypes(element.asType());
 		List<Element> directInterfaces = new ArrayList<>();
-		if (superTypes.size() > 1) { // index 0 is the superclass
+		if (superTypes.size() > 1) { // index 0 is the super class
 			for (int i = 1; i < superTypes.size(); i++) {
 				Element e = this.types.asElement(superTypes.get(i));
 				if (e != null) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -93,7 +93,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {


 	@Override
-	public void setFrom(@Nullable String from) {
+	public void setFrom(String from) {
 		this.from = from;
 	}

@@ -103,7 +103,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setReplyTo(@Nullable String replyTo) {
+	public void setReplyTo(String replyTo) {
 		this.replyTo = replyTo;
 	}

@@ -113,7 +113,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setTo(@Nullable String to) {
+	public void setTo(String to) {
 		this.to = new String[] {to};
 	}

@@ -128,12 +128,12 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setCc(@Nullable String cc) {
+	public void setCc(String cc) {
 		this.cc = new String[] {cc};
 	}

 	@Override
-	public void setCc(@Nullable String... cc) {
+	public void setCc(String... cc) {
 		this.cc = cc;
 	}

@@ -143,12 +143,12 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setBcc(@Nullable String bcc) {
+	public void setBcc(String bcc) {
 		this.bcc = new String[] {bcc};
 	}

 	@Override
-	public void setBcc(@Nullable String... bcc) {
+	public void setBcc(String... bcc) {
 		this.bcc = bcc;
 	}

@@ -158,7 +158,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setSentDate(@Nullable Date sentDate) {
+	public void setSentDate(Date sentDate) {
 		this.sentDate = sentDate;
 	}

@@ -168,7 +168,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setSubject(@Nullable String subject) {
+	public void setSubject(String subject) {
 		this.subject = subject;
 	}

@@ -178,7 +178,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}

 	@Override
-	public void setText(@Nullable String text) {
+	public void setText(String text) {
 		this.text = text;
 	}

@@ -50,7 +50,7 @@ video/x-msvideo				avi
 ################################################################################
 #
 # Additional file types adapted from
-# https://web.archive.org/web/20220119153325/http%3A//sites.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
+# http://sites.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html
 # kindly re-licensed to Apache Software License 2.0 by Ian Graham.
 #
 ################################################################################
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -24,7 +24,7 @@ import org.springframework.lang.Nullable;
 * Interface that defines common cache operations.
 *
 * <b>Note:</b> Due to the generic use of caching, it is recommended that
- * implementations allow storage of {@code null} values (for example to
+ * implementations allow storage of <tt>null</tt> values (for example to
 * cache methods that return {@code null}).
 *
 * @author Costin Leau
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -111,8 +111,7 @@ public @interface CacheEvict {

 	/**
 	 * Spring Expression Language (SpEL) expression used for making the cache
-	 * eviction operation conditional. Evict that cache if the condition evaluates
-	 * to {@code true}.
+	 * eviction operation conditional.
 	 * <p>Default is {@code ""}, meaning the cache eviction is always performed.
 	 * <p>The SpEL expression evaluates against a dedicated context that provides the
 	 * following meta-data:
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -118,8 +118,7 @@ public @interface CachePut {

 	/**
 	 * Spring Expression Language (SpEL) expression used for making the cache
-	 * put operation conditional. Update the cache if the condition evaluates to
-	 * {@code true}.
+	 * put operation conditional.
 	 * <p>This expression is evaluated after the method has been called due to the
 	 * nature of the put operation and can therefore refer to the {@code result}.
 	 * <p>Default is {@code ""}, meaning the method result is always cached.
@@ -143,7 +142,6 @@ public @interface CachePut {

 	/**
 	 * Spring Expression Language (SpEL) expression used to veto the cache put operation.
-	 * Veto updating the cache if the condition evaluates to {@code true}.
 	 * <p>Default is {@code ""}, meaning that caching is never vetoed.
 	 * <p>The SpEL expression evaluates against a dedicated context that provides the
 	 * following meta-data:
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -123,8 +123,7 @@ public @interface Cacheable {

 	/**
 	 * Spring Expression Language (SpEL) expression used for making the method
-	 * caching conditional. Cache the result if the condition evaluates to
-	 * {@code true}.
+	 * caching conditional.
 	 * <p>Default is {@code ""}, meaning the method result is always cached.
 	 * <p>The SpEL expression evaluates against a dedicated context that provides the
 	 * following meta-data:
@@ -143,7 +142,6 @@ public @interface Cacheable {

 	/**
 	 * Spring Expression Language (SpEL) expression used to veto method caching.
-	 * Veto caching the result if the condition evaluates to {@code true}.
 	 * <p>Unlike {@link #condition}, this expression is evaluated after the method
 	 * has been called and can therefore refer to the {@code result}.
 	 * <p>Default is {@code ""}, meaning that caching is never vetoed.
@@ -77,23 +77,6 @@ public class LoggingCacheErrorHandler implements CacheErrorHandler {
 		this.logStackTraces = logStackTraces;
 	}

-	/**
-	 * Create a {@code LoggingCacheErrorHandler} that uses the supplied
-	 * {@code loggerName} and {@code logStackTraces} flag.
-	 * @param loggerName the name of the logger to use. The name will be passed
-	 * to the underlying logger implementation through Commons Logging, getting
-	 * interpreted as log category according to the logger's configuration.
-	 * @param logStackTraces whether to log stack traces
-	 * @since 5.3.24
-	 * @see org.apache.commons.logging.LogFactory#getLog(String)
-	 * @see java.util.logging.Logger#getLogger(String)
-	 */
-	public LoggingCacheErrorHandler(String loggerName, boolean logStackTraces) {
-		Assert.notNull(loggerName, "'loggerName' must not be null");
-		this.logger = LogFactory.getLog(loggerName);
-		this.logStackTraces = logStackTraces;
-	}
-

 	@Override
 	public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -54,6 +54,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase;
 import org.springframework.context.annotation.DeferredImportSelector.Group;
+import org.springframework.core.NestedIOException;
 import org.springframework.core.OrderComparator;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -679,7 +680,6 @@ class ConfigurationClassParser {
 	/**
 	 * Factory method to obtain a {@link SourceClass} from a class name.
 	 */
-	@SuppressWarnings("deprecation")
 	SourceClass asSourceClass(@Nullable String className, Predicate<String> filter) throws IOException {
 		if (className == null || filter.test(className)) {
 			return this.objectSourceClass;
@@ -690,7 +690,7 @@ class ConfigurationClassParser {
 				return new SourceClass(ClassUtils.forName(className, this.resourceLoader.getClassLoader()));
 			}
 			catch (ClassNotFoundException ex) {
-				throw new org.springframework.core.NestedIOException("Failed to load class [" + className + "]", ex);
+				throw new NestedIOException("Failed to load class [" + className + "]", ex);
 			}
 		}
 		return new SourceClass(this.metadataReaderFactory.getMetadataReader(className));
@@ -1073,7 +1073,6 @@ class ConfigurationClassParser {
 			return result;
 		}

-		@SuppressWarnings("deprecation")
 		private SourceClass getRelated(String className) throws IOException {
 			if (this.source instanceof Class) {
 				try {
@@ -1083,7 +1082,7 @@ class ConfigurationClassParser {
 				catch (ClassNotFoundException ex) {
 					// Ignore -> fall back to ASM next, except for core java types.
 					if (className.startsWith("java")) {
-						throw new org.springframework.core.NestedIOException("Failed to load class [" + className + "]", ex);
+						throw new NestedIOException("Failed to load class [" + className + "]", ex);
 					}
 					return new SourceClass(metadataReaderFactory.getMetadataReader(className));
 				}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -96,8 +96,6 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 	@Override
 	@SuppressWarnings("unchecked")
 	public Parser<?> getParser(DateTimeFormat annotation, Class<?> fieldType) {
-		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
-
 		List<String> resolvedFallbackPatterns = new ArrayList<>();
 		for (String fallbackPattern : annotation.fallbackPatterns()) {
 			String resolvedFallbackPattern = resolveEmbeddedValue(fallbackPattern);
@@ -106,6 +104,7 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 			}
 		}

+		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
 		return new TemporalAccessorParser((Class<? extends TemporalAccessor>) fieldType,
 				formatter, resolvedFallbackPatterns.toArray(new String[0]), annotation);
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -71,8 +71,7 @@ public final class TemporalAccessorParser implements Parser<TemporalAccessor> {
 	}

 	TemporalAccessorParser(Class<? extends TemporalAccessor> temporalAccessorType, DateTimeFormatter formatter,
-			@Nullable String[] fallbackPatterns, @Nullable Object source) {
-
+		@Nullable String[] fallbackPatterns, @Nullable Object source) {
 		this.temporalAccessorType = temporalAccessorType;
 		this.formatter = formatter;
 		this.fallbackPatterns = fallbackPatterns;
@@ -101,8 +100,8 @@ public final class TemporalAccessorParser implements Parser<TemporalAccessor> {
 			}
 			if (this.source != null) {
 				throw new DateTimeParseException(
-						String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
-						text, ex.getErrorIndex(), ex);
+					String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
+					text, ex.getErrorIndex(), ex);
 			}
 			// else rethrow original exception
 			throw ex;
@@ -1,6 +1,6 @@
 /**
 * Package providing integration of
- * <a href="https://beanshell.github.io/">BeanShell</a>
+ * <a href="http://www.beanshell.org">BeanShell</a>
 * (and <a href="https://code.google.com/p/beanshell2/">BeanShell2</a>)
 * into Spring's scripting infrastructure.
 */
@@ -1,6 +1,6 @@
 /**
 * Package providing integration of
- * <a href="https://www.groovy-lang.org/">Groovy</a>
+ * <a href="http://www.groovy-lang.org/">Groovy</a>
 * into Spring's scripting infrastructure.
 */
@NonNullApi
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test;
 import org.springframework.cache.Cache;
 import org.springframework.cache.support.NoOpCache;

-import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -85,10 +84,4 @@ class LoggingCacheErrorHandlerTests {
 		verify(this.logger).warn("Cache 'NOOP' failed to get entry with key 'enigma'", exception);
 	}

-	@Test
-	void constructorWithLoggerName() {
-		assertThatCode(() -> new LoggingCacheErrorHandler("org.apache.commons.logging.Log", true))
-				.doesNotThrowAnyException();
-	}
-
 }
@@ -1,83 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.annotation;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.annotation.Order;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for gh-29105.
- *
- * @author Stephane Nicoll
- */
-class Gh29105Tests {
-
-	@Test
-	void beanProviderWithParentContextReuseOrder() {
-		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
-		parent.register(DefaultConfiguration.class);
-		parent.register(CustomConfiguration.class);
-		parent.refresh();
-
-		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();
-		child.setParent(parent);
-		child.register(DefaultConfiguration.class);
-		child.refresh();
-
-		List<Class<?>> orderedTypes = child.getBeanProvider(MyService.class)
-				.orderedStream().map(Object::getClass).collect(Collectors.toList());
-		assertThat(orderedTypes).containsExactly(CustomService.class, DefaultService.class);
-		child.close();
-	}
-
-
-	interface MyService {}
-
-	static class CustomService implements MyService {}
-
-	static class DefaultService implements MyService {}
-
-
-	@Configuration
-	static class CustomConfiguration {
-
-		@Bean
-		@Order(-1)
-		CustomService customService() {
-			return new CustomService();
-		}
-
-	}
-
-	@Configuration
-	static class DefaultConfiguration {
-
-		@Bean
-		@Order(0)
-		DefaultService defaultService() {
-			return new DefaultService();
-		}
-
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -117,7 +117,7 @@ class ApplicationContextExpressionTests {
 		ac.registerBeanDefinition("tb1", bd1);

 		GenericBeanDefinition bd2 = new GenericBeanDefinition();
-		bd2.setBeanClassName("#{tb1.class}");
+		bd2.setBeanClassName("#{tb1.class.name}");
 		bd2.setScope("myScope");
 		bd2.getPropertyValues().add("name", "{ XXX#{tb0.name}YYY#{mySpecialAttr}ZZZ }");
 		bd2.getPropertyValues().add("age", "#{mySpecialAttr}");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -46,7 +46,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 * {@code jmxremote_optional.jar} into your classpath, for example in the {@code lib/ext}
 * folder of your JVM.
 *
- * <p>See also: <a href="https://jira.spring.io/browse/SPR-8093">SPR-8093</a>
+ * <p>See also:
+ * <ul>
+ * <li><a href="https://jira.spring.io/browse/SPR-8093">SPR-8093</a></li>
+ * <li><a href="https://issuetracker.springsource.com/browse/EBR-349">EBR-349</a></li>
+ * </ul>
 *
 * @author Rob Harrop
 * @author Juergen Hoeller
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -20,6 +20,7 @@ import java.beans.PropertyDescriptor;

 import javax.management.DynamicMBean;
 import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
@@ -31,7 +32,6 @@ import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.jmx.IJmxTestBean;
 import org.springframework.jmx.JmxTestBean;
 import org.springframework.jmx.export.TestDynamicMBean;
-import org.springframework.util.MBeanTestUtils;
 import org.springframework.util.ObjectUtils;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -41,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 *
 * @author Rob Harrop
 * @author Juergen Hoeller
- * @author Sam Brannen
 */
 class JmxUtilsTests {

@@ -132,11 +131,10 @@ class JmxUtilsTests {
 		MBeanServer server = null;
 		try {
 			server = JmxUtils.locateMBeanServer();
-			assertThat(server).isNotNull();
 		}
 		finally {
 			if (server != null) {
-				MBeanTestUtils.releaseMBeanServer(server);
+				MBeanServerFactory.releaseMBeanServer(server);
 			}
 		}
 	}
@@ -21,25 +21,21 @@ import java.lang.reflect.Field;
 import javax.naming.spi.NamingManager;

 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledForJreRange;

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.condition.JRE.JAVA_16;
+
+

 /**
 * Tests for {@link JndiLocatorDelegate}.
 *
 * @author Phillip Webb
 * @author Juergen Hoeller
- * @author Sam Brannen
 */
-@DisabledForJreRange(
-	min = JAVA_16,
-	disabledReason = "Cannot use reflection to set private static field in javax.naming.spi.NamingManager")
-class JndiLocatorDelegateTests {
+public class JndiLocatorDelegateTests {

 	@Test
-	void isDefaultJndiEnvironmentAvailableFalse() throws Exception {
+	public void isDefaultJndiEnvironmentAvailableFalse() throws Exception {
 		Field builderField = NamingManager.class.getDeclaredField("initctx_factory_builder");
 		builderField.setAccessible(true);
 		Object oldBuilder = builderField.get(null);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -18,59 +18,37 @@ package org.springframework.util;

 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Field;
-import java.util.EnumSet;

 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;

-import org.junit.jupiter.api.condition.JRE;
-
 /**
 * Utilities for MBean tests.
 *
 * @author Phillip Webb
- * @author Sam Brannen
 */
 public class MBeanTestUtils {

 	/**
-	 * Reset the {@link MBeanServerFactory} to a known consistent state. This involves
-	 * {@linkplain #releaseMBeanServer(MBeanServer) releasing} all currently registered
-	 * MBeanServers.
-	 * <p>On JDK 8 - JDK 16, this method also resets the platformMBeanServer field
-	 * in {@link ManagementFactory} to {@code null}.
+	 * Resets MBeanServerFactory and ManagementFactory to a known consistent state.
+	 * <p>This involves releasing all currently registered MBeanServers and resetting
+	 * the platformMBeanServer to null.
 	 */
 	public static synchronized void resetMBeanServers() throws Exception {
 		for (MBeanServer server : MBeanServerFactory.findMBeanServer(null)) {
-			releaseMBeanServer(server);
-		}
-
-		if (!isCurrentJreWithinRange(JRE.JAVA_16, JRE.OTHER)) {
-			Field field = ManagementFactory.class.getDeclaredField("platformMBeanServer");
-			field.setAccessible(true);
-			field.set(null, null);
-		}
-	}
-
-	/**
-	 * Attempt to release the supplied {@link MBeanServer}.
-	 * <p>Ignores any {@link IllegalArgumentException} thrown by
-	 * {@link MBeanServerFactory#releaseMBeanServer(MBeanServer)} whose error
-	 * message contains the text "not in list".
-	 */
-	public static void releaseMBeanServer(MBeanServer server) {
-		try {
-			MBeanServerFactory.releaseMBeanServer(server);
-		}
-		catch (IllegalArgumentException ex) {
-			if (!ex.getMessage().contains("not in list")) {
-				throw ex;
+			try {
+				MBeanServerFactory.releaseMBeanServer(server);
+			}
+			catch (IllegalArgumentException ex) {
+				if (!ex.getMessage().contains("not in list")) {
+					throw ex;
+				}
 			}
 		}
-	}

-	static boolean isCurrentJreWithinRange(JRE min, JRE max) {
-		return EnumSet.range(min, max).contains(JRE.currentVersion());
+		Field field = ManagementFactory.class.getDeclaredField("platformMBeanServer");
+		field.setAccessible(true);
+		field.set(null, null);
 	}

 }
@@ -58,7 +58,6 @@ dependencies {
 	testImplementation("org.xmlunit:xmlunit-matchers")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.projectreactor.tools:blockhound")
-	testImplementation("com.squareup.okhttp3:mockwebserver")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
 	testFixturesImplementation("org.junit.platform:junit-platform-launcher")
 	testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
@@ -708,8 +708,8 @@ public final class Type {
   *
   * @return the size of the arguments of the method (plus one for the implicit this argument),
   *     argumentsSize, and the size of its return value, returnSize, packed into a single int i =
-   *     {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code
-   *     i >> 2}, and returnSize to {@code i & 0x03}).
+   *     {@code (argumentsSize &lt;&lt; 2) | returnSize} (argumentsSize is therefore equal to {@code
+   *     i &gt;&gt; 2}, and returnSize to {@code i &amp; 0x03}).
   */
  public int getArgumentsAndReturnSizes() {
    return getArgumentsAndReturnSizes(getDescriptor());
@@ -721,8 +721,8 @@ public final class Type {
   * @param methodDescriptor a method descriptor.
   * @return the size of the arguments of the method (plus one for the implicit this argument),
   *     argumentsSize, and the size of its return value, returnSize, packed into a single int i =
-   *     {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code
-   *     i >> 2}, and returnSize to {@code i & 0x03}).
+   *     {@code (argumentsSize &lt;&lt; 2) | returnSize} (argumentsSize is therefore equal to {@code
+   *     i &gt;&gt; 2}, and returnSize to {@code i &amp; 0x03}).
   */
  public static int getArgumentsAndReturnSizes(final String methodDescriptor) {
    int argumentsSize = 1;
@@ -226,7 +226,7 @@ public final class BridgeMethodResolver {
 	/**
 	 * Compare the signatures of the bridge method and the method which it bridges. If
 	 * the parameter and return types are the same, it is a 'visibility' bridge method
-	 * introduced in Java 6 to fix https://bugs.openjdk.org/browse/JDK-6342411.
+	 * introduced in Java 6 to fix https://bugs.java.com/view_bug.do?bug_id=6342411.
 	 * See also https://stas-blogspot.blogspot.com/2010/03/java-bridge-methods-explained.html
 	 * @return whether signatures match as described
 	 */
@@ -191,8 +191,7 @@ public final class CollectionFactory {
 		else if (LinkedList.class == collectionType) {
 			return new LinkedList<>();
 		}
-		else if (TreeSet.class == collectionType || NavigableSet.class == collectionType
-				|| SortedSet.class == collectionType) {
+		else if (SortedSet.class == collectionType || NavigableSet.class == collectionType) {
 			return new TreeSet<>();
 		}
 		else if (EnumSet.class.isAssignableFrom(collectionType)) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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,9 +18,9 @@ package org.springframework.core;

 /**
 * Default implementation of the {@link ParameterNameDiscoverer} strategy interface,
- * using the Java 8 standard reflection mechanism, and falling back to the ASM-based
- * {@link LocalVariableTableParameterNameDiscoverer} for checking debug information
- * in the class file (e.g. for classes compiled with earlier Java versions).
+ * using the Java 8 standard reflection mechanism (if available), and falling back
+ * to the ASM-based {@link LocalVariableTableParameterNameDiscoverer} for checking
+ * debug information in the class file.
 *
 * <p>If a Kotlin reflection implementation is present,
 * {@link KotlinReflectionParameterNameDiscoverer} is added first in the list and
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -31,13 +31,11 @@ import org.springframework.lang.Nullable;
 * {@link ParameterNameDiscoverer} implementation which uses Kotlin's reflection facilities
 * for introspecting parameter names.
 *
- * <p>Compared to {@link StandardReflectionParameterNameDiscoverer}, it allows in addition to
+ * Compared to {@link StandardReflectionParameterNameDiscoverer}, it allows in addition to
 * determine interface parameter names without requiring Java 8 -parameters compiler flag.
 *
 * @author Sebastien Deleuze
 * @since 5.0
- * @see StandardReflectionParameterNameDiscoverer
- * @see DefaultParameterNameDiscoverer
 */
 public class KotlinReflectionParameterNameDiscoverer implements ParameterNameDiscoverer {

@@ -47,18 +47,12 @@ import org.springframework.util.ClassUtils;
 * caches the ASM discovered information for each introspected Class, in a thread-safe
 * manner. It is recommended to reuse ParameterNameDiscoverer instances as far as possible.
 *
- * <p>This discoverer variant is effectively superseded by the Java 8 based
- * {@link StandardReflectionParameterNameDiscoverer} but included as a fallback still
- * (for code not compiled with the standard "-parameters" compiler flag).
- *
 * @author Adrian Colyer
 * @author Costin Leau
 * @author Juergen Hoeller
 * @author Chris Beams
 * @author Sam Brannen
 * @since 2.0
- * @see StandardReflectionParameterNameDiscoverer
- * @see DefaultParameterNameDiscoverer
 */
 public class LocalVariableTableParameterNameDiscoverer implements ParameterNameDiscoverer {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -29,6 +29,7 @@ import org.springframework.lang.Nullable;
 * @since 2.0
 * @see NestedRuntimeException
 * @see NestedCheckedException
+ * @see NestedIOException
 * @see org.springframework.web.util.NestedServletException
 */
 public abstract class NestedExceptionUtils {
@@ -37,9 +37,7 @@ import org.springframework.lang.Nullable;
 * @see #printStackTrace
 * @see org.springframework.core.NestedCheckedException
 * @see org.springframework.core.NestedRuntimeException
- * @deprecated as of 5.3.23, in favor of using {@link IOException} directly
 */
-@Deprecated
@SuppressWarnings("serial")
 public class NestedIOException extends IOException {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -26,15 +26,10 @@ import org.springframework.lang.Nullable;
 * {@link ParameterNameDiscoverer} implementation which uses JDK 8's reflection facilities
 * for introspecting parameter names (based on the "-parameters" compiler flag).
 *
- * <p>This is a key element of {@link DefaultParameterNameDiscoverer} where it is being
- * combined with {@link KotlinReflectionParameterNameDiscoverer} if Kotlin is present.
- *
 * @author Juergen Hoeller
 * @since 4.0
 * @see java.lang.reflect.Method#getParameters()
 * @see java.lang.reflect.Parameter#getName()
- * @see KotlinReflectionParameterNameDiscoverer
- * @see DefaultParameterNameDiscoverer
 */
 public class StandardReflectionParameterNameDiscoverer implements ParameterNameDiscoverer {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -173,7 +173,7 @@ import java.lang.annotation.Target;
 * @author Sam Brannen
 * @since 4.2
 * @see MergedAnnotations
- * @see AnnotationUtils#isSynthesizedAnnotation(Annotation)
+ * @see SynthesizedAnnotation
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -433,16 +433,6 @@ public abstract class AnnotatedElementUtils {
 	 * single annotation and within annotation hierarchies.
 	 * <p>This method follows <em>get semantics</em> as described in the
 	 * {@linkplain AnnotatedElementUtils class-level javadoc}.
-	 * <p><strong>WARNING</strong>: if the supplied {@code containerType} is not
-	 * {@code null}, the search will be restricted to supporting only repeatable
-	 * annotations whose container is the supplied {@code containerType}. This
-	 * prevents the search from finding repeatable annotations declared as
-	 * meta-annotations on other types of repeatable annotations. If you need to
-	 * support such a use case, favor {@link #getMergedRepeatableAnnotations(AnnotatedElement, Class)}
-	 * over this method or alternatively use the {@link MergedAnnotations} API
-	 * directly in conjunction with {@link RepeatableContainers} that are
-	 * {@linkplain RepeatableContainers#and(Class, Class) composed} to support
-	 * multiple repeatable annotation types.
 	 * @param element the annotated element (never {@code null})
 	 * @param annotationType the annotation type to find (never {@code null})
 	 * @param containerType the type of the container that holds the annotations;
@@ -735,16 +725,6 @@ public abstract class AnnotatedElementUtils {
 	 * single annotation and within annotation hierarchies.
 	 * <p>This method follows <em>find semantics</em> as described in the
 	 * {@linkplain AnnotatedElementUtils class-level javadoc}.
-	 * <p><strong>WARNING</strong>: if the supplied {@code containerType} is not
-	 * {@code null}, the search will be restricted to supporting only repeatable
-	 * annotations whose container is the supplied {@code containerType}. This
-	 * prevents the search from finding repeatable annotations declared as
-	 * meta-annotations on other types of repeatable annotations. If you need to
-	 * support such a use case, favor {@link #findMergedRepeatableAnnotations(AnnotatedElement, Class)}
-	 * over this method or alternatively use the {@link MergedAnnotations} API
-	 * directly in conjunction with {@link RepeatableContainers} that are
-	 * {@linkplain RepeatableContainers#and(Class, Class) composed} to support
-	 * multiple repeatable annotation types.
 	 * @param element the annotated element (never {@code null})
 	 * @param annotationType the annotation type to find (never {@code null})
 	 * @param containerType the type of the container that holds the annotations;
@@ -776,23 +756,7 @@ public abstract class AnnotatedElementUtils {
 	private static MergedAnnotations getRepeatableAnnotations(AnnotatedElement element,
 			@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) {

-		RepeatableContainers repeatableContainers;
-		if (containerType == null) {
-			// Invoke RepeatableContainers.of() in order to adhere to the contract of
-			// getMergedRepeatableAnnotations() which states that an IllegalArgumentException
-			// will be thrown if the container cannot be resolved.
-			//
-			// In any case, we use standardRepeatables() in order to support repeatable
-			// annotations on other types of repeatable annotations (i.e., nested repeatable
-			// annotation types).
-			//
-			// See https://github.com/spring-projects/spring-framework/issues/20279
-			RepeatableContainers.of(annotationType, null);
-			repeatableContainers = RepeatableContainers.standardRepeatables();
-		}
-		else {
-			repeatableContainers = RepeatableContainers.of(annotationType, containerType);
-		}
+		RepeatableContainers repeatableContainers = RepeatableContainers.of(annotationType, containerType);
 		return MergedAnnotations.from(element, SearchStrategy.INHERITED_ANNOTATIONS, repeatableContainers);
 	}

@@ -803,23 +767,7 @@ public abstract class AnnotatedElementUtils {
 	private static MergedAnnotations findRepeatableAnnotations(AnnotatedElement element,
 			@Nullable Class<? extends Annotation> containerType, Class<? extends Annotation> annotationType) {

-		RepeatableContainers repeatableContainers;
-		if (containerType == null) {
-			// Invoke RepeatableContainers.of() in order to adhere to the contract of
-			// findMergedRepeatableAnnotations() which states that an IllegalArgumentException
-			// will be thrown if the container cannot be resolved.
-			//
-			// In any case, we use standardRepeatables() in order to support repeatable
-			// annotations on other types of repeatable annotations (i.e., nested repeatable
-			// annotation types).
-			//
-			// See https://github.com/spring-projects/spring-framework/issues/20279
-			RepeatableContainers.of(annotationType, null);
-			repeatableContainers = RepeatableContainers.standardRepeatables();
-		}
-		else {
-			repeatableContainers = RepeatableContainers.of(annotationType, containerType);
-		}
+		RepeatableContainers repeatableContainers = RepeatableContainers.of(annotationType, containerType);
 		return MergedAnnotations.from(element, SearchStrategy.TYPE_HIERARCHY, repeatableContainers);
 	}

@@ -829,7 +777,8 @@ public abstract class AnnotatedElementUtils {
 	}

 	private static <A extends Annotation> Comparator<MergedAnnotation<A>> highAggregateIndexesFirst() {
-		return Comparator.<MergedAnnotation<A>> comparingInt(MergedAnnotation::getAggregateIndex).reversed();
+		return Comparator.<MergedAnnotation<A>> comparingInt(
+				MergedAnnotation::getAggregateIndex).reversed();
 	}

 	@Nullable
@@ -839,12 +788,13 @@ public abstract class AnnotatedElementUtils {
 		if (!annotation.isPresent()) {
 			return null;
 		}
-		return annotation.asAnnotationAttributes(Adapt.values(classValuesAsString, nestedAnnotationsAsMap));
+		return annotation.asAnnotationAttributes(
+				Adapt.values(classValuesAsString, nestedAnnotationsAsMap));
 	}


 	/**
-	 * Adapted {@link AnnotatedElement} that holds specific annotations.
+	 * Adapted {@link AnnotatedElement} that hold specific annotations.
 	 */
 	private static class AnnotatedElementForAnnotations implements AnnotatedElement {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -25,7 +25,7 @@ import org.springframework.core.NestedRuntimeException;
 * @author Sam Brannen
 * @since 4.2
 * @see AnnotationUtils
- * @see AnnotationUtils#isSynthesizedAnnotation(java.lang.annotation.Annotation)
+ * @see SynthesizedAnnotation
 */
@SuppressWarnings("serial")
 public class AnnotationConfigurationException extends NestedRuntimeException {
@@ -32,6 +32,7 @@ import java.util.Set;
 import org.springframework.core.annotation.AnnotationTypeMapping.MirrorSets.MirrorSet;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -240,7 +241,7 @@ final class AnnotationTypeMapping {
 			mapping.claimedAliases.addAll(aliases);
 			if (mapping.annotation != null) {
 				int[] resolvedMirrors = mapping.mirrorSets.resolve(null,
-						mapping.annotation, AnnotationUtils::invokeAnnotationMethod);
+						mapping.annotation, ReflectionUtils::invokeMethod);
 				for (int i = 0; i < mapping.attributes.size(); i++) {
 					if (aliases.contains(mapping.attributes.get(i))) {
 						this.annotationValueMappings[attributeIndex] = resolvedMirrors[i];
@@ -504,7 +505,7 @@ final class AnnotationTypeMapping {
 		if (source == this && metaAnnotationsOnly) {
 			return null;
 		}
-		return AnnotationUtils.invokeAnnotationMethod(source.attributes.get(mappedIndex), source.annotation);
+		return ReflectionUtils.invokeMethod(source.attributes.get(mappedIndex), source.annotation);
 	}

 	/**
@@ -593,7 +594,7 @@ final class AnnotationTypeMapping {
 		AttributeMethods attributes = AttributeMethods.forAnnotationType(annotation.annotationType());
 		for (int i = 0; i < attributes.size(); i++) {
 			Method attribute = attributes.get(i);
-			Object value1 = AnnotationUtils.invokeAnnotationMethod(attribute, annotation);
+			Object value1 = ReflectionUtils.invokeMethod(attribute, annotation);
 			Object value2;
 			if (extractedValue instanceof TypeMappedAnnotation) {
 				value2 = ((TypeMappedAnnotation<?>) extractedValue).getValue(attribute.getName()).orElse(null);
@@ -160,7 +160,7 @@ final class AnnotationTypeMappings {
 	 * @param index the index to return
 	 * @return the {@link AnnotationTypeMapping}
 	 * @throws IndexOutOfBoundsException if the index is out of range
-	 * ({@code index < 0 || index >= size()})
+	 * (<tt>index &lt; 0 || index &gt;= size()</tt>)
 	 */
 	AnnotationTypeMapping get(int index) {
 		return this.mappings.get(index);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -19,10 +19,9 @@ package org.springframework.core.annotation;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
-import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -1053,42 +1052,23 @@ public abstract class AnnotationUtils {
 		}
 		try {
 			Method method = annotation.annotationType().getDeclaredMethod(attributeName);
-			return invokeAnnotationMethod(method, annotation);
+			ReflectionUtils.makeAccessible(method);
+			return method.invoke(annotation);
 		}
 		catch (NoSuchMethodException ex) {
 			return null;
 		}
+		catch (InvocationTargetException ex) {
+			rethrowAnnotationConfigurationException(ex.getTargetException());
+			throw new IllegalStateException("Could not obtain value for annotation attribute '" +
+					attributeName + "' in " + annotation, ex);
+		}
 		catch (Throwable ex) {
-			rethrowAnnotationConfigurationException(ex);
 			handleIntrospectionFailure(annotation.getClass(), ex);
 			return null;
 		}
 	}

-	/**
-	 * Invoke the supplied annotation attribute {@link Method} on the supplied
-	 * {@link Annotation}.
-	 * <p>An attempt will first be made to invoke the method via the annotation's
-	 * {@link InvocationHandler} (if the annotation instance is a JDK dynamic proxy).
-	 * If that fails, an attempt will be made to invoke the method via reflection.
-	 * @param method the method to invoke
-	 * @param annotation the annotation on which to invoke the method
-	 * @return the value returned from the method invocation
-	 * @since 5.3.24
-	 */
-	static Object invokeAnnotationMethod(Method method, Object annotation) {
-		if (Proxy.isProxyClass(annotation.getClass())) {
-			try {
-				InvocationHandler handler = Proxy.getInvocationHandler(annotation);
-				return handler.invoke(annotation, method, null);
-			}
-			catch (Throwable ex) {
-				// ignore and fall back to reflection below
-			}
-		}
-		return ReflectionUtils.invokeMethod(method, annotation);
-	}
-
 	/**
 	 * If the supplied throwable is an {@link AnnotationConfigurationException},
 	 * it will be cast to an {@code AnnotationConfigurationException} and thrown,
@@ -1208,7 +1188,7 @@ public abstract class AnnotationUtils {
 	public static <A extends Annotation> A synthesizeAnnotation(
 			A annotation, @Nullable AnnotatedElement annotatedElement) {

-		if (isSynthesizedAnnotation(annotation) || AnnotationFilter.PLAIN.matches(annotation)) {
+		if (annotation instanceof SynthesizedAnnotation || AnnotationFilter.PLAIN.matches(annotation)) {
 			return annotation;
 		}
 		return MergedAnnotation.from(annotatedElement, annotation).synthesize();
@@ -1302,18 +1282,6 @@ public abstract class AnnotationUtils {
 		return synthesized;
 	}

-	/**
-	 * Determine if the supplied {@link Annotation} has been <em>synthesized</em>
-	 * by Spring (i.e. wrapped in a dynamic proxy) with additional functionality
-	 * such as attribute alias handling.
-	 * @param annotation the annotation to check
-	 * @return {@code true} if the supplied annotation is a synthesized annotation
-	 * @since 5.3.23
-	 */
-	public static boolean isSynthesizedAnnotation(@Nullable Annotation annotation) {
-		return (annotation instanceof SynthesizedAnnotation);
-	}
-
 	/**
 	 * Clear the internal annotation metadata cache.
 	 * @since 4.3.15
@@ -86,6 +86,17 @@ final class AttributeMethods {
 	}


+	/**
+	 * Determine if this instance only contains a single attribute named
+	 * {@code value}.
+	 * @return {@code true} if there is only a value attribute
+	 */
+	boolean hasOnlyValueAttribute() {
+		return (this.attributeMethods.length == 1 &&
+				MergedAnnotation.VALUE.equals(this.attributeMethods[0].getName()));
+	}
+
+
 	/**
 	 * Determine if values from the given annotation can be safely accessed without
 	 * causing any {@link TypeNotPresentException TypeNotPresentExceptions}.
@@ -98,7 +109,7 @@ final class AttributeMethods {
 		for (int i = 0; i < size(); i++) {
 			if (canThrowTypeNotPresentException(i)) {
 				try {
-					AnnotationUtils.invokeAnnotationMethod(get(i), annotation);
+					get(i).invoke(annotation);
 				}
 				catch (Throwable ex) {
 					return false;
@@ -123,7 +134,7 @@ final class AttributeMethods {
 		for (int i = 0; i < size(); i++) {
 			if (canThrowTypeNotPresentException(i)) {
 				try {
-					AnnotationUtils.invokeAnnotationMethod(get(i), annotation);
+					get(i).invoke(annotation);
 				}
 				catch (Throwable ex) {
 					throw new IllegalStateException("Could not obtain annotation attribute value for " +
@@ -157,7 +168,7 @@ final class AttributeMethods {
 	 * @param index the index of the attribute to return
 	 * @return the attribute method
 	 * @throws IndexOutOfBoundsException if the index is out of range
-	 * ({@code index < 0 || index >= size()})
+	 * (<tt>index &lt; 0 || index &gt;= size()</tt>)
 	 */
 	Method get(int index) {
 		return this.attributeMethods[index];
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -25,6 +25,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;

 /**
 * Strategy used to determine annotations that act as containers for other
@@ -38,7 +39,6 @@ import org.springframework.util.ObjectUtils;
 * <p>To completely disable repeatable support use {@link #none()}.
 *
 * @author Phillip Webb
- * @author Sam Brannen
 * @since 5.2
 */
 public abstract class RepeatableContainers {
@@ -101,19 +101,15 @@ public abstract class RepeatableContainers {
 	}

 	/**
-	 * Create a {@link RepeatableContainers} instance that uses predefined
-	 * repeatable and container types.
-	 * @param repeatable the contained repeatable annotation type
-	 * @param container the container annotation type or {@code null}. If specified,
+	 * Create a {@link RepeatableContainers} instance that uses a defined
+	 * container and repeatable type.
+	 * @param repeatable the contained repeatable annotation
+	 * @param container the container annotation or {@code null}. If specified,
 	 * this annotation must declare a {@code value} attribute returning an array
 	 * of repeatable annotations. If not specified, the container will be
 	 * deduced by inspecting the {@code @Repeatable} annotation on
 	 * {@code repeatable}.
 	 * @return a {@link RepeatableContainers} instance
-	 * @throws IllegalArgumentException if the supplied container type is
-	 * {@code null} and the annotation type is not a repeatable annotation
-	 * @throws AnnotationConfigurationException if the supplied container type
-	 * is not a properly configured container for a repeatable annotation
 	 */
 	public static RepeatableContainers of(
 			Class<? extends Annotation> repeatable, @Nullable Class<? extends Annotation> container) {
@@ -152,7 +148,7 @@ public abstract class RepeatableContainers {
 		Annotation[] findRepeatedAnnotations(Annotation annotation) {
 			Method method = getRepeatedAnnotationsMethod(annotation.annotationType());
 			if (method != null) {
-				return (Annotation[]) AnnotationUtils.invokeAnnotationMethod(method, annotation);
+				return (Annotation[]) ReflectionUtils.invokeMethod(method, annotation);
 			}
 			return super.findRepeatedAnnotations(annotation);
 		}
@@ -166,8 +162,8 @@ public abstract class RepeatableContainers {

 		private static Object computeRepeatedAnnotationsMethod(Class<? extends Annotation> annotationType) {
 			AttributeMethods methods = AttributeMethods.forAnnotationType(annotationType);
-			Method method = methods.get(MergedAnnotation.VALUE);
-			if (method != null) {
+			if (methods.hasOnlyValueAttribute()) {
+				Method method = methods.get(0);
 				Class<?> returnType = method.getReturnType();
 				if (returnType.isArray()) {
 					Class<?> componentType = returnType.getComponentType();
@@ -239,7 +235,7 @@ public abstract class RepeatableContainers {
 		@Nullable
 		Annotation[] findRepeatedAnnotations(Annotation annotation) {
 			if (this.container.isAssignableFrom(annotation.annotationType())) {
-				return (Annotation[]) AnnotationUtils.invokeAnnotationMethod(this.valueMethod, annotation);
+				return (Annotation[]) ReflectionUtils.invokeMethod(this.valueMethod, annotation);
 			}
 			return super.findRepeatedAnnotations(annotation);
 		}
@@ -111,7 +111,7 @@ final class SynthesizedMergedAnnotationInvocationHandler<A extends Annotation> i
 		for (int i = 0; i < this.attributes.size(); i++) {
 			Method attribute = this.attributes.get(i);
 			Object thisValue = getAttributeValue(attribute);
-			Object otherValue = AnnotationUtils.invokeAnnotationMethod(attribute, other);
+			Object otherValue = ReflectionUtils.invokeMethod(attribute, other);
 			if (!ObjectUtils.nullSafeEquals(thisValue, otherValue)) {
 				return false;
 			}
@@ -33,6 +33,7 @@ import java.util.function.Predicate;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;

 /**
 * {@link MergedAnnotation} that adapts attributes from a root annotation by
@@ -42,9 +43,9 @@ import org.springframework.util.ClassUtils;
 * {@code BiFunction}. This allows various different annotation models to be
 * supported by the same class. For example, the attributes source might be an
 * actual {@link Annotation} instance where methods on the annotation instance
- * are {@linkplain AnnotationUtils#invokeAnnotationMethod(Method, Object) invoked}
- * to extract values. Similarly, the source could be a simple {@link Map} with
- * values extracted using {@link Map#get(Object)}.
+ * are {@linkplain ReflectionUtils#invokeMethod(Method, Object) invoked} to extract
+ * values. Equally, the source could be a simple {@link Map} with values
+ * extracted using {@link Map#get(Object)}.
 *
 * <p>Extracted root attribute values must be compatible with the attribute
 * return type, namely:
@@ -433,7 +434,7 @@ final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnn
 		}
 		if (value == null) {
 			Method attribute = this.mapping.getAttributes().get(attributeIndex);
-			value = AnnotationUtils.invokeAnnotationMethod(attribute, this.mapping.getAnnotation());
+			value = ReflectionUtils.invokeMethod(attribute, this.mapping.getAnnotation());
 		}
 		return value;
 	}
@@ -554,7 +555,7 @@ final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnn

 	private ValueExtractor getValueExtractor(Object value) {
 		if (value instanceof Annotation) {
-			return AnnotationUtils::invokeAnnotationMethod;
+			return ReflectionUtils::invokeMethod;
 		}
 		if (value instanceof Map) {
 			return TypeMappedAnnotation::extractFromMap;
@@ -614,8 +615,7 @@ final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnn
 	static <A extends Annotation> MergedAnnotation<A> from(@Nullable Object source, A annotation) {
 		Assert.notNull(annotation, "Annotation must not be null");
 		AnnotationTypeMappings mappings = AnnotationTypeMappings.forAnnotationType(annotation.annotationType());
-		return new TypeMappedAnnotation<>(
-				mappings.get(0), null, source, annotation, AnnotationUtils::invokeAnnotationMethod, 0);
+		return new TypeMappedAnnotation<>(mappings.get(0), null, source, annotation, ReflectionUtils::invokeMethod, 0);
 	}

 	static <A extends Annotation> MergedAnnotation<A> of(
@@ -649,7 +649,7 @@ final class TypeMappedAnnotation<A extends Annotation> extends AbstractMergedAnn
 			int aggregateIndex, IntrospectionFailureLogger logger) {

 		return createIfPossible(mapping, source, annotation,
-				AnnotationUtils::invokeAnnotationMethod, aggregateIndex, logger);
+				ReflectionUtils::invokeMethod, aggregateIndex, logger);
 	}

 	@Nullable
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -27,7 +27,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.MimeType;

 /**
- * Abstract base class for {@link Encoder} implementations.
+ * Abstract base class for {@link Decoder} implementations.
 *
 * @author Sebastien Deleuze
 * @author Arjen Poutsma
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -238,7 +238,7 @@ public class TypeDescriptor implements Serializable {
 	 * <p>As of Spring Framework 4.2, this method supports arbitrary levels
 	 * of meta-annotations.
 	 * @param annotationType the annotation type
-	 * @return {@code true} if the annotation is present
+	 * @return <tt>true</tt> if the annotation is present
 	 */
 	public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
 		if (this.annotatedElement.isEmpty()) {
@@ -273,8 +273,8 @@ public class TypeDescriptor implements Serializable {
 	 * On the other hand, {@code valueOf(Number.class).isAssignableTo(valueOf(Integer.class))}
 	 * returns {@code false} because, while all Integers are Numbers, not all Numbers are Integers.
 	 * <p>For arrays, collections, and maps, element and key/value types are checked if declared.
-	 * For example, a {@code List<String>} field value is assignable to a {@code Collection<CharSequence>}
-	 * field, but {@code List<Number>} is not assignable to {@code List<Integer>}.
+	 * For example, a List&lt;String&gt; field value is assignable to a Collection&lt;CharSequence&gt;
+	 * field, but List&lt;Number&gt; is not assignable to List&lt;Integer&gt;.
 	 * @return {@code true} if this type is assignable to the type represented by the provided
 	 * type descriptor
 	 * @see #getObjectType()
@@ -576,7 +576,7 @@ public class TypeDescriptor implements Serializable {
 	/**
 	 * Create a new type descriptor from a {@link java.util.Map} type.
 	 * <p>Useful for converting to typed Maps.
-	 * <p>For example, a {@code Map<String, String>} could be converted to a {@code Map<Id, EmailAddress>}
+	 * <p>For example, a Map&lt;String, String&gt; could be converted to a Map&lt;Id, EmailAddress&gt;
 	 * by converting to a targetType built with this method:
 	 * The method call to construct such a TypeDescriptor would look something like:
 	 * <pre class="code">
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -104,7 +104,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {


 	/**
-	 * Adapts a {@link ConversionService} and {@code targetType} to a {@link Converter}.
+	 * Adapts a {@link ConversionService} and <tt>targetType</tt> to a {@link Converter}.
 	 */
 	private static class ConversionServiceConverter<S, T> implements Converter<S, T> {

@@ -57,7 +57,6 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 				HttpURLConnection httpCon =
 						(con instanceof HttpURLConnection ? (HttpURLConnection) con : null);
 				if (httpCon != null) {
-					httpCon.setRequestMethod("HEAD");
 					int code = httpCon.getResponseCode();
 					if (code == HttpURLConnection.HTTP_OK) {
 						return true;
@@ -109,7 +108,6 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 				customizeConnection(con);
 				if (con instanceof HttpURLConnection) {
 					HttpURLConnection httpCon = (HttpURLConnection) con;
-					httpCon.setRequestMethod("HEAD");
 					int code = httpCon.getResponseCode();
 					if (code != HttpURLConnection.HTTP_OK) {
 						httpCon.disconnect();
@@ -247,10 +245,6 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 			// Try a URL connection content-length header
 			URLConnection con = url.openConnection();
 			customizeConnection(con);
-			if (con instanceof HttpURLConnection) {
-				HttpURLConnection httpCon = (HttpURLConnection) con;
-				httpCon.setRequestMethod("HEAD");
-			}
 			return con.getContentLengthLong();
 		}
 	}
@@ -276,10 +270,6 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 		// Try a URL connection last-modified header
 		URLConnection con = url.openConnection();
 		customizeConnection(con);
-		if (con instanceof HttpURLConnection) {
-			HttpURLConnection httpCon = (HttpURLConnection) con;
-			httpCon.setRequestMethod("HEAD");
-		}
 		long lastModified = con.getLastModified();
 		if (fileCheck && lastModified == 0 && con.getContentLengthLong() <= 0) {
 			throw new FileNotFoundException(getDescription() +
@@ -289,7 +279,8 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 	}

 	/**
-	 * Customize the given {@link URLConnection} before fetching the resource.
+	 * Customize the given {@link URLConnection}, obtained in the course of an
+	 * {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
 	 * <p>Calls {@link ResourceUtils#useCachesIfNecessary(URLConnection)} and
 	 * delegates to {@link #customizeConnection(HttpURLConnection)} if possible.
 	 * Can be overridden in subclasses.
@@ -304,12 +295,14 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
 	}

 	/**
-	 * Customize the given {@link HttpURLConnection} before fetching the resource.
-	 * <p>Can be overridden in subclasses for configuring request headers and timeouts.
+	 * Customize the given {@link HttpURLConnection}, obtained in the course of an
+	 * {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
+	 * <p>Sets request method "HEAD" by default. Can be overridden in subclasses.
 	 * @param con the HttpURLConnection to customize
 	 * @throws IOException if thrown from HttpURLConnection methods
 	 */
 	protected void customizeConnection(HttpURLConnection con) throws IOException {
+		con.setRequestMethod("HEAD");
 	}


@@ -29,6 +29,7 @@ import java.nio.channels.ReadableByteChannel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

+import org.springframework.core.NestedIOException;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ResourceUtils;

@@ -118,14 +119,13 @@ public abstract class AbstractResource implements Resource {
 	 * by {@link #getURL()}.
 	 */
 	@Override
-	@SuppressWarnings("deprecation")
 	public URI getURI() throws IOException {
 		URL url = getURL();
 		try {
 			return ResourceUtils.toURI(url);
 		}
 		catch (URISyntaxException ex) {
-			throw new org.springframework.core.NestedIOException("Invalid URI [" + url + "]", ex);
+			throw new NestedIOException("Invalid URI [" + url + "]", ex);
 		}
 	}

@@ -28,6 +28,7 @@ import java.net.URLConnection;

 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -182,7 +183,7 @@ public class UrlResource extends AbstractFileResolvingResource {
 	@Override
 	public InputStream getInputStream() throws IOException {
 		URLConnection con = this.url.openConnection();
-		customizeConnection(con);
+		ResourceUtils.useCachesIfNecessary(con);
 		try {
 			return con.getInputStream();
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;

+import org.springframework.core.NestedIOException;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

@@ -71,24 +72,22 @@ public class VfsResource extends AbstractResource {
 	}

 	@Override
-	@SuppressWarnings("deprecation")
 	public URL getURL() throws IOException {
 		try {
 			return VfsUtils.getURL(this.resource);
 		}
 		catch (Exception ex) {
-			throw new org.springframework.core.NestedIOException("Failed to obtain URL for file " + this.resource, ex);
+			throw new NestedIOException("Failed to obtain URL for file " + this.resource, ex);
 		}
 	}

 	@Override
-	@SuppressWarnings("deprecation")
 	public URI getURI() throws IOException {
 		try {
 			return VfsUtils.getURI(this.resource);
 		}
 		catch (Exception ex) {
-			throw new org.springframework.core.NestedIOException("Failed to obtain URI for " + this.resource, ex);
+			throw new NestedIOException("Failed to obtain URI for " + this.resource, ex);
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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,9 +38,9 @@ import org.springframework.util.Assert;
 * the following invariant holds for the read and write positions, and the capacity:
 *
 * <blockquote>
- *     {@code 0} {@code <=}
- *     <i>readPosition</i> {@code <=}
- *     <i>writePosition</i> {@code <=}
+ *     <tt>0</tt> <tt>&lt;=</tt>
+ *     <i>readPosition</i> <tt>&lt;=</tt>
+ *     <i>writePosition</i> <tt>&lt;=</tt>
 *     <i>capacity</i>
 * </blockquote>
 *
@@ -177,7 +177,7 @@ public abstract class DataBufferUtils {
 		if (options.length > 0) {
 			for (OpenOption option : options) {
 				Assert.isTrue(!(option == StandardOpenOption.APPEND || option == StandardOpenOption.WRITE),
-						() -> "'" + option + "' not allowed");
+						"'" + option + "' not allowed");
 			}
 		}

@@ -366,8 +366,7 @@ public abstract class DataBufferUtils {
 				sink.onDispose(() -> closeChannel(channel));
 				write(source, channel).subscribe(DataBufferUtils::release,
 						sink::error,
-						sink::success,
-						Context.of(sink.contextView()));
+						sink::success);
 			}
 			catch (IOException ex) {
 				sink.error(ex);
@@ -695,7 +694,7 @@ public abstract class DataBufferUtils {

 		@Override
 		public byte[] delimiter() {
-			Assert.state(this.longestDelimiter != NO_DELIMITER, "'delimiter' not set");
+			Assert.state(this.longestDelimiter != NO_DELIMITER, "Illegal state!");
 			return this.longestDelimiter;
 		}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;

 import org.springframework.core.ConfigurableObjectInputStream;
+import org.springframework.core.NestedIOException;
 import org.springframework.lang.Nullable;

 /**
@@ -64,14 +65,14 @@ public class DefaultDeserializer implements Deserializer<Object> {
 	 * @see ObjectInputStream#readObject()
 	 */
 	@Override
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("resource")
 	public Object deserialize(InputStream inputStream) throws IOException {
 		ObjectInputStream objectInputStream = new ConfigurableObjectInputStream(inputStream, this.classLoader);
 		try {
 			return objectInputStream.readObject();
 		}
 		catch (ClassNotFoundException ex) {
-			throw new org.springframework.core.NestedIOException("Failed to deserialize object type", ex);
+			throw new NestedIOException("Failed to deserialize object type", ex);
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;

 import org.springframework.asm.ClassReader;
+import org.springframework.core.NestedIOException;
 import org.springframework.core.io.Resource;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.ClassMetadata;
@@ -50,14 +51,13 @@ final class SimpleMetadataReader implements MetadataReader {
 		this.annotationMetadata = visitor.getMetadata();
 	}

-	@SuppressWarnings("deprecation")
 	private static ClassReader getClassReader(Resource resource) throws IOException {
 		try (InputStream is = resource.getInputStream()) {
 			try {
 				return new ClassReader(is);
 			}
 			catch (IllegalArgumentException ex) {
-				throw new org.springframework.core.NestedIOException("ASM ClassReader failed to parse class file - " +
+				throw new NestedIOException("ASM ClassReader failed to parse class file - " +
 						"probably due to a new Java class file version that isn't supported yet: " + resource, ex);
 			}
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -86,7 +86,7 @@ public abstract class AbstractTypeHierarchyTraversingFilter implements TypeFilte
 					}
 					catch (IOException ex) {
 						if (logger.isDebugEnabled()) {
-							logger.debug("Could not read superclass [" + metadata.getSuperClassName() +
+							logger.debug("Could not read super class [" + metadata.getSuperClassName() +
 									"] of type-filtered class [" + metadata.getClassName() + "]");
 						}
 					}
@@ -638,7 +638,7 @@ public class AntPathMatcher implements PathMatcher {
 	/**
 	 * Tests whether a string matches against a pattern via a {@link Pattern}.
 	 * <p>The pattern may contain special characters: '*' means zero or more characters; '?' means one and
-	 * only one character; '{' and '}' indicate a URI template pattern. For example {@code /users/{user}}.
+	 * only one character; '{' and '}' indicate a URI template pattern. For example <tt>/users/{user}</tt>.
 	 */
 	protected static class AntPathStringMatcher {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -85,7 +85,7 @@ public abstract class CollectionUtils {
 	 * @see #newLinkedHashMap(int)
 	 */
 	public static <K, V> HashMap<K, V> newHashMap(int expectedSize) {
-		return new HashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
+		return new HashMap<>((int) (expectedSize / DEFAULT_LOAD_FACTOR), DEFAULT_LOAD_FACTOR);
 	}

 	/**
@@ -102,11 +102,7 @@ public abstract class CollectionUtils {
 	 * @see #newHashMap(int)
 	 */
 	public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(int expectedSize) {
-		return new LinkedHashMap<>(computeMapInitialCapacity(expectedSize), DEFAULT_LOAD_FACTOR);
-	}
-
-	private static int computeMapInitialCapacity(int expectedSize) {
-		return (int) Math.ceil(expectedSize / (double) DEFAULT_LOAD_FACTOR);
+		return new LinkedHashMap<>((int) (expectedSize / DEFAULT_LOAD_FACTOR), DEFAULT_LOAD_FACTOR);
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -150,7 +150,7 @@ public class FastByteArrayOutputStream extends OutputStream {

 	/**
 	 * Convert the buffer's contents into a string decoding bytes using the
-	 * platform's default character set. The length of the new {@code String}
+	 * platform's default character set. The length of the new <tt>String</tt>
 	 * is a function of the character set, and hence may not be equal to the
 	 * size of the buffer.
 	 * <p>This method always replaces malformed-input and unmappable-character
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -114,7 +114,6 @@ public class SettableListenableFuture<T> implements ListenableFuture<T> {
 	 * {@link java.util.concurrent.CancellationException} if the future has been cancelled.
 	 * @return the value associated with this future
 	 */
-	@Nullable
 	@Override
 	public T get() throws InterruptedException, ExecutionException {
 		return this.settableTask.get();
@@ -130,7 +129,6 @@ public class SettableListenableFuture<T> implements ListenableFuture<T> {
 	 * @param unit the unit of the timeout argument
 	 * @return the value associated with this future
 	 */
-	@Nullable
 	@Override
 	public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
 		return this.settableTask.get(timeout, unit);
@@ -1,34 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework;
-
-import org.junit.platform.suite.api.IncludeClassNamePatterns;
-import org.junit.platform.suite.api.SelectPackages;
-import org.junit.platform.suite.api.Suite;
-
-/**
- * JUnit Platform based test suite for tests in the spring-core module.
- *
- * <p><strong>This suite is only intended to be used manually within an IDE.</strong>
- *
- * @author Sam Brannen
- */
-@Suite
-@SelectPackages({"org.springframework.core", "org.springframework.util"})
-@IncludeClassNamePatterns(".*Tests?$")
-class SpringCoreTestSuite {
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -34,6 +34,7 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;

+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;

 import org.springframework.util.LinkedMultiValueMap;
@@ -155,7 +156,7 @@ class CollectionFactoryTests {
 	@Test
 	void createApproximateCollectionFromEmptyHashSet() {
 		Collection<String> set = createApproximateCollection(new HashSet<String>(), 2);
-		assertThat(set).isEmpty();
+		Assertions.assertThat(set).isEmpty();
 	}

 	@Test
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 */
 class LocalVariableTableParameterNameDiscovererTests {

-	private final ParameterNameDiscoverer discoverer = new LocalVariableTableParameterNameDiscoverer();
+	private final LocalVariableTableParameterNameDiscoverer discoverer = new LocalVariableTableParameterNameDiscoverer();


 	@Test
@@ -162,23 +162,23 @@ class LocalVariableTableParameterNameDiscovererTests {

 		Constructor<?> ctor = clazz.getDeclaredConstructor(Object.class);
 		String[] names = discoverer.getParameterNames(ctor);
-		assertThat(names).hasSize(1);
+		assertThat(names.length).isEqualTo(1);
 		assertThat(names[0]).isEqualTo("key");

 		ctor = clazz.getDeclaredConstructor(Object.class, Object.class);
 		names = discoverer.getParameterNames(ctor);
-		assertThat(names).hasSize(2);
+		assertThat(names.length).isEqualTo(2);
 		assertThat(names[0]).isEqualTo("key");
 		assertThat(names[1]).isEqualTo("value");

 		Method m = clazz.getMethod("generifiedStaticMethod", Object.class);
 		names = discoverer.getParameterNames(m);
-		assertThat(names).hasSize(1);
+		assertThat(names.length).isEqualTo(1);
 		assertThat(names[0]).isEqualTo("param");

 		m = clazz.getMethod("generifiedMethod", Object.class, long.class, Object.class, Object.class);
 		names = discoverer.getParameterNames(m);
-		assertThat(names).hasSize(4);
+		assertThat(names.length).isEqualTo(4);
 		assertThat(names[0]).isEqualTo("param");
 		assertThat(names[1]).isEqualTo("x");
 		assertThat(names[2]).isEqualTo("key");
@@ -186,21 +186,21 @@ class LocalVariableTableParameterNameDiscovererTests {

 		m = clazz.getMethod("voidStaticMethod", Object.class, long.class, int.class);
 		names = discoverer.getParameterNames(m);
-		assertThat(names).hasSize(3);
+		assertThat(names.length).isEqualTo(3);
 		assertThat(names[0]).isEqualTo("obj");
 		assertThat(names[1]).isEqualTo("x");
 		assertThat(names[2]).isEqualTo("i");

 		m = clazz.getMethod("nonVoidStaticMethod", Object.class, long.class, int.class);
 		names = discoverer.getParameterNames(m);
-		assertThat(names).hasSize(3);
+		assertThat(names.length).isEqualTo(3);
 		assertThat(names[0]).isEqualTo("obj");
 		assertThat(names[1]).isEqualTo("x");
 		assertThat(names[2]).isEqualTo("i");

 		m = clazz.getMethod("getDate");
 		names = discoverer.getParameterNames(m);
-		assertThat(names).isEmpty();
+		assertThat(names.length).isEqualTo(0);
 	}

 	@Disabled("Ignored because Ubuntu packages OpenJDK with debug symbols enabled. See SPR-8078.")
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -43,10 +43,11 @@ import static org.junit.jupiter.api.condition.JRE.JAVA_14;
@DisabledForJreRange(min = JAVA_14)
 public class SpringCoreBlockHoundIntegrationTests {

+
 	@BeforeAll
-	static void setup() {
+	static void setUp() {
 		BlockHound.builder()
-				.with(new ReactorBlockHoundIntegration())  // Reactor non-blocking thread predicate
+				.with(new ReactorBlockHoundIntegration()) // Reactor non-blocking thread predicate
 				.with(new ReactiveAdapterRegistry.SpringCoreBlockHoundIntegration())
 				.install();
 	}
@@ -20,7 +20,6 @@ import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
-import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -78,7 +77,6 @@ import static org.springframework.core.annotation.AnnotationUtilsTests.asArray;
 * @see AnnotationUtilsTests
 * @see MultipleComposedAnnotationsOnSingleAnnotatedElementTests
 * @see ComposedRepeatableAnnotationsTests
- * @see NestedRepeatableAnnotationsTests
 */
 class AnnotatedElementUtilsTests {

@@ -910,31 +908,6 @@ class AnnotatedElementUtilsTests {
 		assertThat(annotation.value()).containsExactly("FromValueAttributeMeta");
 	}

-	/**
-	 * @since 5.3.25
-	 */
-	@Test // gh-29685
-	void getMergedRepeatableAnnotationsWithContainerWithMultipleAttributes() {
-		Set<StandardRepeatableWithContainerWithMultipleAttributes> repeatableAnnotations =
-				AnnotatedElementUtils.getMergedRepeatableAnnotations(
-						StandardRepeatablesWithContainerWithMultipleAttributesTestCase.class,
-						StandardRepeatableWithContainerWithMultipleAttributes.class);
-		assertThat(repeatableAnnotations).map(StandardRepeatableWithContainerWithMultipleAttributes::value)
-				.containsExactly("a", "b");
-	}
-
-	/**
-	 * @since 5.3.25
-	 */
-	@Test // gh-29685
-	void findMergedRepeatableAnnotationsWithContainerWithMultipleAttributes() {
-		Set<StandardRepeatableWithContainerWithMultipleAttributes> repeatableAnnotations =
-				AnnotatedElementUtils.findMergedRepeatableAnnotations(
-						StandardRepeatablesWithContainerWithMultipleAttributesTestCase.class,
-						StandardRepeatableWithContainerWithMultipleAttributes.class);
-		assertThat(repeatableAnnotations).map(StandardRepeatableWithContainerWithMultipleAttributes::value)
-				.containsExactly("a", "b");
-	}

 	// -------------------------------------------------------------------------

@@ -1584,24 +1557,4 @@ class AnnotatedElementUtilsTests {
 	static class ValueAttributeMetaMetaClass {
 	}

-	@Retention(RetentionPolicy.RUNTIME)
-	@interface StandardContainerWithMultipleAttributes {
-
-		StandardRepeatableWithContainerWithMultipleAttributes[] value();
-
-		String name() default "";
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Repeatable(StandardContainerWithMultipleAttributes.class)
-	@interface StandardRepeatableWithContainerWithMultipleAttributes {
-
-		String value() default "";
-	}
-
-	@StandardRepeatableWithContainerWithMultipleAttributes("a")
-	@StandardRepeatableWithContainerWithMultipleAttributes("b")
-	static class StandardRepeatablesWithContainerWithMultipleAttributesTestCase {
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -33,7 +33,7 @@ class AnnotationBackCompatibilityTests {

 	@Test
 	void multiplRoutesToMetaAnnotation() {
-		Class<?> source = WithMetaMetaTestAnnotation1AndMetaTestAnnotation2.class;
+		Class<WithMetaMetaTestAnnotation1AndMetaTestAnnotation2> source = WithMetaMetaTestAnnotation1AndMetaTestAnnotation2.class;
 		// Merged annotation chooses lowest depth
 		MergedAnnotation<TestAnnotation> mergedAnnotation = MergedAnnotations.from(source).get(TestAnnotation.class);
 		assertThat(mergedAnnotation.getString("value")).isEqualTo("testAndMetaTest");
@@ -45,7 +45,7 @@ class AnnotationBackCompatibilityTests {
 	@Test
 	void defaultValue() {
 		DefaultValueAnnotation synthesized = MergedAnnotations.from(WithDefaultValue.class).get(DefaultValueAnnotation.class).synthesize();
-		assertThat(AnnotationUtils.isSynthesizedAnnotation(synthesized)).as("synthesized annotation").isTrue();
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		Object defaultValue = AnnotationUtils.getDefaultValue(synthesized, "enumValue");
 		assertThat(defaultValue).isEqualTo(TestEnum.ONE);
 	}
@@ -60,12 +60,14 @@ class AnnotationBackCompatibilityTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@TestAnnotation("metaTest")
 	@interface MetaTestAnnotation {
+
 	}

 	@Retention(RetentionPolicy.RUNTIME)
 	@TestAnnotation("testAndMetaTest")
 	@MetaTestAnnotation
 	@interface TestAndMetaTestAnnotation {
+
 	}

 	@Retention(RetentionPolicy.RUNTIME)
@@ -76,6 +78,7 @@ class AnnotationBackCompatibilityTests {
 	@MetaMetaTestAnnotation
 	@TestAndMetaTestAnnotation
 	static class WithMetaMetaTestAnnotation1AndMetaTestAnnotation2 {
+
 	}

 	@Retention(RetentionPolicy.RUNTIME)
@@ -91,6 +94,7 @@ class AnnotationBackCompatibilityTests {

 	@DefaultValueAnnotation
 	static class WithDefaultValue {
+
 	}

 	enum TestEnum {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -58,6 +58,24 @@ class AttributeMethodsTests {
 		assertThat(getAll(methods)).flatExtracting(Method::getName).containsExactly("intValue", "value");
 	}

+	@Test
+	void hasOnlyValueAttributeWhenHasOnlyValueAttributeReturnsTrue() {
+		AttributeMethods methods = AttributeMethods.forAnnotationType(ValueOnly.class);
+		assertThat(methods.hasOnlyValueAttribute()).isTrue();
+	}
+
+	@Test
+	void hasOnlyValueAttributeWhenHasOnlySingleNonValueAttributeReturnsFalse() {
+		AttributeMethods methods = AttributeMethods.forAnnotationType(NonValueOnly.class);
+		assertThat(methods.hasOnlyValueAttribute()).isFalse();
+	}
+
+	@Test
+	void hasOnlyValueAttributeWhenHasOnlyMultipleAttributesIncludingValueReturnsFalse() {
+		AttributeMethods methods = AttributeMethods.forAnnotationType(MultipleAttributes.class);
+		assertThat(methods.hasOnlyValueAttribute()).isFalse();
+	}
+
 	@Test
 	void indexOfNameReturnsIndex() {
 		AttributeMethods methods = AttributeMethods.forAnnotationType(MultipleAttributes.class);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -45,7 +45,7 @@ class MergedAnnotationCollectorsTests {
 				MergedAnnotationCollectors.toAnnotationSet());
 		assertThat(set).isInstanceOf(LinkedHashSet.class).flatExtracting(
 				TestAnnotation::value).containsExactly("a", "b", "c");
-		assertThat(set).allMatch(AnnotationUtils::isSynthesizedAnnotation);
+		assertThat(set).allMatch(SynthesizedAnnotation.class::isInstance);
 	}

 	@Test
@@ -55,7 +55,7 @@ class MergedAnnotationCollectorsTests {
 		assertThat(Arrays.stream(array).map(
 				annotation -> ((TestAnnotation) annotation).value())).containsExactly("a",
 						"b", "c");
-		assertThat(array).allMatch(AnnotationUtils::isSynthesizedAnnotation);
+		assertThat(array).allMatch(SynthesizedAnnotation.class::isInstance);
 	}

 	@Test
@@ -64,7 +64,7 @@ class MergedAnnotationCollectorsTests {
 				MergedAnnotationCollectors.toAnnotationArray(TestAnnotation[]::new));
 		assertThat(Arrays.stream(array).map(TestAnnotation::value)).containsExactly("a",
 				"b", "c");
-		assertThat(array).allMatch(AnnotationUtils::isSynthesizedAnnotation);
+		assertThat(array).allMatch(SynthesizedAnnotation.class::isInstance);
 	}

 	@Test
@@ -1395,10 +1395,9 @@ class MergedAnnotationsTests {
 		RequestMapping synthesizedWebMapping = MergedAnnotation.from(webMapping).synthesize();
 		RequestMapping synthesizedAgainWebMapping = MergedAnnotation.from(synthesizedWebMapping).synthesize();

-		assertSynthesized(synthesizedWebMapping);
-		assertSynthesized(synthesizedAgainWebMapping);
+		assertThat(synthesizedWebMapping).isInstanceOf(SynthesizedAnnotation.class);
+		assertThat(synthesizedAgainWebMapping).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesizedWebMapping).isEqualTo(synthesizedAgainWebMapping);
-		assertThat(synthesizedWebMapping).isSameAs(synthesizedAgainWebMapping);
 		assertThat(synthesizedWebMapping.name()).isEqualTo("foo");
 		assertThat(synthesizedWebMapping.path()).containsExactly("/test");
 		assertThat(synthesizedWebMapping.value()).containsExactly("/test");
@@ -1413,7 +1412,7 @@ class MergedAnnotationsTests {
 		Id synthesizedId = MergedAnnotation.from(id).synthesize();
 		assertThat(id).isEqualTo(synthesizedId);
 		// It doesn't make sense to synthesize @Id since it declares zero attributes.
-		assertNotSynthesized(synthesizedId);
+		assertThat(synthesizedId).isNotInstanceOf(SynthesizedAnnotation.class);
 		assertThat(id).isSameAs(synthesizedId);

 		GeneratedValue generatedValue = method.getAnnotation(GeneratedValue.class);
@@ -1421,7 +1420,7 @@ class MergedAnnotationsTests {
 		GeneratedValue synthesizedGeneratedValue = MergedAnnotation.from(generatedValue).synthesize();
 		assertThat(generatedValue).isEqualTo(synthesizedGeneratedValue);
 		// It doesn't make sense to synthesize @GeneratedValue since it declares zero attributes with aliases.
-		assertNotSynthesized(synthesizedGeneratedValue);
+		assertThat(synthesizedGeneratedValue).isNotInstanceOf(SynthesizedAnnotation.class);
 		assertThat(generatedValue).isSameAs(synthesizedGeneratedValue);
 	}

@@ -1431,19 +1430,19 @@ class MergedAnnotationsTests {
 		MergedAnnotations mergedAnnotations = MergedAnnotations.from(directlyAnnotatedField);
 		RootAnnotation rootAnnotation = mergedAnnotations.get(RootAnnotation.class).synthesize();
 		assertThat(rootAnnotation.flag()).isFalse();
-		assertNotSynthesized(rootAnnotation);
+		assertThat(rootAnnotation).isNotInstanceOf(SynthesizedAnnotation.class);

 		Field metaAnnotatedField = ReflectionUtils.findField(DomainType.class, "metaAnnotated");
 		mergedAnnotations = MergedAnnotations.from(metaAnnotatedField);
 		rootAnnotation = mergedAnnotations.get(RootAnnotation.class).synthesize();
 		assertThat(rootAnnotation.flag()).isTrue();
-		assertSynthesized(rootAnnotation);
+		assertThat(rootAnnotation).isInstanceOf(SynthesizedAnnotation.class);

 		Field metaMetaAnnotatedField = ReflectionUtils.findField(DomainType.class, "metaMetaAnnotated");
 		mergedAnnotations = MergedAnnotations.from(metaMetaAnnotatedField);
 		rootAnnotation = mergedAnnotations.get(RootAnnotation.class).synthesize();
 		assertThat(rootAnnotation.flag()).isTrue();
-		assertSynthesized(rootAnnotation);
+		assertThat(rootAnnotation).isInstanceOf(SynthesizedAnnotation.class);
 	}

 	@Test  // gh-28704
@@ -1451,10 +1450,10 @@ class MergedAnnotationsTests {
 		MergedAnnotations mergedAnnotations = MergedAnnotations.from(SecurityConfig.class);

 		EnableWebSecurity enableWebSecurity = mergedAnnotations.get(EnableWebSecurity.class).synthesize();
-		assertNotSynthesized(enableWebSecurity);
+		assertThat(enableWebSecurity).isNotInstanceOf(SynthesizedAnnotation.class);

 		EnableGlobalAuthentication enableGlobalAuthentication = mergedAnnotations.get(EnableGlobalAuthentication.class).synthesize();
-		assertNotSynthesized(enableGlobalAuthentication);
+		assertThat(enableGlobalAuthentication).isNotInstanceOf(SynthesizedAnnotation.class);
 	}

 	/**
@@ -1473,8 +1472,8 @@ class MergedAnnotationsTests {
 		RequestMapping synthesizedWebMapping1 = mergedAnnotation1.synthesize();
 		RequestMapping synthesizedWebMapping2 = MergedAnnotation.from(webMapping).synthesize();

-		assertSynthesized(synthesizedWebMapping1);
-		assertSynthesized(synthesizedWebMapping2);
+		assertThat(synthesizedWebMapping1).isInstanceOf(SynthesizedAnnotation.class);
+		assertThat(synthesizedWebMapping2).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesizedWebMapping1).isEqualTo(synthesizedWebMapping2);

 		// Synthesizing an annotation from a different MergedAnnotation results in a different synthesized annotation instance.
@@ -1596,11 +1595,14 @@ class MergedAnnotationsTests {
 		testSynthesisWithImplicitAliases(GroovyImplicitAliasesSimpleTestConfigurationClass.class, "groovyScript");
 	}

-	private void testSynthesisWithImplicitAliases(Class<?> clazz, String expected) throws Exception {
-		ImplicitAliasesTestConfiguration config = clazz.getAnnotation(ImplicitAliasesTestConfiguration.class);
+	private void testSynthesisWithImplicitAliases(Class<?> clazz, String expected)
+			throws Exception {
+		ImplicitAliasesTestConfiguration config = clazz.getAnnotation(
+				ImplicitAliasesTestConfiguration.class);
 		assertThat(config).isNotNull();
-		ImplicitAliasesTestConfiguration synthesized = MergedAnnotation.from(config).synthesize();
-		assertSynthesized(synthesized);
+		ImplicitAliasesTestConfiguration synthesized = MergedAnnotation.from(
+				config).synthesize();
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized.value()).isEqualTo(expected);
 		assertThat(synthesized.location1()).isEqualTo(expected);
 		assertThat(synthesized.xmlFile()).isEqualTo(expected);
@@ -1628,7 +1630,7 @@ class MergedAnnotationsTests {
 		assertThat(config).isNotNull();
 		ImplicitAliasesWithImpliedAliasNamesOmittedTestConfiguration synthesized =
 				MergedAnnotation.from(config).synthesize();
-		assertSynthesized(synthesized);
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized.value()).isEqualTo(expected);
 		assertThat(synthesized.location()).isEqualTo(expected);
 		assertThat(synthesized.xmlFile()).isEqualTo(expected);
@@ -1640,7 +1642,7 @@ class MergedAnnotationsTests {
 				ImplicitAliasesForAliasPairTestConfigurationClass.class.getAnnotation(
 						ImplicitAliasesForAliasPairTestConfiguration.class);
 		ImplicitAliasesForAliasPairTestConfiguration synthesized = MergedAnnotation.from(config).synthesize();
-		assertSynthesized(synthesized);
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized.xmlFile()).isEqualTo("test.xml");
 		assertThat(synthesized.groovyScript()).isEqualTo("test.xml");
 	}
@@ -1651,7 +1653,7 @@ class MergedAnnotationsTests {
 				TransitiveImplicitAliasesTestConfigurationClass.class.getAnnotation(
 						TransitiveImplicitAliasesTestConfiguration.class);
 		TransitiveImplicitAliasesTestConfiguration synthesized = MergedAnnotation.from(config).synthesize();
-		assertSynthesized(synthesized);
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized.xml()).isEqualTo("test.xml");
 		assertThat(synthesized.groovy()).isEqualTo("test.xml");
 	}
@@ -1663,7 +1665,7 @@ class MergedAnnotationsTests {
 						TransitiveImplicitAliasesForAliasPairTestConfiguration.class);
 		TransitiveImplicitAliasesForAliasPairTestConfiguration synthesized = MergedAnnotation.from(
 				config).synthesize();
-		assertSynthesized(synthesized);
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized.xml()).isEqualTo("test.xml");
 		assertThat(synthesized.groovy()).isEqualTo("test.xml");
 	}
@@ -1722,7 +1724,7 @@ class MergedAnnotationsTests {
 		Map<String, Object> map = Collections.singletonMap("value", "webController");
 		MergedAnnotation<Component> annotation = MergedAnnotation.of(Component.class, map);
 		Component synthesizedComponent = annotation.synthesize();
-		assertSynthesized(synthesizedComponent);
+		assertThat(synthesizedComponent).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesizedComponent.value()).isEqualTo("webController");
 	}

@@ -1743,7 +1745,7 @@ class MergedAnnotationsTests {
 		MergedAnnotation<ComponentScanSingleFilter> annotation = MergedAnnotation.of(
 				ComponentScanSingleFilter.class, map);
 		ComponentScanSingleFilter synthesizedComponentScan = annotation.synthesize();
-		assertSynthesized(synthesizedComponentScan);
+		assertThat(synthesizedComponentScan).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesizedComponentScan.value().pattern()).isEqualTo("newFoo");
 	}

@@ -1767,7 +1769,7 @@ class MergedAnnotationsTests {
 		MergedAnnotation<ComponentScan> annotation = MergedAnnotation.of(
 				ComponentScan.class, map);
 		ComponentScan synthesizedComponentScan = annotation.synthesize();
-		assertSynthesized(synthesizedComponentScan);
+		assertThat(synthesizedComponentScan).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(Arrays.stream(synthesizedComponentScan.excludeFilters()).map(
 				Filter::pattern)).containsExactly("newFoo", "newBar");
 	}
@@ -1886,7 +1888,7 @@ class MergedAnnotationsTests {
 		assertThat(component).isNotNull();
 		Map<String, Object> attributes = MergedAnnotation.from(component).asMap();
 		Component synthesized = MergedAnnotation.of(Component.class, attributes).synthesize();
-		assertSynthesized(synthesized);
+		assertThat(synthesized).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(synthesized).isEqualTo(component);
 	}

@@ -2045,7 +2047,7 @@ class MergedAnnotationsTests {
 		assertThat(annotation).isNotNull();
 		MergedAnnotation<Annotation> mergedAnnotation = MergedAnnotation.from(annotation);
 		Annotation synthesizedAnnotation = mergedAnnotation.synthesize();
-		assertSynthesized(synthesizedAnnotation);
+		assertThat(synthesizedAnnotation).isInstanceOf(SynthesizedAnnotation.class);
 		assertThat(mergedAnnotation.getString("name")).isEqualTo("test");
 		assertThat(mergedAnnotation.getString("path")).isEqualTo("/test");
 		assertThat(mergedAnnotation.getString("value")).isEqualTo("/test");
@@ -2056,10 +2058,10 @@ class MergedAnnotationsTests {
 		Hierarchy hierarchy = HierarchyClass.class.getAnnotation(Hierarchy.class);
 		assertThat(hierarchy).isNotNull();
 		Hierarchy synthesizedHierarchy = MergedAnnotation.from(hierarchy).synthesize();
-		assertSynthesized(synthesizedHierarchy);
+		assertThat(synthesizedHierarchy).isInstanceOf(SynthesizedAnnotation.class);
 		TestConfiguration[] configs = synthesizedHierarchy.value();
 		assertThat(configs).isNotNull();
-		assertThat(configs).allMatch(AnnotationUtils::isSynthesizedAnnotation);
+		assertThat(configs).allMatch(SynthesizedAnnotation.class::isInstance);
 		assertThat(configs).extracting(TestConfiguration::value).containsExactly("A", "B");
 		assertThat(configs).extracting(TestConfiguration::location).containsExactly("A", "B");

@@ -2080,7 +2082,7 @@ class MergedAnnotationsTests {
 		assertThat(charsContainer).isNotNull();
 		CharsContainer synthesizedCharsContainer = MergedAnnotation.from(
 				charsContainer).synthesize();
-		assertSynthesized(synthesizedCharsContainer);
+		assertThat(synthesizedCharsContainer).isInstanceOf(SynthesizedAnnotation.class);
 		char[] chars = synthesizedCharsContainer.chars();
 		assertThat(chars).containsExactly('x', 'y', 'z');
 		// Alter array returned from synthesized annotation
@@ -3680,12 +3682,4 @@ class MergedAnnotationsTests {
 	}
 	// @formatter:on

-	static void assertSynthesized(Annotation annotation) {
-		assertThat(AnnotationUtils.isSynthesizedAnnotation(annotation)).as("synthesized annotation").isTrue();
-	}
-
-	static void assertNotSynthesized(Annotation annotation) {
-		assertThat(AnnotationUtils.isSynthesizedAnnotation(annotation)).as("synthesized annotation").isFalse();
-	}
-
 }
@@ -1,212 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
-import org.springframework.util.ReflectionUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for various ways to search for repeatable annotations that are
- * nested (i.e., repeatable annotations used as meta-annotations on other
- * repeatable annotations).
- *
- * @author Sam Brannen
- * @since 5.3.24
- * @see https://github.com/spring-projects/spring-framework/issues/20279
- */
-@SuppressWarnings("unused")
-class NestedRepeatableAnnotationsTests {
-
-	@Nested
-	class SingleRepeatableAnnotationTests {
-
-		private final Method method = ReflectionUtils.findMethod(getClass(), "annotatedMethod");
-
-		@Test
-		void streamRepeatableAnnotations_MergedAnnotationsApi() {
-			Set<A> annotations = MergedAnnotations.from(method, SearchStrategy.TYPE_HIERARCHY)
-					.stream(A.class).collect(MergedAnnotationCollectors.toAnnotationSet());
-			// Merged, so we expect to find @A once with its value coming from @B(5).
-			assertThat(annotations).extracting(A::value).containsExactly(5);
-		}
-
-		@Test
-		void findMergedRepeatableAnnotations_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.findMergedRepeatableAnnotations(method, A.class);
-			// Merged, so we expect to find @A once with its value coming from @B(5).
-			assertThat(annotations).extracting(A::value).containsExactly(5);
-		}
-
-		@Test
-		void getMergedRepeatableAnnotationsWithStandardRepeatables_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(method, A.class);
-			// Merged, so we expect to find @A once with its value coming from @B(5).
-			assertThat(annotations).extracting(A::value).containsExactly(5);
-		}
-
-		@Test
-		void getMergedRepeatableAnnotationsWithExplicitContainer_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(method, A.class, A.Container.class);
-			// Merged, so we expect to find @A once with its value coming from @B(5).
-			assertThat(annotations).extracting(A::value).containsExactly(5);
-		}
-
-		@Test
-		@SuppressWarnings("deprecation")
-		void getRepeatableAnnotations_AnnotationUtils() {
-			Set<A> annotations = AnnotationUtils.getRepeatableAnnotations(method, A.class);
-			// Not merged, so we expect to find @A once with the default value of 0.
-			// @A will actually be found twice, but we have Set semantics here.
-			assertThat(annotations).extracting(A::value).containsExactly(0);
-		}
-
-		@B(5)
-		void annotatedMethod() {
-		}
-
-	}
-
-	@Nested
-	class MultipleRepeatableAnnotationsTests {
-
-		private final Method method = ReflectionUtils.findMethod(getClass(), "annotatedMethod");
-
-		@Test
-		void streamRepeatableAnnotationsWithStandardRepeatables_MergedAnnotationsApi() {
-			RepeatableContainers repeatableContainers = RepeatableContainers.standardRepeatables();
-			Set<A> annotations = MergedAnnotations.from(method, SearchStrategy.TYPE_HIERARCHY, repeatableContainers)
-					.stream(A.class).collect(MergedAnnotationCollectors.toAnnotationSet());
-			// Merged, so we expect to find @A twice with values coming from @B(5) and @B(10).
-			assertThat(annotations).extracting(A::value).containsExactly(5, 10);
-		}
-
-		@Test
-		void streamRepeatableAnnotationsWithExplicitRepeatables_MergedAnnotationsApi() {
-			RepeatableContainers repeatableContainers =
-					RepeatableContainers.of(A.class, A.Container.class).and(B.Container.class, B.class);
-			Set<A> annotations = MergedAnnotations.from(method, SearchStrategy.TYPE_HIERARCHY, repeatableContainers)
-					.stream(A.class).collect(MergedAnnotationCollectors.toAnnotationSet());
-			// Merged, so we expect to find @A twice with values coming from @B(5) and @B(10).
-			assertThat(annotations).extracting(A::value).containsExactly(5, 10);
-		}
-
-		@Test
-		void findMergedRepeatableAnnotationsWithStandardRepeatables_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.findMergedRepeatableAnnotations(method, A.class);
-			// Merged, so we expect to find @A twice with values coming from @B(5) and @B(10).
-			assertThat(annotations).extracting(A::value).containsExactly(5, 10);
-		}
-
-		@Test
-		void findMergedRepeatableAnnotationsWithExplicitContainer_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.findMergedRepeatableAnnotations(method, A.class, A.Container.class);
-			// When findMergedRepeatableAnnotations(...) is invoked with an explicit container
-			// type, it uses RepeatableContainers.of(...) which limits the repeatable annotation
-			// support to a single container type.
-			//
-			// In this test case, we are therefore limiting the support to @A.Container, which
-			// means that @B.Container is unsupported and effectively ignored as a repeatable
-			// container type.
-			//
-			// Long story, short: the search doesn't find anything.
-			assertThat(annotations).isEmpty();
-		}
-
-		@Test
-		void getMergedRepeatableAnnotationsWithStandardRepeatables_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(method, A.class);
-			// Merged, so we expect to find @A twice with values coming from @B(5) and @B(10).
-			assertThat(annotations).extracting(A::value).containsExactly(5, 10);
-		}
-
-		@Test
-		void getMergedRepeatableAnnotationsWithExplicitContainer_AnnotatedElementUtils() {
-			Set<A> annotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(method, A.class, A.Container.class);
-			// When getMergedRepeatableAnnotations(...) is invoked with an explicit container
-			// type, it uses RepeatableContainers.of(...) which limits the repeatable annotation
-			// support to a single container type.
-			//
-			// In this test case, we are therefore limiting the support to @A.Container, which
-			// means that @B.Container is unsupported and effectively ignored as a repeatable
-			// container type.
-			//
-			// Long story, short: the search doesn't find anything.
-			assertThat(annotations).isEmpty();
-		}
-
-		@Test
-		@SuppressWarnings("deprecation")
-		void getRepeatableAnnotations_AnnotationUtils() {
-			Set<A> annotations = AnnotationUtils.getRepeatableAnnotations(method, A.class);
-			// Not merged, so we expect to find a single @A with default value of 0.
-			// @A will actually be found twice, but we have Set semantics here.
-			assertThat(annotations).extracting(A::value).containsExactly(0);
-		}
-
-		@B(5)
-		@B(10)
-		void annotatedMethod() {
-		}
-
-	}
-
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-	@Repeatable(A.Container.class)
-	@interface A {
-
-		int value() default 0;
-
-		@Retention(RetentionPolicy.RUNTIME)
-		@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-		@interface Container {
-			A[] value();
-		}
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-	@Repeatable(B.Container.class)
-	@A
-	@A
-	@interface B {
-
-		@AliasFor(annotation = A.class)
-		int value();
-
-		@Retention(RetentionPolicy.RUNTIME)
-		@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-		@interface Container {
-			B[] value();
-		}
-	}
-
-}
@@ -20,9 +20,7 @@ import java.lang.annotation.Annotation;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Arrays;

-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,175 +31,193 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 * Tests for {@link RepeatableContainers}.
 *
 * @author Phillip Webb
- * @author Sam Brannen
 */
 class RepeatableContainersTests {

-	@Nested
-	class StandardRepeatableContainersTests {
-
-		@Test
-		void standardRepeatablesWhenNonRepeatableReturnsNull() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.standardRepeatables(),
-				NonRepeatableTestCase.class, NonRepeatable.class);
-			assertThat(values).isNull();
-		}
-
-		@Test
-		void standardRepeatablesWhenSingleReturnsNull() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.standardRepeatables(),
-				SingleStandardRepeatableTestCase.class, StandardRepeatable.class);
-			assertThat(values).isNull();
-		}
-
-		@Test
-		void standardRepeatablesWhenContainerButNotRepeatableReturnsNull() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.standardRepeatables(),
-				ExplicitRepeatablesTestCase.class, ExplicitContainer.class);
-			assertThat(values).isNull();
-		}
-
-		@Test
-		void standardRepeatablesWhenContainerReturnsRepeats() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.standardRepeatables(),
-				StandardRepeatablesTestCase.class, StandardContainer.class);
-			assertThat(values).containsExactly("a", "b");
-		}
-
-		@Test
-		void standardRepeatablesWithContainerWithMultipleAttributes() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.standardRepeatables(),
-				StandardRepeatablesWithContainerWithMultipleAttributesTestCase.class,
-				StandardContainerWithMultipleAttributes.class);
-			assertThat(values).containsExactly("a", "b");
-		}
-
+	@Test
+	void standardRepeatablesWhenNonRepeatableReturnsNull() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.standardRepeatables(), WithNonRepeatable.class,
+				NonRepeatable.class);
+		assertThat(values).isNull();
 	}

-	@Nested
-	class ExplicitRepeatableContainerTests {
+	@Test
+	void standardRepeatablesWhenSingleReturnsNull() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.standardRepeatables(),
+				WithSingleStandardRepeatable.class, StandardRepeatable.class);
+		assertThat(values).isNull();
+	}

-		@Test
-		void ofExplicitWhenNonRepeatableReturnsNull() {
-			Object[] values = findRepeatedAnnotationValues(
-				RepeatableContainers.of(ExplicitRepeatable.class, ExplicitContainer.class),
-				NonRepeatableTestCase.class, NonRepeatable.class);
-			assertThat(values).isNull();
-		}
+	@Test
+	void standardRepeatablesWhenContainerReturnsRepeats() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.standardRepeatables(), WithStandardRepeatables.class,
+				StandardContainer.class);
+		assertThat(values).containsExactly("a", "b");
+	}

-		@Test
-		void ofExplicitWhenStandardRepeatableContainerReturnsNull() {
-			Object[] values = findRepeatedAnnotationValues(
-				RepeatableContainers.of(ExplicitRepeatable.class, ExplicitContainer.class),
-				StandardRepeatablesTestCase.class, StandardContainer.class);
-			assertThat(values).isNull();
-		}
+	@Test
+	void standardRepeatablesWhenContainerButNotRepeatableReturnsNull() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.standardRepeatables(), WithExplicitRepeatables.class,
+				ExplicitContainer.class);
+		assertThat(values).isNull();
+	}

-		@Test
-		void ofExplicitWhenContainerReturnsRepeats() {
-			Object[] values = findRepeatedAnnotationValues(
-				RepeatableContainers.of(ExplicitRepeatable.class, ExplicitContainer.class),
-				ExplicitRepeatablesTestCase.class, ExplicitContainer.class);
-			assertThat(values).containsExactly("a", "b");
-		}
+	@Test
+	void ofExplicitWhenNonRepeatableReturnsNull() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.of(ExplicitRepeatable.class,
+						ExplicitContainer.class),
+				WithNonRepeatable.class, NonRepeatable.class);
+		assertThat(values).isNull();
+	}

-		@Test
-		void ofExplicitWhenContainerIsNullDeducesContainer() {
-			Object[] values = findRepeatedAnnotationValues(RepeatableContainers.of(StandardRepeatable.class, null),
-				StandardRepeatablesTestCase.class, StandardContainer.class);
-			assertThat(values).containsExactly("a", "b");
-		}
+	@Test
+	void ofExplicitWhenStandardRepeatableContainerReturnsNull() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.of(ExplicitRepeatable.class,
+						ExplicitContainer.class),
+				WithStandardRepeatables.class, StandardContainer.class);
+		assertThat(values).isNull();
+	}

-		@Test
-		void ofExplicitWhenHasNoValueThrowsException() {
-			assertThatExceptionOfType(AnnotationConfigurationException.class)
-				.isThrownBy(() -> RepeatableContainers.of(ExplicitRepeatable.class, InvalidNoValue.class))
-				.withMessageContaining("Invalid declaration of container type [%s] for repeatable annotation [%s]",
-					InvalidNoValue.class.getName(), ExplicitRepeatable.class.getName());
-		}
+	@Test
+	void ofExplicitWhenContainerReturnsRepeats() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.of(ExplicitRepeatable.class,
+						ExplicitContainer.class),
+				WithExplicitRepeatables.class, ExplicitContainer.class);
+		assertThat(values).containsExactly("a", "b");
+	}

-		@Test
-		void ofExplicitWhenValueIsNotArrayThrowsException() {
-			assertThatExceptionOfType(AnnotationConfigurationException.class)
-				.isThrownBy(() -> RepeatableContainers.of(ExplicitRepeatable.class, InvalidNotArray.class))
-				.withMessage("Container type [%s] must declare a 'value' attribute for an array of type [%s]",
-					InvalidNotArray.class.getName(), ExplicitRepeatable.class.getName());
-		}
+	@Test
+	void ofExplicitWhenHasNoValueThrowsException() {
+		assertThatExceptionOfType(AnnotationConfigurationException.class).isThrownBy(() ->
+				RepeatableContainers.of(ExplicitRepeatable.class, InvalidNoValue.class))
+			.withMessageContaining("Invalid declaration of container type ["
+									+ InvalidNoValue.class.getName()
+									+ "] for repeatable annotation ["
+									+ ExplicitRepeatable.class.getName() + "]");
+	}

-		@Test
-		void ofExplicitWhenValueIsArrayOfWrongTypeThrowsException() {
-			assertThatExceptionOfType(AnnotationConfigurationException.class)
-				.isThrownBy(() -> RepeatableContainers.of(ExplicitRepeatable.class, InvalidWrongArrayType.class))
-				.withMessage("Container type [%s] must declare a 'value' attribute for an array of type [%s]",
-					InvalidWrongArrayType.class.getName(), ExplicitRepeatable.class.getName());
-		}
+	@Test
+	void ofExplicitWhenValueIsNotArrayThrowsException() {
+		assertThatExceptionOfType(AnnotationConfigurationException.class).isThrownBy(() ->
+				RepeatableContainers.of(ExplicitRepeatable.class, InvalidNotArray.class))
+			.withMessage("Container type ["
+								+ InvalidNotArray.class.getName()
+								+ "] must declare a 'value' attribute for an array of type ["
+								+ ExplicitRepeatable.class.getName() + "]");
+	}

-		@Test
-		void ofExplicitWhenAnnotationIsNullThrowsException() {
-			assertThatIllegalArgumentException()
-				.isThrownBy(() -> RepeatableContainers.of(null, null))
-				.withMessage("Repeatable must not be null");
-		}
+	@Test
+	void ofExplicitWhenValueIsArrayOfWrongTypeThrowsException() {
+		assertThatExceptionOfType(AnnotationConfigurationException.class).isThrownBy(() ->
+				RepeatableContainers.of(ExplicitRepeatable.class, InvalidWrongArrayType.class))
+			.withMessage("Container type ["
+								+ InvalidWrongArrayType.class.getName()
+								+ "] must declare a 'value' attribute for an array of type ["
+								+ ExplicitRepeatable.class.getName() + "]");
+	}

-		@Test
-		void ofExplicitWhenContainerIsNullAndNotRepeatableThrowsException() {
-			assertThatIllegalArgumentException()
-				.isThrownBy(() -> RepeatableContainers.of(ExplicitRepeatable.class, null))
-				.withMessage("Annotation type must be a repeatable annotation: failed to resolve container type for %s",
-					ExplicitRepeatable.class.getName());
-		}
+	@Test
+	void ofExplicitWhenAnnotationIsNullThrowsException() {
+		assertThatIllegalArgumentException().isThrownBy(() ->
+				RepeatableContainers.of(null, null))
+			.withMessage("Repeatable must not be null");
+	}

+	@Test
+	void ofExplicitWhenContainerIsNullDeducesContainer() {
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.of(StandardRepeatable.class, null),
+				WithStandardRepeatables.class, StandardContainer.class);
+		assertThat(values).containsExactly("a", "b");
+	}
+
+	@Test
+	void ofExplicitWhenContainerIsNullAndNotRepeatableThrowsException() {
+		assertThatIllegalArgumentException().isThrownBy(() ->
+				RepeatableContainers.of(ExplicitRepeatable.class, null))
+			.withMessage("Annotation type must be a repeatable annotation: " +
+						"failed to resolve container type for " +
+						ExplicitRepeatable.class.getName());
 	}

 	@Test
 	void standardAndExplicitReturnsRepeats() {
-		RepeatableContainers repeatableContainers = RepeatableContainers.standardRepeatables()
-			.and(ExplicitContainer.class, ExplicitRepeatable.class);
-		assertThat(findRepeatedAnnotationValues(repeatableContainers, StandardRepeatablesTestCase.class, StandardContainer.class))
-			.containsExactly("a", "b");
-		assertThat(findRepeatedAnnotationValues(repeatableContainers, ExplicitRepeatablesTestCase.class, ExplicitContainer.class))
-			.containsExactly("a", "b");
+		RepeatableContainers repeatableContainers = RepeatableContainers.standardRepeatables().and(
+				ExplicitContainer.class, ExplicitRepeatable.class);
+		assertThat(findRepeatedAnnotationValues(repeatableContainers,
+				WithStandardRepeatables.class, StandardContainer.class)).containsExactly(
+						"a", "b");
+		assertThat(findRepeatedAnnotationValues(repeatableContainers,
+				WithExplicitRepeatables.class, ExplicitContainer.class)).containsExactly(
+						"a", "b");
 	}

 	@Test
 	void noneAlwaysReturnsNull() {
-		Object[] values = findRepeatedAnnotationValues(RepeatableContainers.none(), StandardRepeatablesTestCase.class,
-			StandardContainer.class);
+		Object[] values = findRepeatedAnnotationValues(
+				RepeatableContainers.none(), WithStandardRepeatables.class,
+				StandardContainer.class);
 		assertThat(values).isNull();
 	}

 	@Test
 	void equalsAndHashcode() {
-		RepeatableContainers c1 = RepeatableContainers.of(ExplicitRepeatable.class, ExplicitContainer.class);
-		RepeatableContainers c2 = RepeatableContainers.of(ExplicitRepeatable.class, ExplicitContainer.class);
+		RepeatableContainers c1 = RepeatableContainers.of(ExplicitRepeatable.class,
+				ExplicitContainer.class);
+		RepeatableContainers c2 = RepeatableContainers.of(ExplicitRepeatable.class,
+				ExplicitContainer.class);
 		RepeatableContainers c3 = RepeatableContainers.standardRepeatables();
-		RepeatableContainers c4 = RepeatableContainers.standardRepeatables().and(ExplicitContainer.class, ExplicitRepeatable.class);
-		assertThat(c1).hasSameHashCodeAs(c2);
+		RepeatableContainers c4 = RepeatableContainers.standardRepeatables().and(
+				ExplicitContainer.class, ExplicitRepeatable.class);
+		assertThat(c1.hashCode()).isEqualTo(c2.hashCode());
 		assertThat(c1).isEqualTo(c1).isEqualTo(c2);
 		assertThat(c1).isNotEqualTo(c3).isNotEqualTo(c4);
 	}

-
-	private static Object[] findRepeatedAnnotationValues(RepeatableContainers containers,
+	private Object[] findRepeatedAnnotationValues(RepeatableContainers containers,
 			Class<?> element, Class<? extends Annotation> annotationType) {
-		Annotation[] annotations = containers.findRepeatedAnnotations(element.getAnnotation(annotationType));
+		Annotation[] annotations = containers.findRepeatedAnnotations(
+				element.getAnnotation(annotationType));
 		return extractValues(annotations);
 	}

-	private static Object[] extractValues(Annotation[] annotations) {
-		if (annotations == null) {
-			return null;
+	private Object[] extractValues(Annotation[] annotations) {
+		try {
+			if (annotations == null) {
+				return null;
+			}
+			Object[] result = new String[annotations.length];
+			for (int i = 0; i < annotations.length; i++) {
+				result[i] = annotations[i].annotationType().getMethod("value").invoke(
+						annotations[i]);
+			}
+			return result;
+		}
+		catch (Exception ex) {
+			throw new RuntimeException(ex);
 		}
-		return Arrays.stream(annotations).map(AnnotationUtils::getValue).toArray(Object[]::new);
 	}

-
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface NonRepeatable {

 		String value() default "";
 	}

+	@Retention(RetentionPolicy.RUNTIME)
+	@Repeatable(StandardContainer.class)
+	@interface StandardRepeatable {
+
+		String value() default "";
+	}
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface StandardContainer {

@@ -209,8 +225,7 @@ class RepeatableContainersTests {
 	}

 	@Retention(RetentionPolicy.RUNTIME)
-	@Repeatable(StandardContainer.class)
-	@interface StandardRepeatable {
+	@interface ExplicitRepeatable {

 		String value() default "";
 	}
@@ -221,12 +236,6 @@ class RepeatableContainersTests {
 		ExplicitRepeatable[] value();
 	}

-	@Retention(RetentionPolicy.RUNTIME)
-	@interface ExplicitRepeatable {
-
-		String value() default "";
-	}
-
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface InvalidNoValue {
 	}
@@ -244,40 +253,20 @@ class RepeatableContainersTests {
 	}

 	@NonRepeatable("a")
-	static class NonRepeatableTestCase {
+	static class WithNonRepeatable {
 	}

 	@StandardRepeatable("a")
-	static class SingleStandardRepeatableTestCase {
+	static class WithSingleStandardRepeatable {
 	}

 	@StandardRepeatable("a")
 	@StandardRepeatable("b")
-	static class StandardRepeatablesTestCase {
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@interface StandardContainerWithMultipleAttributes {
-
-		StandardRepeatableWithContainerWithMultipleAttributes[] value();
-
-		String name() default "";
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Repeatable(StandardContainerWithMultipleAttributes.class)
-	@interface StandardRepeatableWithContainerWithMultipleAttributes {
-
-		String value() default "";
-	}
-
-	@StandardRepeatableWithContainerWithMultipleAttributes("a")
-	@StandardRepeatableWithContainerWithMultipleAttributes("b")
-	static class StandardRepeatablesWithContainerWithMultipleAttributesTestCase {
+	static class WithStandardRepeatables {
 	}

 	@ExplicitContainer({ @ExplicitRepeatable("a"), @ExplicitRepeatable("b") })
-	static class ExplicitRepeatablesTestCase {
+	static class WithExplicitRepeatables {
 	}

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 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.
@@ -63,7 +63,7 @@ class ResourceRegionEncoderTests extends AbstractLeakCheckingTests {
 	}

 	@Test
-	void shouldEncodeResourceRegionFileResource() {
+	void shouldEncodeResourceRegionFileResource() throws Exception {
 		ResourceRegion region = new ResourceRegion(
 				new ClassPathResource("ResourceRegionEncoderTests.txt", getClass()), 0, 6);
 		Flux<DataBuffer> result = this.encoder.encode(Mono.just(region), this.bufferFactory,
@@ -23,32 +23,20 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashSet;
-import java.util.stream.Stream;

-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Named;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;

 import org.springframework.util.FileCopyUtils;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;

 /**
 * Unit tests for various {@link Resource} implementations.
@@ -56,25 +44,137 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 * @author Juergen Hoeller
 * @author Chris Beams
 * @author Sam Brannen
- * @author Brian Clozel
+ * @since 09.09.2004
 */
 class ResourceTests {

+	@Test
+	void byteArrayResource() throws IOException {
+		Resource resource = new ByteArrayResource("testString".getBytes());
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isOpen()).isFalse();
+		String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
+		assertThat(content).isEqualTo("testString");
+		assertThat(new ByteArrayResource("testString".getBytes())).isEqualTo(resource);
+	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void resourceIsValid(Resource resource) throws Exception {
+	@Test
+	void byteArrayResourceWithDescription() throws IOException {
+		Resource resource = new ByteArrayResource("testString".getBytes(), "my description");
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isOpen()).isFalse();
+		String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
+		assertThat(content).isEqualTo("testString");
+		assertThat(resource.getDescription().contains("my description")).isTrue();
+		assertThat(new ByteArrayResource("testString".getBytes())).isEqualTo(resource);
+	}
+
+	@Test
+	void inputStreamResource() throws IOException {
+		InputStream is = new ByteArrayInputStream("testString".getBytes());
+		Resource resource = new InputStreamResource(is);
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isOpen()).isTrue();
+		String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
+		assertThat(content).isEqualTo("testString");
+		assertThat(new InputStreamResource(is)).isEqualTo(resource);
+	}
+
+	@Test
+	void inputStreamResourceWithDescription() throws IOException {
+		InputStream is = new ByteArrayInputStream("testString".getBytes());
+		Resource resource = new InputStreamResource(is, "my description");
+		assertThat(resource.exists()).isTrue();
+		assertThat(resource.isOpen()).isTrue();
+		String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
+		assertThat(content).isEqualTo("testString");
+		assertThat(resource.getDescription().contains("my description")).isTrue();
+		assertThat(new InputStreamResource(is)).isEqualTo(resource);
+	}
+
+	@Test
+	void classPathResource() throws IOException {
+		Resource resource = new ClassPathResource("org/springframework/core/io/Resource.class");
+		doTestResource(resource);
+		Resource resource2 = new ClassPathResource("org/springframework/core/../core/io/./Resource.class");
+		assertThat(resource2).isEqualTo(resource);
+		Resource resource3 = new ClassPathResource("org/springframework/core/").createRelative("../core/io/./Resource.class");
+		assertThat(resource3).isEqualTo(resource);
+
+		// Check whether equal/hashCode works in a HashSet.
+		HashSet<Resource> resources = new HashSet<>();
+		resources.add(resource);
+		resources.add(resource2);
+		assertThat(resources.size()).isEqualTo(1);
+	}
+
+	@Test
+	void classPathResourceWithClassLoader() throws IOException {
+		Resource resource =
+				new ClassPathResource("org/springframework/core/io/Resource.class", getClass().getClassLoader());
+		doTestResource(resource);
+		assertThat(new ClassPathResource("org/springframework/core/../core/io/./Resource.class", getClass().getClassLoader())).isEqualTo(resource);
+	}
+
+	@Test
+	void classPathResourceWithClass() throws IOException {
+		Resource resource = new ClassPathResource("Resource.class", getClass());
+		doTestResource(resource);
+		assertThat(new ClassPathResource("Resource.class", getClass())).isEqualTo(resource);
+	}
+
+	@Test
+	void fileSystemResource() throws IOException {
+		String file = getClass().getResource("Resource.class").getFile();
+		Resource resource = new FileSystemResource(file);
+		doTestResource(resource);
+		assertThat(resource).isEqualTo(new FileSystemResource(file));
+	}
+
+	@Test
+	void fileSystemResourceWithFile() throws IOException {
+		File file = new File(getClass().getResource("Resource.class").getFile());
+		Resource resource = new FileSystemResource(file);
+		doTestResource(resource);
+		assertThat(resource).isEqualTo(new FileSystemResource(file));
+	}
+
+	@Test
+	void fileSystemResourceWithFilePath() throws Exception {
+		Path filePath = Paths.get(getClass().getResource("Resource.class").toURI());
+		Resource resource = new FileSystemResource(filePath);
+		doTestResource(resource);
+		assertThat(resource).isEqualTo(new FileSystemResource(filePath));
+	}
+
+	@Test
+	void fileSystemResourceWithPlainPath() {
+		Resource resource = new FileSystemResource("core/io/Resource.class");
+		assertThat(new FileSystemResource("core/../core/io/./Resource.class")).isEqualTo(resource);
+	}
+
+	@Test
+	void urlResource() throws IOException {
+		Resource resource = new UrlResource(getClass().getResource("Resource.class"));
+		doTestResource(resource);
+		assertThat(resource).isEqualTo(new UrlResource(getClass().getResource("Resource.class")));
+
+		Resource resource2 = new UrlResource("file:core/io/Resource.class");
+		assertThat(new UrlResource("file:core/../core/io/./Resource.class")).isEqualTo(resource2);
+
+		assertThat(new UrlResource("file:/dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
+		assertThat(new UrlResource("file:\\dir\\test.txt?argh").getFilename()).isEqualTo("test.txt");
+		assertThat(new UrlResource("file:\\dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
+	}
+
+	private void doTestResource(Resource resource) throws IOException {
 		assertThat(resource.getFilename()).isEqualTo("Resource.class");
 		assertThat(resource.getURL().getFile().endsWith("Resource.class")).isTrue();
 		assertThat(resource.exists()).isTrue();
 		assertThat(resource.isReadable()).isTrue();
 		assertThat(resource.contentLength() > 0).isTrue();
 		assertThat(resource.lastModified() > 0).isTrue();
-	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void resourceCreateRelative(Resource resource) throws Exception {
 		Resource relative1 = resource.createRelative("ClassPathResource.class");
 		assertThat(relative1.getFilename()).isEqualTo("ClassPathResource.class");
 		assertThat(relative1.getURL().getFile().endsWith("ClassPathResource.class")).isTrue();
@@ -82,11 +182,7 @@ class ResourceTests {
 		assertThat(relative1.isReadable()).isTrue();
 		assertThat(relative1.contentLength() > 0).isTrue();
 		assertThat(relative1.lastModified() > 0).isTrue();
-	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void resourceCreateRelativeWithFolder(Resource resource) throws Exception {
 		Resource relative2 = resource.createRelative("support/ResourcePatternResolver.class");
 		assertThat(relative2.getFilename()).isEqualTo("ResourcePatternResolver.class");
 		assertThat(relative2.getURL().getFile().endsWith("ResourcePatternResolver.class")).isTrue();
@@ -94,11 +190,7 @@ class ResourceTests {
 		assertThat(relative2.isReadable()).isTrue();
 		assertThat(relative2.contentLength() > 0).isTrue();
 		assertThat(relative2.lastModified() > 0).isTrue();
-	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void resourceCreateRelativeWithDotPath(Resource resource) throws Exception {
 		Resource relative3 = resource.createRelative("../SpringVersion.class");
 		assertThat(relative3.getFilename()).isEqualTo("SpringVersion.class");
 		assertThat(relative3.getURL().getFile().endsWith("SpringVersion.class")).isTrue();
@@ -106,11 +198,7 @@ class ResourceTests {
 		assertThat(relative3.isReadable()).isTrue();
 		assertThat(relative3.contentLength() > 0).isTrue();
 		assertThat(relative3.lastModified() > 0).isTrue();
-	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void resourceCreateRelativeUnknown(Resource resource) throws Exception {
 		Resource relative4 = resource.createRelative("X.class");
 		assertThat(relative4.exists()).isFalse();
 		assertThat(relative4.isReadable()).isFalse();
@@ -120,323 +208,126 @@ class ResourceTests {
 				relative4::lastModified);
 	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void loadingMissingResourceFails(Resource resource) {
-		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
-				resource.createRelative("X").getInputStream());
+	@Test
+	void classPathResourceWithRelativePath() throws IOException {
+		Resource resource = new ClassPathResource("dir/");
+		Resource relative = resource.createRelative("subdir");
+		assertThat(relative).isEqualTo(new ClassPathResource("dir/subdir"));
 	}

-	@ParameterizedTest(name = "{index}: {0}")
-	@MethodSource("resource")
-	void readingMissingResourceFails(Resource resource) {
-		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
-				resource.createRelative("X").readableChannel());
+	@Test
+	void fileSystemResourceWithRelativePath() throws IOException {
+		Resource resource = new FileSystemResource("dir/");
+		Resource relative = resource.createRelative("subdir");
+		assertThat(relative).isEqualTo(new FileSystemResource("dir/subdir"));
 	}

-	private static Stream<Arguments> resource() throws URISyntaxException {
-		URL resourceClass = ResourceTests.class.getResource("Resource.class");
-		Path resourceClassFilePath = Paths.get(resourceClass.toURI());
-		return Stream.of(
-				Arguments.of(Named.of("ClassPathResource", new ClassPathResource("org/springframework/core/io/Resource.class"))),
-				Arguments.of(Named.of("ClassPathResource with ClassLoader", new ClassPathResource("org/springframework/core/io/Resource.class", ResourceTests.class.getClassLoader()))),
-				Arguments.of(Named.of("ClassPathResource with Class", new ClassPathResource("Resource.class", ResourceTests.class))),
-				Arguments.of(Named.of("FileSystemResource", new FileSystemResource(resourceClass.getFile()))),
-				Arguments.of(Named.of("FileSystemResource with File", new FileSystemResource(new File(resourceClass.getFile())))),
-				Arguments.of(Named.of("FileSystemResource with File path", new FileSystemResource(resourceClassFilePath))),
-				Arguments.of(Named.of("UrlResource", new UrlResource(resourceClass)))
-		);
+	@Test
+	void urlResourceWithRelativePath() throws IOException {
+		Resource resource = new UrlResource("file:dir/");
+		Resource relative = resource.createRelative("subdir");
+		assertThat(relative).isEqualTo(new UrlResource("file:dir/subdir"));
 	}

+	@Test
+	void nonFileResourceExists() throws Exception {
+		URL url = new URL("https://spring.io/");

-	@Nested
-	class ByteArrayResourceTests {
-
-		@Test
-		void hasContent() throws Exception {
-			Resource resource = new ByteArrayResource("testString".getBytes());
-			assertThat(resource.exists()).isTrue();
-			assertThat(resource.isOpen()).isFalse();
-			String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
-			assertThat(content).isEqualTo("testString");
-			assertThat(new ByteArrayResource("testString".getBytes())).isEqualTo(resource);
-		}
-
-		@Test
-		void isNotOpen() {
-			Resource resource = new ByteArrayResource("testString".getBytes());
-			assertThat(resource.exists()).isTrue();
-			assertThat(resource.isOpen()).isFalse();
-		}
-
-		@Test
-		void hasDescription() {
-			Resource resource = new ByteArrayResource("testString".getBytes(), "my description");
-			assertThat(resource.getDescription().contains("my description")).isTrue();
-		}
+		// Abort if spring.io is not reachable.
+		assumeTrue(urlIsReachable(url));

+		Resource resource = new UrlResource(url);
+		assertThat(resource.exists()).isTrue();
 	}

-	@Nested
-	class InputStreamResourceTests {
-
-		@Test
-		void hasContent() throws Exception {
-			InputStream is = new ByteArrayInputStream("testString".getBytes());
-			Resource resource = new InputStreamResource(is);
-			String content = FileCopyUtils.copyToString(new InputStreamReader(resource.getInputStream()));
-			assertThat(content).isEqualTo("testString");
-			assertThat(new InputStreamResource(is)).isEqualTo(resource);
+	private boolean urlIsReachable(URL url) {
+		try {
+			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+			connection.setRequestMethod("HEAD");
+			connection.setReadTimeout(5_000);
+			return connection.getResponseCode() == HttpURLConnection.HTTP_OK;
 		}
-
-		@Test
-		void isOpen() {
-			InputStream is = new ByteArrayInputStream("testString".getBytes());
-			Resource resource = new InputStreamResource(is);
-			assertThat(resource.exists()).isTrue();
-			assertThat(resource.isOpen()).isTrue();
-		}
-
-		@Test
-		void hasDescription() {
-			InputStream is = new ByteArrayInputStream("testString".getBytes());
-			Resource resource = new InputStreamResource(is, "my description");
-			assertThat(resource.getDescription().contains("my description")).isTrue();
+		catch (Exception ex) {
+			return false;
 		}
 	}

+	@Test
+	void abstractResourceExceptions() throws Exception {
+		final String name = "test-resource";

-	@Nested
-	class ClassPathResourceTests {
-
-		@Test
-		void equalsAndHashCode() {
-			Resource resource = new ClassPathResource("org/springframework/core/io/Resource.class");
-			Resource resource2 = new ClassPathResource("org/springframework/core/../core/io/./Resource.class");
-			Resource resource3 = new ClassPathResource("org/springframework/core/").createRelative("../core/io/./Resource.class");
-			assertThat(resource2).isEqualTo(resource);
-			assertThat(resource3).isEqualTo(resource);
-			// Check whether equal/hashCode works in a HashSet.
-			HashSet<Resource> resources = new HashSet<>();
-			resources.add(resource);
-			resources.add(resource2);
-			assertThat(resources.size()).isEqualTo(1);
-		}
-
-		@Test
-		void resourcesWithDifferentPathsAreEqual() {
-			Resource resource = new ClassPathResource("org/springframework/core/io/Resource.class", getClass().getClassLoader());
-			ClassPathResource sameResource = new ClassPathResource("org/springframework/core/../core/io/./Resource.class", getClass().getClassLoader());
-			assertThat(sameResource).isEqualTo(resource);
-		}
-
-		@Test
-		void relativeResourcesAreEqual() throws Exception {
-			Resource resource = new ClassPathResource("dir/");
-			Resource relative = resource.createRelative("subdir");
-			assertThat(relative).isEqualTo(new ClassPathResource("dir/subdir"));
-		}
-
-	}
-
-	@Nested
-	class FileSystemResourceTests {
-
-		@Test
-		void sameResourceIsEqual() {
-			String file = getClass().getResource("Resource.class").getFile();
-			Resource resource = new FileSystemResource(file);
-			assertThat(resource).isEqualTo(new FileSystemResource(file));
-		}
-
-		@Test
-		void sameResourceFromFileIsEqual() {
-			File file = new File(getClass().getResource("Resource.class").getFile());
-			Resource resource = new FileSystemResource(file);
-			assertThat(resource).isEqualTo(new FileSystemResource(file));
-		}
-
-		@Test
-		void sameResourceFromFilePathIsEqual() throws Exception {
-			Path filePath = Paths.get(getClass().getResource("Resource.class").toURI());
-			Resource resource = new FileSystemResource(filePath);
-			assertThat(resource).isEqualTo(new FileSystemResource(filePath));
-		}
-
-		@Test
-		void sameResourceFromDotPathIsEqual() {
-			Resource resource = new FileSystemResource("core/io/Resource.class");
-			assertThat(new FileSystemResource("core/../core/io/./Resource.class")).isEqualTo(resource);
-		}
-
-		@Test
-		void relativeResourcesAreEqual() throws Exception {
-			Resource resource = new FileSystemResource("dir/");
-			Resource relative = resource.createRelative("subdir");
-			assertThat(relative).isEqualTo(new FileSystemResource("dir/subdir"));
-		}
-
-		@Test
-		void readableChannelProvidesContent() throws Exception {
-			Resource resource = new FileSystemResource(getClass().getResource("Resource.class").getFile());
-			try (ReadableByteChannel channel = resource.readableChannel()) {
-				ByteBuffer buffer = ByteBuffer.allocate((int) resource.contentLength());
-				channel.read(buffer);
-				buffer.rewind();
-				assertThat(buffer.limit() > 0).isTrue();
-			}
-		}
-
-	}
-
-	@Nested
-	class UrlResourceTests {
-
-		private MockWebServer server = new MockWebServer();
-
-		@Test
-		void sameResourceWithRelativePathIsEqual() throws Exception {
-			Resource resource = new UrlResource("file:core/io/Resource.class");
-			assertThat(new UrlResource("file:core/../core/io/./Resource.class")).isEqualTo(resource);
-		}
-
-		@Test
-		void filenameIsExtractedFromFilePath() throws Exception {
-			assertThat(new UrlResource("file:/dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
-			assertThat(new UrlResource("file:\\dir\\test.txt?argh").getFilename()).isEqualTo("test.txt");
-			assertThat(new UrlResource("file:\\dir/test.txt?argh").getFilename()).isEqualTo("test.txt");
-		}
-
-		@Test
-		void relativeResourcesAreEqual() throws Exception {
-			Resource resource = new UrlResource("file:dir/");
-			Resource relative = resource.createRelative("subdir");
-			assertThat(relative).isEqualTo(new UrlResource("file:dir/subdir"));
-		}
-
-		@Test
-		void missingRemoteResourceDoesNotExist() throws Exception {
-			String baseUrl = startServer();
-			UrlResource resource = new UrlResource(baseUrl + "/missing");
-			assertThat(resource.exists()).isFalse();
-		}
-
-		@Test
-		void remoteResourceExists() throws Exception {
-			String baseUrl = startServer();
-			UrlResource resource = new UrlResource(baseUrl + "/resource");
-			assertThat(resource.exists()).isTrue();
-			assertThat(resource.contentLength()).isEqualTo(6);
-		}
-
-		@Test
-		void canCustomizeHttpUrlConnectionForExists() throws Exception {
-			String baseUrl = startServer();
-			CustomResource resource = new CustomResource(baseUrl + "/resource");
-			assertThat(resource.exists()).isTrue();
-			RecordedRequest request = this.server.takeRequest();
-			assertThat(request.getMethod()).isEqualTo("HEAD");
-			assertThat(request.getHeader("Framework-Name")).isEqualTo("Spring");
-		}
-
-		@Test
-		void canCustomizeHttpUrlConnectionForRead() throws Exception {
-			String baseUrl = startServer();
-			CustomResource resource = new CustomResource(baseUrl + "/resource");
-			assertThat(resource.getInputStream()).hasContent("Spring");
-			RecordedRequest request = this.server.takeRequest();
-			assertThat(request.getMethod()).isEqualTo("GET");
-			assertThat(request.getHeader("Framework-Name")).isEqualTo("Spring");
-		}
-
-		@AfterEach
-		void shutdown() throws Exception {
-			this.server.shutdown();
-		}
-
-		private String startServer() throws Exception {
-			this.server.setDispatcher(new ResourceDispatcher());
-			this.server.start();
-			return "http://localhost:" + this.server.getPort();
-		}
-
-		class CustomResource extends UrlResource {
-
-			public CustomResource(String path) throws MalformedURLException {
-				super(path);
-			}
-
+		Resource resource = new AbstractResource() {
 			@Override
-			protected void customizeConnection(HttpURLConnection con) throws IOException {
-				con.setRequestProperty("Framework-Name", "Spring");
+			public String getDescription() {
+				return name;
 			}
-		}
-
-		class ResourceDispatcher extends Dispatcher {
-
 			@Override
-			public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
-				if (request.getPath().equals("/resource")) {
-					switch (request.getMethod()) {
-						case "HEAD":
-							return new MockResponse()
-									.addHeader("Content-Length", "6");
-						case "GET":
-							return new MockResponse()
-									.addHeader("Content-Length", "6")
-									.addHeader("Content-Type", "text/plain")
-									.setBody("Spring");
-					}
-				}
-				return new MockResponse().setResponseCode(404);
+			public InputStream getInputStream() throws IOException {
+				throw new FileNotFoundException();
 			}
+		};
+
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
+				resource::getURL)
+			.withMessageContaining(name);
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(
+				resource::getFile)
+			.withMessageContaining(name);
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				resource.createRelative("/testing"))
+			.withMessageContaining(name);
+
+		assertThat(resource.getFilename()).isNull();
+	}
+
+	@Test
+	void contentLength() throws IOException {
+		AbstractResource resource = new AbstractResource() {
+			@Override
+			public InputStream getInputStream() {
+				return new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' });
+			}
+			@Override
+			public String getDescription() {
+				return "";
+			}
+		};
+		assertThat(resource.contentLength()).isEqualTo(3L);
+	}
+
+	@Test
+	void readableChannel() throws IOException {
+		Resource resource = new FileSystemResource(getClass().getResource("Resource.class").getFile());
+		try (ReadableByteChannel channel = resource.readableChannel()) {
+			ByteBuffer buffer = ByteBuffer.allocate((int) resource.contentLength());
+			channel.read(buffer);
+			buffer.rewind();
+			assertThat(buffer.limit() > 0).isTrue();
 		}
 	}

-	@Nested
-	class AbstractResourceTests {
+	@Test
+	void inputStreamNotFoundOnFileSystemResource() throws IOException {
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				new FileSystemResource(getClass().getResource("Resource.class").getFile()).createRelative("X").getInputStream());
+	}

-		@Test
-		void missingResourceIsNotReadable() {
-			final String name = "test-resource";
+	@Test
+	void readableChannelNotFoundOnFileSystemResource() throws IOException {
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				new FileSystemResource(getClass().getResource("Resource.class").getFile()).createRelative("X").readableChannel());
+	}

-			Resource resource = new AbstractResource() {
-				@Override
-				public String getDescription() {
-					return name;
-				}
-
-				@Override
-				public InputStream getInputStream() throws IOException {
-					throw new FileNotFoundException();
-				}
-			};
-
-			assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getURL)
-					.withMessageContaining(name);
-			assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(resource::getFile)
-					.withMessageContaining(name);
-			assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
-					resource.createRelative("/testing")).withMessageContaining(name);
-			assertThat(resource.getFilename()).isNull();
-		}
-
-		@Test
-		void hasContentLength() throws Exception {
-			AbstractResource resource = new AbstractResource() {
-				@Override
-				public InputStream getInputStream() {
-					return new ByteArrayInputStream(new byte[] {'a', 'b', 'c'});
-				}
-
-				@Override
-				public String getDescription() {
-					return "";
-				}
-			};
-			assertThat(resource.contentLength()).isEqualTo(3L);
-		}
+	@Test
+	void inputStreamNotFoundOnClassPathResource() throws IOException {
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				new ClassPathResource("Resource.class", getClass()).createRelative("X").getInputStream());
+	}

+	@Test
+	void readableChannelNotFoundOnClassPathResource() throws IOException {
+		assertThatExceptionOfType(FileNotFoundException.class).isThrownBy(() ->
+				new ClassPathResource("Resource.class", getClass()).createRelative("X").readableChannel());
 	}

 }
@@ -990,27 +990,6 @@ class DataBufferUtilsTests extends AbstractDataBufferAllocatingTests {
 		}
 	}

-	@ParameterizedDataBufferAllocatingTest
-	void propagateContextPath(DataBufferFactory bufferFactory) throws IOException {
-		Path path = Paths.get(this.resource.getURI());
-		Path out = Files.createTempFile("data-buffer-utils-tests", ".tmp");
-
-		Flux<Void> result = DataBufferUtils.read(path, bufferFactory, 1024, StandardOpenOption.READ)
-				.transformDeferredContextual((f, ctx) -> {
-					assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
-					return f;
-				})
-				.transform(f -> DataBufferUtils.write(f, out))
-				.transformDeferredContextual((f, ctx) -> {
-					assertThat(ctx.getOrDefault("key", "EMPTY")).isEqualTo("TEST");
-					return f;
-				})
-				.contextWrite(Context.of("key", "TEST"));
-
-		StepVerifier.create(result)
-				.verifyComplete();
-	}
-
 	private static class ZeroDemandSubscriber extends BaseSubscriber<DataBuffer> {

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