root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2023-12-14 00:12:22 +01:00
parent a612518f96
commit d4406507d0
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java
View File

@ -191,16 +191,14 @@ public final class AutowiredFieldValueResolver extends AutowiredElementResolver
return value; return value;
} }
catch (BeansException ex) { catch (BeansException ex) {
throw new UnsatisfiedDependencyException(null, beanName, throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(field), ex);
new InjectionPoint(field), ex);
} }
} }
private Field getField(RegisteredBean registeredBean) { private Field getField(RegisteredBean registeredBean) {
Field field = ReflectionUtils.findField(registeredBean.getBeanClass(), Field field = ReflectionUtils.findField(registeredBean.getBeanClass(), this.fieldName);
this.fieldName); Assert.notNull(field, () -> "No field '" + this.fieldName + "' found on " +
Assert.notNull(field, () -> "No field '" + this.fieldName + "' found on " registeredBean.getBeanClass().getName());
+ registeredBean.getBeanClass().getName());
return field; return field;
} }

2
spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverFieldTests.java
View File

@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** /**
* Tests for {@code ResourceFieldValueResolver}. * Tests for {@link ResourceElementResolver} with fields.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */

2
spring-context/src/test/java/org/springframework/context/annotation/ResourceElementResolverMethodTests.java
View File

@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** /**
* Tests for {@code ResourceMethodArgumentResolver}. * Tests for {@link ResourceElementResolver} with methods.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */

38
spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
View File

@ -3,9 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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"> <bean id="overrideOneMethod" class="org.springframework.beans.factory.xml.OverrideOneMethod">
<lookup-method name="getPrototypeDependency" bean="jenny"/> <lookup-method name="getPrototypeDependency" bean="jenny"/>
@ -27,48 +24,34 @@
<lookup-method name="protectedOverrideSingleton" bean="david"/> <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"/> <replaced-method name="doSomething" replacer="doSomethingReplacer"/>
</bean> </bean>
<bean id="replaceVoidMethod" parent="someParent" <bean id="replaceVoidMethod" parent="someParent" class="org.springframework.beans.factory.xml.OverrideOneMethodSubclass"/>
class="org.springframework.beans.factory.xml.OverrideOneMethodSubclass">
</bean>
<bean id="replaceEchoMethod" class="org.springframework.beans.factory.xml.EchoService"> <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" /> <replaced-method name="echo" replacer="reverseArrayReplacer" />
</bean> </bean>
<bean id="reverseReplacer" <bean id="reverseReplacer" class="org.springframework.beans.factory.xml.ReverseMethodReplacer"/>
class="org.springframework.beans.factory.xml.ReverseMethodReplacer"/>
<bean id="reverseArrayReplacer" <bean id="reverseArrayReplacer" class="org.springframework.beans.factory.xml.ReverseArrayMethodReplacer"/>
class="org.springframework.beans.factory.xml.ReverseArrayMethodReplacer"/>
<bean id="fixedReplacer" <bean id="fixedReplacer" class="org.springframework.beans.factory.xml.FixedMethodReplacer"/>
class="org.springframework.beans.factory.xml.FixedMethodReplacer"/>
<bean id="doSomethingReplacer" <bean id="doSomethingReplacer" class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DoSomethingReplacer"/>
class="org.springframework.beans.factory.xml.XmlBeanFactoryTests$DoSomethingReplacer"/>
<bean id="serializableReplacer"
class="org.springframework.beans.factory.xml.SerializableMethodReplacerCandidate">
<bean id="serializableReplacer" class="org.springframework.beans.factory.xml.SerializableMethodReplacerCandidate">
<!-- Arbitrary method replacer --> <!-- Arbitrary method replacer -->
<replaced-method name="replaceMe" replacer="reverseReplacer"> <replaced-method name="replaceMe" replacer="reverseReplacer">
<arg-type>String</arg-type> <arg-type>String</arg-type>
</replaced-method> </replaced-method>
</bean> </bean>
<bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" <bean id="jenny" class="org.springframework.beans.testfixture.beans.TestBean" scope="prototype">
scope="prototype">
<property name="name"><value>Jenny</value></property> <property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property> <property name="age"><value>30</value></property>
<property name="spouse"> <property name="spouse">
@ -77,8 +60,7 @@
</property> </property>
</bean> </bean>
<bean id="david" class="org.springframework.beans.testfixture.beans.TestBean" <bean id="david" class="org.springframework.beans.testfixture.beans.TestBean" scope="singleton">
scope="singleton">
<description> <description>
Simple bean, without any collections. Simple bean, without any collections.
</description> </description>