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

Merge branch '1.2.x' (types preserved in property values)

This commit is contained in:
Dave Syer 2015-04-29 08:30:16 +02:00
parent 8f7f934b82 efa7ad8370
commit 897834d37f
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
View File

@ -121,12 +121,15 @@ public class PropertySourcesPropertyValues implements PropertyValues {
.contains(source.getName()) && !includes.matches(propertyName)) { .contains(source.getName()) && !includes.matches(propertyName)) {
continue; continue;
} }
Object value = source.getProperty(propertyName); Object value = null;
try { try {
value = resolver.getProperty(propertyName); value = resolver.getProperty(propertyName, Object.class);
} }
catch (RuntimeException ex) { catch (RuntimeException ex) {
// Probably could not resolve placeholders, ignore it here // Probably could not resolve placeholders, ignore it here
if (value == null) {
value = source.getProperty(propertyName);
}
} }
if (!this.propertyValues.containsKey(propertyName)) { if (!this.propertyValues.containsKey(propertyName)) {
this.propertyValues.put(propertyName, new PropertyValue(propertyName, this.propertyValues.put(propertyName, new PropertyValue(propertyName,

11
spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
View File

@ -57,6 +57,17 @@ public class PropertySourcesPropertyValuesTests {
.<String, Object> singletonMap("name", "${foo}"))); .<String, Object> singletonMap("name", "${foo}")));
} }
@Test
public void testTypesPreserved() {
this.propertySources.replace(
"map",
new MapPropertySource("map", Collections.<String, Object> singletonMap(
"name", 123)));
PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues(
this.propertySources);
assertEquals(123, propertyValues.getPropertyValues()[0].getValue());
}
@Test @Test
public void testSize() { public void testSize() {
PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues( PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues(