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

BeanDefinitionVisitor/PropertyPlaceholderConfigurer finds and resolves values in arrays as well (SPR-7136)

This commit is contained in:
Juergen Hoeller 2010-05-03 12:26:32 +00:00
parent dd8c18188f
commit 17a1362ed8
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -183,6 +183,9 @@ public class BeanDefinitionVisitor {
return new RuntimeBeanNameReference(newBeanName); return new RuntimeBeanNameReference(newBeanName);
} }
} }
else if (value instanceof Object[]) {
visitArray((Object[]) value);
}
else if (value instanceof List) { else if (value instanceof List) {
visitList((List) value); visitList((List) value);
} }
@ -206,6 +209,17 @@ public class BeanDefinitionVisitor {
return value; return value;
} }
@SuppressWarnings("unchecked")
protected void visitArray(Object[] arrayVal) {
for (int i = 0; i < arrayVal.length; i++) {
Object elem = arrayVal[i];
Object newVal = resolveValue(elem);
if (!ObjectUtils.nullSafeEquals(newVal, elem)) {
arrayVal[i] = newVal;
}
}
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected void visitList(List listVal) { protected void visitList(List listVal) {
for (int i = 0; i < listVal.size(); i++) { for (int i = 0; i < listVal.size(); i++) {

8
org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -376,6 +376,9 @@ public final class PropertyResourceConfigurerTests {
cas.addGenericArgumentValue("${var}name${age}"); cas.addGenericArgumentValue("${var}name${age}");
MutablePropertyValues pvs = new MutablePropertyValues(); MutablePropertyValues pvs = new MutablePropertyValues();
pvs.add("stringArray", new String[] {"${os.name}", "${age}"});
List<Object> friends = new ManagedList<Object>(); List<Object> friends = new ManagedList<Object>();
friends.add("na${age}me"); friends.add("na${age}me");
friends.add(new RuntimeBeanReference("${ref}")); friends.add(new RuntimeBeanReference("${ref}"));
@ -422,6 +425,9 @@ public final class PropertyResourceConfigurerTests {
assertEquals(tb2, tb1.getSpouse()); assertEquals(tb2, tb1.getSpouse());
assertEquals(1, tb1.getSomeMap().size()); assertEquals(1, tb1.getSomeMap().size());
assertEquals("myValue", tb1.getSomeMap().get("myKey")); assertEquals("myValue", tb1.getSomeMap().get("myKey"));
assertEquals(2, tb2.getStringArray().length);
assertEquals(System.getProperty("os.name"), tb2.getStringArray()[0]);
assertEquals("98", tb2.getStringArray()[1]);
assertEquals(2, tb2.getFriends().size()); assertEquals(2, tb2.getFriends().size());
assertEquals("na98me", tb2.getFriends().iterator().next()); assertEquals("na98me", tb2.getFriends().iterator().next());
assertEquals(tb2, tb2.getFriends().toArray()[1]); assertEquals(tb2, tb2.getFriends().toArray()[1]);