From 3e95af2c8574fa8fadb221079579dc854d06cf3c Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 5 Nov 2018 20:11:31 +0100 Subject: [PATCH] Polish some Map operations Closes gh-15103 --- .../boot/actuate/health/HealthStatusHttpMapper.java | 8 ++++---- .../boot/actuate/session/SessionsEndpoint.java | 3 +-- ...istenceExceptionTranslationAutoConfigurationTests.java | 4 ++-- .../boot/context/properties/bind/JavaBeanBinder.java | 4 ++-- .../boot/context/properties/bind/MapBinderTests.java | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java index 9e3f3a1194a..0c0dc10a8a2 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.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. @@ -102,9 +102,9 @@ public class HealthStatusHttpMapper { public int mapStatus(Status status) { String code = getUniformValue(status.getCode()); if (code != null) { - return this.statusMapping.keySet().stream() - .filter((key) -> code.equals(getUniformValue(key))) - .map(this.statusMapping::get).findFirst() + return this.statusMapping.entrySet().stream() + .filter((entry) -> code.equals(getUniformValue(entry.getKey()))) + .map(Map.Entry::getValue).findFirst() .orElse(WebEndpointResponse.STATUS_OK); } return WebEndpointResponse.STATUS_OK; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java index a636429f129..50b862e801c 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java @@ -79,8 +79,7 @@ public class SessionsEndpoint { private final List sessions; public SessionsReport(Map sessions) { - this.sessions = sessions.entrySet().stream() - .map((s) -> new SessionDescriptor(s.getValue())) + this.sessions = sessions.values().stream().map(SessionDescriptor::new) .collect(Collectors.toList()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index 2b87ea56457..de33835f0ec 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.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. @@ -85,7 +85,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { this.context.refresh(); Map beans = this.context .getBeansOfType(PersistenceExceptionTranslationPostProcessor.class); - assertThat(beans.entrySet()).isEmpty(); + assertThat(beans).isEmpty(); } @Test(expected = IllegalArgumentException.class) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java index a50b56e78b4..fdde3947f9e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java @@ -68,8 +68,8 @@ class JavaBeanBinder implements BeanBinder { private boolean bind(BeanPropertyBinder propertyBinder, Bean bean, BeanSupplier beanSupplier) { boolean bound = false; - for (Map.Entry entry : bean.getProperties().entrySet()) { - bound |= bind(beanSupplier, propertyBinder, entry.getValue()); + for (BeanProperty beanProperty : bean.getProperties().values()) { + bound |= bind(beanSupplier, propertyBinder, beanProperty); } return bound; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java index 8a76e698dda..b9567dc2a0b 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java @@ -620,7 +620,7 @@ public class MapBinderTests { .withExistingValue(Collections.singletonMap("a", "b"))) .get(); 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")); }