Commit 29605bac authored by dreis2211's avatar dreis2211 Committed by Stephane Nicoll

Polish stream creation in some PropertySources

Closes gh-13343
parent 95174a07
/*
* 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) {
......
/*
* 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment