Commit 419bf0d1 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #13710 from izeye:get-url-mappings

* pr/13710:
  Separate logging from getUrlMappings()
parents 57e2bb9c 0de83179
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package org.springframework.boot.actuate.endpoint.web; package org.springframework.boot.actuate.endpoint.web;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
...@@ -76,18 +77,21 @@ public class ServletEndpointRegistrar implements ServletContextInitializer { ...@@ -76,18 +77,21 @@ public class ServletEndpointRegistrar implements ServletContextInitializer {
EndpointServlet endpointServlet = endpoint.getEndpointServlet(); EndpointServlet endpointServlet = endpoint.getEndpointServlet();
Dynamic registration = servletContext.addServlet(name, Dynamic registration = servletContext.addServlet(name,
endpointServlet.getServlet()); 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()); registration.setInitParameters(endpointServlet.getInitParameters());
} }
private String[] getUrlMappings(String endpointPath, String name) { private String[] getUrlMappings(String endpointPath) {
return this.basePaths return this.basePaths.stream()
.stream().map((basePath) -> (basePath != null .map((basePath) -> (basePath != null ? basePath + "/" + endpointPath
? basePath + "/" + endpointPath : "/" + endpointPath)) : "/" + endpointPath))
.distinct().map((path) -> { .distinct().map((path) -> (path.endsWith("/") ? path + "*" : path + "/*"))
logger.info("Registered '" + path + "' to " + name); .toArray(String[]::new);
return (path.endsWith("/") ? path + "*" : path + "/*");
}).toArray(String[]::new);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment