Skip to content

Polish stream creation in some PropertySources #13343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Polish stream creation in some PropertySources #13343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
788994d
Polish stream creation in some PropertySources
dreis2211 Jun 3, 2018
1250698
Polish contribution
dreis2211 Jun 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...gframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,7 +18,6 @@

import java.util.List;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import org.springframework.util.CollectionUtils;

Expand All @@ -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) {
Expand Down
5 changes: 2 additions & 3 deletions ...amework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,7 +18,6 @@

import java.util.function.Predicate;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

/**
* A filtered {@link IterableConfigurationPropertySource}.
Expand All @@ -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
Expand Down