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

Polish some Map operations 

Closes gh-15103
This commit is contained in:
dreis2211 2018-11-05 20:11:31 +01:00 committed by Stephane Nicoll
parent 804f647a34
commit 3e95af2c85
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -102,9 +102,9 @@ public class HealthStatusHttpMapper {
public int mapStatus(Status status) { public int mapStatus(Status status) {
String code = getUniformValue(status.getCode()); String code = getUniformValue(status.getCode());
if (code != null) { if (code != null) {
return this.statusMapping.keySet().stream() return this.statusMapping.entrySet().stream()
.filter((key) -> code.equals(getUniformValue(key))) .filter((entry) -> code.equals(getUniformValue(entry.getKey())))
.map(this.statusMapping::get).findFirst() .map(Map.Entry::getValue).findFirst()
.orElse(WebEndpointResponse.STATUS_OK); .orElse(WebEndpointResponse.STATUS_OK);
} }
return WebEndpointResponse.STATUS_OK; return WebEndpointResponse.STATUS_OK;

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java
View File

@ -79,8 +79,7 @@ public class SessionsEndpoint {
private final List<SessionDescriptor> sessions; private final List<SessionDescriptor> sessions;
public SessionsReport(Map<String, ? extends Session> sessions) { public SessionsReport(Map<String, ? extends Session> sessions) {
this.sessions = sessions.entrySet().stream() this.sessions = sessions.values().stream().map(SessionDescriptor::new)
.map((s) -> new SessionDescriptor(s.getValue()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -85,7 +85,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests {
this.context.refresh(); this.context.refresh();
Map<String, PersistenceExceptionTranslationPostProcessor> beans = this.context Map<String, PersistenceExceptionTranslationPostProcessor> beans = this.context
.getBeansOfType(PersistenceExceptionTranslationPostProcessor.class); .getBeansOfType(PersistenceExceptionTranslationPostProcessor.class);
assertThat(beans.entrySet()).isEmpty(); assertThat(beans).isEmpty();
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
View File

@ -68,8 +68,8 @@ class JavaBeanBinder implements BeanBinder {
private <T> boolean bind(BeanPropertyBinder propertyBinder, Bean<T> bean, private <T> boolean bind(BeanPropertyBinder propertyBinder, Bean<T> bean,
BeanSupplier<T> beanSupplier) { BeanSupplier<T> beanSupplier) {
boolean bound = false; boolean bound = false;
for (Map.Entry<String, BeanProperty> entry : bean.getProperties().entrySet()) { for (BeanProperty beanProperty : bean.getProperties().values()) {
bound |= bind(beanSupplier, propertyBinder, entry.getValue()); bound |= bind(beanSupplier, propertyBinder, beanProperty);
} }
return bound; return bound;
} }

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
View File

@ -620,7 +620,7 @@ public class MapBinderTests {
.withExistingValue(Collections.singletonMap("a", "b"))) .withExistingValue(Collections.singletonMap("a", "b")))
.get(); .get();
assertThat(result).hasSize(3); assertThat(result).hasSize(3);
assertThat(result.entrySet()).containsExactly(entry("a", "b"), entry("c", "d"), assertThat(result).containsExactly(entry("a", "b"), entry("c", "d"),
entry("e", "f")); entry("e", "f"));
} }