From d4406507d0db6b0822cf02ebab6d9ed933d85406 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Thu, 14 Dec 2023 00:12:22 +0100
Subject: [PATCH] Polishing

---
 .../aot/AutowiredFieldValueResolver.java      | 10 ++---
 .../ResourceElementResolverFieldTests.java    |  2 +-
 .../ResourceElementResolverMethodTests.java   |  2 +-
 ...mlBeanFactoryTests-delegationOverrides.xml | 38 +++++--------------
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java
index 12cfc76b08..1c5f68fe90 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java
@@ -191,16 +191,14 @@ public final class AutowiredFieldValueResolver extends AutowiredElementResolver
 			return value;
 		}
 		catch (BeansException ex) {
-			throw new UnsatisfiedDependencyException(null, beanName,
-					new InjectionPoint(field), ex);
+			throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(field), ex);
 		}
 	}
 
 	private Field getField(RegisteredBean registeredBean) {
-		Field field = ReflectionUtils.findField(registeredBean.getBeanClass(),
-				this.fieldName);
-		Assert.notNull(field, () -> "No field '" + this.fieldName + "' found on "
-				+ registeredBean.getBeanClass().getName());
+		Field field = ReflectionUtils.findField(registeredBean.getBeanClass(), this.fieldName);
+		Assert.notNull(field, () -> "No field '" + this.fieldName + "' found on " +
+				registeredBean.getBeanClass().getName());
 		return field;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverFieldTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverFieldTests.java
index bac2714cad..35d65eeefc 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverFieldTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverFieldTests.java
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
- * Tests for {@code ResourceFieldValueResolver}.
+ * Tests for {@link ResourceElementResolver} with fields.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java
index d8b689216a..555f082c27 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
- * Tests for {@code ResourceMethodArgumentResolver}.
+ * Tests for {@link ResourceElementResolver} with methods.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
index 208fdf7b8f..d1a875359d 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
@@ -3,9 +3,6 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<!--
-		Not yet in use: illustration of possible approach
-	-->
 	<bean id="overrideOneMethod" class="org.springframework.beans.factory.xml.OverrideOneMethod">
 
 		<lookup-method name="getPrototypeDependency" bean="jenny"/>
@@ -27,48 +24,34 @@
 
 		<lookup-method name="protectedOverrideSingleton" bean="david"/>
 
-		<!--
-			This method is not overloaded, so we don't need to specify any arg types
-		-->
+		<!-- This method is not overloaded, so we don't need to specify any arg types -->
 		<replaced-method name="doSomething" replacer="doSomethingReplacer"/>
 
 	</bean>
 
-	<bean id="replaceVoidMethod" parent="someParent"
-			class="org.springframework.beans.factory.xml.OverrideOneMethodSubclass">
-	</bean>
+	<bean id="replaceVoidMethod" parent="someParent" class="org.springframework.beans.factory.xml.OverrideOneMethodSubclass"/>
 
 	<bean id="replaceEchoMethod" class="org.springframework.beans.factory.xml.EchoService">
-		<!--
-			This method is not overloaded, so we don't need to specify any arg types
-		-->
+		<!-- This method is not overloaded, so we don't need to specify any arg types -->
 		<replaced-method name="echo" replacer="reverseArrayReplacer" />
 	</bean>
 
-	<bean id="reverseReplacer"
-		class="org.springframework.beans.factory.xml.ReverseMethodReplacer"/>
+	<bean id="reverseReplacer" class="org.springframework.beans.factory.xml.ReverseMethodReplacer"/>
 
-	<bean id="reverseArrayReplacer"
-		class="org.springframework.beans.factory.xml.ReverseArrayMethodReplacer"/>
+	<bean id="reverseArrayReplacer" class="org.springframework.beans.factory.xml.ReverseArrayMethodReplacer"/>
 
-	<bean id="fixedReplacer"
-		class="org.springframework.beans.factory.xml.FixedMethodReplacer"/>
+	<bean id="fixedReplacer" class="org.springframework.beans.factory.xml.FixedMethodReplacer"/>
 
-	<bean id="doSomethingReplacer"
-		class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DoSomethingReplacer"/>
-
-	<bean id="serializableReplacer"
-		class="org.springframework.beans.factory.xml.SerializableMethodReplacerCandidate">
+	<bean id="doSomethingReplacer" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DoSomethingReplacer"/>
 
+	<bean id="serializableReplacer" class="org.springframework.beans.factory.xml.SerializableMethodReplacerCandidate">
 		<!-- Arbitrary method replacer -->
 		<replaced-method name="replaceMe" replacer="reverseReplacer">
 			<arg-type>String</arg-type>
 		</replaced-method>
-
 	</bean>
 
-	<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean"
-		scope="prototype">
+	<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
 		<property name="name"><value>Jenny</value></property>
 		<property name="age"><value>30</value></property>
 		<property name="spouse">
@@ -77,8 +60,7 @@
 		</property>
 	</bean>
 
-	<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean"
-		scope="singleton">
+	<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean" scope="singleton">
 		<description>
 			Simple bean, without any collections.
 		</description>