From 788994da4d5b4af9aac74b0fb0ecdb0723f428af Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sun, 3 Jun 2018 12:40:21 +0200 Subject: [PATCH 1/2] Polish stream creation in some PropertySources --- .../source/AliasedIterableConfigurationPropertySource.java | 3 +-- .../source/FilteredIterableConfigurationPropertiesSource.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java index 38c0bea31e06..679f95f29cab 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.stream.Stream; -import java.util.stream.StreamSupport; import org.springframework.util.CollectionUtils; @@ -39,7 +38,7 @@ class AliasedIterableConfigurationPropertySource @Override public Stream stream() { - return StreamSupport.stream(getSource().spliterator(), false) + return getSource().stream() .flatMap(this::addAliases); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java index f936b4ab1487..adba453535bf 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java @@ -18,7 +18,6 @@ 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 stream() { - return StreamSupport.stream(getSource().spliterator(), false).filter(getFilter()); + return getSource().stream().filter(getFilter()); } @Override From 125069880a432aa01431f3a239ffd51776244fda Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sun, 3 Jun 2018 14:14:56 +0200 Subject: [PATCH 2/2] Polish contribution --- .../source/AliasedIterableConfigurationPropertySource.java | 5 ++--- .../FilteredIterableConfigurationPropertiesSource.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java index 679f95f29cab..47801b301f58 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/AliasedIterableConfigurationPropertySource.java @@ -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. @@ -38,8 +38,7 @@ class AliasedIterableConfigurationPropertySource @Override public Stream stream() { - return getSource().stream() - .flatMap(this::addAliases); + return getSource().stream().flatMap(this::addAliases); } private Stream addAliases(ConfigurationPropertyName name) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java index adba453535bf..370d5e066920 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/FilteredIterableConfigurationPropertiesSource.java @@ -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.