Merge branch '2.0.x'

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java

@@ -21,6 +21,7 @@
 
 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
@@ -40,7 +41,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);
 	}
 
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/couchbase/CouchbaseHealthIndicator.java

@@ -55,12 +55,7 @@ public CouchbaseHealthIndicator(Cluster cluster) {
 	@Override
 	protected void doHealthCheck(Health.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()));