From f61da8b72398d8e22baf7108bcd5fa76b9fd5cd2 Mon Sep 17 00:00:00 2001 From: mattisonchao Date: Fri, 25 Oct 2019 11:04:50 +0800 Subject: [PATCH] Polish See gh-18736 --- .../boot/actuate/endpoint/http/ApiVersion.java | 2 +- .../boot/actuate/endpoint/web/PathMappedEndpoints.java | 4 ++-- .../actuate/health/HealthWebEndpointResponseMapper.java | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java index 6267ef8f851..da37b253278 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java @@ -75,7 +75,7 @@ public enum ApiVersion { try { return valueOf(type.toUpperCase()); } - catch (IllegalArgumentException ex) { + catch (IllegalArgumentException ignored) { } } return null; diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoints.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoints.java index 6a98053496b..f08a35a0fb2 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoints.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoints.java @@ -65,13 +65,13 @@ public class PathMappedEndpoints implements Iterable { private Map getEndpoints(Collection> suppliers) { Map endpoints = new LinkedHashMap<>(); - suppliers.forEach((supplier) -> { + for (EndpointsSupplier supplier : suppliers) { supplier.getEndpoints().forEach((endpoint) -> { if (endpoint instanceof PathMappedEndpoint) { endpoints.put(endpoint.getEndpointId(), (PathMappedEndpoint) endpoint); } }); - }); + } return Collections.unmodifiableMap(endpoints); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java index 646d20be27a..c26f6263ac9 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapper.java @@ -100,11 +100,8 @@ public class HealthWebEndpointResponseMapper { } private boolean canSeeDetails(SecurityContext securityContext, ShowDetails showDetails) { - if (showDetails == ShowDetails.NEVER || (showDetails == ShowDetails.WHEN_AUTHORIZED - && (securityContext.getPrincipal() == null || !isUserInRole(securityContext)))) { - return false; - } - return true; + return showDetails != ShowDetails.NEVER && (showDetails != ShowDetails.WHEN_AUTHORIZED + || (securityContext.getPrincipal() != null && isUserInRole(securityContext))); } private boolean isUserInRole(SecurityContext securityContext) {