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-06-03 16:57:34 +02:00
parent 37a7457f36 d5ccd43feb
commit d924c89525
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,7 +18,6 @@ package org.springframework.boot.context.properties.source;
import java.util.List;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.springframework.util.CollectionUtils;
@ -39,8 +38,7 @@ class AliasedIterableConfigurationPropertySource
@Override
public Stream<ConfigurationPropertyName> stream() {
return StreamSupport.stream(getSource().spliterator(), false)
.flatMap(this::addAliases);
return getSource().stream().flatMap(this::addAliases);
}
private Stream<ConfigurationPropertyName> addAliases(ConfigurationPropertyName name) {

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,7 +18,6 @@ package org.springframework.boot.context.properties.source;
import java.util.function.Predicate;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
/**
* A filtered {@link IterableConfigurationPropertySource}.
@ -38,7 +37,7 @@ class FilteredIterableConfigurationPropertiesSource
@Override
public Stream<ConfigurationPropertyName> stream() {
return StreamSupport.stream(getSource().spliterator(), false).filter(getFilter());
return getSource().stream().filter(getFilter());
}
@Override