SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moves locateCollection impl to static method

Browse Source
This commit is contained in:
Spencer Gibb
2019-12-17 17:15:49 -05:00
parent d0ca983936
commit d8db91206e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceLocator.java
View File

@@ -44,15 +44,20 @@ public interface PropertySourceLocator {
PropertySource<?> locate(Environment environment);
default Collection<PropertySource<?>> locateCollection(Environment environment) {
PropertySource propertySource = locate(environment);
return locateCollection(this, environment);
}
static Collection<PropertySource<?>> locateCollection(PropertySourceLocator locator,
Environment environment) {
PropertySource<?> propertySource = locator.locate(environment);
if (propertySource == null) {
return Collections.EMPTY_LIST;
return Collections.emptyList();
}
if (CompositePropertySource.class.isInstance(propertySource)) {
Collection<PropertySource<?>> sources = ((CompositePropertySource) propertySource)
.getPropertySources();
List<PropertySource<?>> filteredSources = new ArrayList<>();
for (PropertySource p : sources) {
for (PropertySource<?> p : sources) {
if (p != null) {
filteredSources.add(p);
}
@@ -60,7 +65,7 @@ public interface PropertySourceLocator {
return filteredSources;
}
else {
return (List) Arrays.asList(propertySource);
return Arrays.asList(propertySource);
}
}