Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Dave Syer 2014-07-17 09:04:44 +01:00
commit fc9b160a72
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-tools/spring-boot-loader-tools/.gitignore vendored
View File

@ -1 +0,0 @@
/target

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

@ -100,7 +100,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
// that's better than nothing...
for (String propertyName : exacts) {
Object value;
value = source.getProperty(propertyName);
value = resolver.getProperty(propertyName);
if (value != null && !this.propertyValues.containsKey(propertyName)) {
this.propertyValues.put(propertyName, new PropertyValue(
propertyName, value));

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

@ -73,6 +73,23 @@ public class PropertySourcesPropertyValuesTests {
assertEquals("bar", propertyValues.getPropertyValue("name").getValue());
}
@Test
public void testNonEnumeratedPlaceholder() {
this.propertySources.addFirst(new PropertySource<String>("another", "baz") {
@Override
public Object getProperty(String name) {
if (name.equals(getSource())) {
return "${foo}";
}
return null;
}
});
PropertySourcesPropertyValues propertyValues = new PropertySourcesPropertyValues(
this.propertySources, null, Collections.singleton("baz"));
assertEquals("bar", propertyValues.getPropertyValue("baz").getValue());
}
@Test
public void testOverriddenValue() {
this.propertySources.addFirst(new MapPropertySource("new", Collections