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

Simplify some Stream API usages 

See gh-19291
This commit is contained in:
dreis2211 2019-12-05 08:05:21 +01:00 committed by Stephane Nicoll
parent 5b92cd841d
commit b1158bf35d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/NamedContributorsMapAdapter.java
View File

@ -43,7 +43,7 @@ abstract class NamedContributorsMapAdapter<V, C> implements NamedContributors<C>
NamedContributorsMapAdapter(Map<String, V> map, Function<V, ? extends C> valueAdapter) { NamedContributorsMapAdapter(Map<String, V> map, Function<V, ? extends C> valueAdapter) {
Assert.notNull(map, "Map must not be null"); Assert.notNull(map, "Map must not be null");
Assert.notNull(valueAdapter, "ValueAdapter must not be null"); Assert.notNull(valueAdapter, "ValueAdapter must not be null");
map.keySet().stream().forEach((key) -> Assert.notNull(key, "Map must not contain null keys")); map.keySet().forEach((key) -> Assert.notNull(key, "Map must not contain null keys"));
map.values().stream().map(valueAdapter) map.values().stream().map(valueAdapter)
.forEach((value) -> Assert.notNull(value, "Map must not contain null values")); .forEach((value) -> Assert.notNull(value, "Map must not contain null values"));
this.map = Collections.unmodifiableMap(new LinkedHashMap<>(map)); this.map = Collections.unmodifiableMap(new LinkedHashMap<>(map));

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/SimpleStatusAggregator.java
View File

@ -69,7 +69,7 @@ public class SimpleStatusAggregator implements StatusAggregator {
@Override @Override
public Status getAggregateStatus(Set<Status> statuses) { public Status getAggregateStatus(Set<Status> statuses) {
return statuses.stream().filter(this::contains).sorted(this.comparator).findFirst().orElse(Status.UNKNOWN); return statuses.stream().filter(this::contains).min(this.comparator).orElse(Status.UNKNOWN);
} }
private boolean contains(Status status) { private boolean contains(Status status) {

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
View File

@ -96,7 +96,7 @@ class EmbeddedMongoAutoConfigurationTests {
features.add(Feature.ONLY_WINDOWS_2008_SERVER); features.add(Feature.ONLY_WINDOWS_2008_SERVER);
} }
load("spring.mongodb.embedded.features=" load("spring.mongodb.embedded.features="
+ String.join(", ", features.stream().map(Feature::name).collect(Collectors.toList()))); + features.stream().map(Feature::name).collect(Collectors.joining(", ")));
assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures()) assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures())
.containsExactlyElementsOf(features); .containsExactlyElementsOf(features);
} }