root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-10 15:31:56 +02:00
parent c1a81cfca0 419bf0d1ed
commit 8c691273e3
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/ServletEndpointRegistrar.java
View File

@ -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 {
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);
} }
} }