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

constructor arguments can be overridden by name in child bean definitions (SPR-6463) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2546 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2009-11-30 12:17:28 +00:00
parent 33fa946d9b
commit 65df1c6f4c
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
View File

@ -76,7 +76,7 @@ public class ConstructorArgumentValues {
}
for (ValueHolder valueHolder : other.genericArgumentValues) {
if (!this.genericArgumentValues.contains(valueHolder)) {
this.genericArgumentValues.add(valueHolder.copy());
addOrMergeGenericArgumentValue(valueHolder.copy());
}
}
}
@ -84,7 +84,7 @@ public class ConstructorArgumentValues {
/**
* Add argument value for the given index in the constructor argument list.
* Add an argument value for the given index in the constructor argument list.
* @param index the index in the constructor argument list
* @param value the argument value
*/
@ -93,7 +93,7 @@ public class ConstructorArgumentValues {
}
/**
* Add argument value for the given index in the constructor argument list.
* Add an argument value for the given index in the constructor argument list.
* @param index the index in the constructor argument list
* @param value the argument value
* @param type the type of the constructor argument
@ -103,7 +103,7 @@ public class ConstructorArgumentValues {
}
/**
* Add argument value for the given index in the constructor argument list.
* Add an argument value for the given index in the constructor argument list.
* @param index the index in the constructor argument list
* @param newValue the argument value in the form of a ValueHolder
*/
@ -114,7 +114,7 @@ public class ConstructorArgumentValues {
}
/**
* Add argument value for the given index in the constructor argument list,
* Add an argument value for the given index in the constructor argument list,
* merging the new value (typically a collection) with the current value
* if demanded: see {@link org.springframework.beans.Mergeable}.
* @param key the index in the constructor argument list
@ -183,7 +183,7 @@ public class ConstructorArgumentValues {
/**
* Add generic argument value to be matched by type.
* Add a generic argument value to be matched by type.
* <p>Note: A single generic argument value will just be used once,
* rather than matched multiple times.
* @param value the argument value
@ -193,7 +193,7 @@ public class ConstructorArgumentValues {
}
/**
* Add generic argument value to be matched by type.
* Add a generic argument value to be matched by type.
* <p>Note: A single generic argument value will just be used once,
* rather than matched multiple times.
* @param value the argument value
@ -204,7 +204,7 @@ public class ConstructorArgumentValues {
}
/**
* Add generic argument value to be matched by type.
* Add a generic argument value to be matched by type or name (if available).
* <p>Note: A single generic argument value will just be used once,
* rather than matched multiple times.
* @param newValue the argument value in the form of a ValueHolder
@ -215,10 +215,33 @@ public class ConstructorArgumentValues {
public void addGenericArgumentValue(ValueHolder newValue) {
Assert.notNull(newValue, "ValueHolder must not be null");
if (!this.genericArgumentValues.contains(newValue)) {
this.genericArgumentValues.add(newValue);
addOrMergeGenericArgumentValue(newValue);
}
}
/**
* Add a generic argument value, merging the new value (typically a collection)
* with the current value if demanded: see {@link org.springframework.beans.Mergeable}.
* @param newValue the argument value in the form of a ValueHolder
*/
private void addOrMergeGenericArgumentValue(ValueHolder newValue) {
if (newValue.getName() != null) {
for (Iterator<ValueHolder> it = this.genericArgumentValues.iterator(); it.hasNext();) {
ValueHolder currentValue = it.next();
if (newValue.getName().equals(currentValue.getName())) {
if (newValue.getValue() instanceof Mergeable) {
Mergeable mergeable = (Mergeable) newValue.getValue();
if (mergeable.isMergeEnabled()) {
newValue.setValue(mergeable.merge(currentValue.getValue()));
}
}
it.remove();
}
}
}
this.genericArgumentValues.add(newValue);
}
/**
* Look for a generic argument value that matches the given type.
* @param requiredType the type to match
@ -244,8 +267,8 @@ public class ConstructorArgumentValues {
* resolution process.
* @param requiredType the type to match (can be <code>null</code> to find
* an arbitrary next generic argument value)
* @param requiredName the type to match (can be <code>null</code> to match
* unnamed values only)
* @param requiredName the name to match (can be <code>null</code> to not
* match argument values by name)
* @param usedValueHolders a Set of ValueHolder objects that have already been used
* in the current resolution process and should therefore not be returned again
* @return the ValueHolder for the argument, or <code>null</code> if none found

7
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
View File

@ -109,7 +109,12 @@
<constructor-arg><value>29</value></constructor-arg>
</bean>
<bean id="rod17" class="org.springframework.beans.factory.xml.SimpleConstructorArgBean" scope="prototype">
<bean id="rod17" parent="rod16">
<constructor-arg name="otherSpouse"><ref bean="kerry2"/></constructor-arg>
<constructor-arg name="spouse"><ref bean="kerry1"/></constructor-arg>
</bean>
<bean id="rod18" class="org.springframework.beans.factory.xml.SimpleConstructorArgBean" scope="prototype">
</bean>
<bean id="kerry1" class="org.springframework.beans.TestBean">

15
org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
View File

@ -955,19 +955,24 @@ public final class XmlBeanFactoryTests {
assertEquals(kerry2, rod16.getSpouse1());
assertEquals(kerry1, rod16.getSpouse2());
assertEquals(29, rod16.getAge());
ConstructorDependenciesBean rod17 = (ConstructorDependenciesBean) xbf.getBean("rod17");
assertEquals(kerry1, rod17.getSpouse1());
assertEquals(kerry2, rod17.getSpouse2());
assertEquals(29, rod17.getAge());
}
public @Test void testPrototypeWithExplicitArguments() {
XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
SimpleConstructorArgBean cd1 = (SimpleConstructorArgBean) xbf.getBean("rod17");
SimpleConstructorArgBean cd1 = (SimpleConstructorArgBean) xbf.getBean("rod18");
assertEquals(0, cd1.getAge());
SimpleConstructorArgBean cd2 = (SimpleConstructorArgBean) xbf.getBean("rod17", 98);
SimpleConstructorArgBean cd2 = (SimpleConstructorArgBean) xbf.getBean("rod18", 98);
assertEquals(98, cd2.getAge());
SimpleConstructorArgBean cd3 = (SimpleConstructorArgBean) xbf.getBean("rod17", "myName");
SimpleConstructorArgBean cd3 = (SimpleConstructorArgBean) xbf.getBean("rod18", "myName");
assertEquals("myName", cd3.getName());
SimpleConstructorArgBean cd4 = (SimpleConstructorArgBean) xbf.getBean("rod17");
SimpleConstructorArgBean cd4 = (SimpleConstructorArgBean) xbf.getBean("rod18");
assertEquals(0, cd4.getAge());
SimpleConstructorArgBean cd5 = (SimpleConstructorArgBean) xbf.getBean("rod17", 97);
SimpleConstructorArgBean cd5 = (SimpleConstructorArgBean) xbf.getBean("rod18", 97);
assertEquals(97, cd5.getAge());
}