Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework @PropertySource early parsing logic

Browse Source 
Rework the @PropertySource parsing logic recently changed in commit
7c608886 to deal with the same source appearing on a @Configuration
class and an @Import class.

Processing now occurs in a single sweep, with any previously added
sources being converted to a CompositePropertySource.

Issue: SPR-12115
This commit is contained in:
Phillip Webb
2014-08-21 21:21:15 -07:00
parent b73c531527
commit 84564a0c7b
5 changed files with 177 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java vendored
View File

@@ -16,7 +16,9 @@
package org.springframework.core.env;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
/**
@@ -25,6 +27,7 @@ import java.util.Set;
* share the same name, e.g. when multiple values are supplied to {@code @PropertySource}.
*
* @author Chris Beams
* @author Phillip Webb
* @since 3.1.1
*/
public class CompositePropertySource extends PropertySource<Object> {
@@ -56,6 +59,13 @@ public class CompositePropertySource extends PropertySource<Object> {
this.propertySources.add(propertySource);
}
public void addFirstPropertySource(PropertySource<?> propertySource) {
List<PropertySource<?>> exisiting = new ArrayList<PropertySource<?>>(this.propertySources);
this.propertySources.clear();
this.propertySources.add(propertySource);
this.propertySources.addAll(exisiting);
}
@Override
public String toString() {
return String.format("%s [name='%s', propertySources=%s]",

4
spring-core/src/main/java/org/springframework/core/io/support/ResourcePropertySource.java
View File

@@ -115,7 +115,7 @@ public class ResourcePropertySource extends PropertiesPropertySource {
this(new DefaultResourceLoader().getResource(location));
}
private ResourcePropertySource(String name, Map<String, Object> source) {
protected ResourcePropertySource(String name, Map<String, Object> source) {
super(name, source);
}
@@ -137,7 +137,7 @@ public class ResourcePropertySource extends PropertiesPropertySource {
* empty, return the class name of the resource plus its identity hash code.
* @see org.springframework.core.io.Resource#getDescription()
*/
private static String getNameForResource(Resource resource) {
protected static String getNameForResource(Resource resource) {
String name = resource.getDescription();
if (!StringUtils.hasText(name)) {
name = resource.getClass().getSimpleName() + "@" + System.identityHashCode(resource);