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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-16 10:28:49 +02:00
parent ac1f2a5817 f325ee9406
commit 635986299c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/CompositePropertySources.java
View File

@ -19,7 +19,6 @@ package org.springframework.boot.context.properties;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.PropertySources;
@ -41,8 +40,7 @@ final class CompositePropertySources implements PropertySources {
@Override
public Iterator<PropertySource<?>> iterator() {
return this.propertySources.stream().flatMap(PropertySources::stream)
.collect(Collectors.toList()).iterator();
return this.propertySources.stream().flatMap(PropertySources::stream).iterator();
}
@Override