From 0de8317979b1cda2fd8c036634c13495b2fa5d76 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 10 Jul 2018 01:04:52 +0900 Subject: [PATCH] Separate logging from getUrlMappings() Closes gh-13710 --- .../web/ServletEndpointRegistrar.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java index 3859766a77b..1a45fa1db9b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java @@ -16,6 +16,7 @@ package org.springframework.boot.actuate.endpoint.web; +import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; @@ -76,18 +77,21 @@ public class ServletEndpointRegistrar implements ServletContextInitializer { EndpointServlet endpointServlet = endpoint.getEndpointServlet(); Dynamic registration = servletContext.addServlet(name, endpointServlet.getServlet()); - registration.addMapping(getUrlMappings(endpoint.getRootPath(), name)); + String[] urlMappings = getUrlMappings(endpoint.getRootPath()); + registration.addMapping(urlMappings); + if (logger.isInfoEnabled()) { + Arrays.stream(urlMappings).forEach( + (mapping) -> logger.info("Registered '" + mapping + "' to " + name)); + } registration.setInitParameters(endpointServlet.getInitParameters()); } - private String[] getUrlMappings(String endpointPath, String name) { - return this.basePaths - .stream().map((basePath) -> (basePath != null - ? basePath + "/" + endpointPath : "/" + endpointPath)) - .distinct().map((path) -> { - logger.info("Registered '" + path + "' to " + name); - return (path.endsWith("/") ? path + "*" : path + "/*"); - }).toArray(String[]::new); + private String[] getUrlMappings(String endpointPath) { + return this.basePaths.stream() + .map((basePath) -> (basePath != null ? basePath + "/" + endpointPath + : "/" + endpointPath)) + .distinct().map((path) -> (path.endsWith("/") ? path + "*" : path + "/*")) + .toArray(String[]::new); } }