From 5d219bcd19961ea3f04b8ddad76acdea812d6a2d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 15 Oct 2018 14:45:04 -0700 Subject: [PATCH] Polish --- .../endpoint/web/MappingWebEndpointPathMapper.java | 5 ++++- .../boot/actuate/couchbase/CouchbaseHealthIndicator.java | 7 +------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java index c9757dd1175..26a0e42ff16 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java @@ -21,6 +21,7 @@ import java.util.Map; import org.springframework.boot.actuate.endpoint.EndpointId; import org.springframework.boot.actuate.endpoint.web.PathMapper; +import org.springframework.util.StringUtils; /** * A {@link PathMapper} implementation that uses a simple {@link Map} to determine the @@ -46,7 +47,9 @@ class MappingWebEndpointPathMapper implements PathMapper { @Override public String getRootPath(EndpointId endpointId) { - return this.pathMapping.getOrDefault(endpointId, endpointId.toString()); + String path = this.pathMapping.get(endpointId); + return StringUtils.hasText(path) ? path + : PathMapper.useEndpointId().getRootPath(endpointId); } } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicator.java index a2342d43b53..9262ca97ed5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicator.java @@ -147,12 +147,7 @@ public class CouchbaseHealthIndicator extends AbstractHealthIndicator { @Override public void checkHealth(Builder builder) throws Exception { DiagnosticsReport diagnostics = this.cluster.diagnostics(); - if (isCouchbaseUp(diagnostics)) { - builder.up(); - } - else { - builder.down(); - } + builder = isCouchbaseUp(diagnostics) ? builder.up() : builder.down(); builder.withDetail("sdk", diagnostics.sdk()); builder.withDetail("endpoints", diagnostics.endpoints().stream() .map(this::describe).collect(Collectors.toList()));