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 pull request #13775 from izeye 

* gh-13775:
  Polish EndpointRequest.RequestMatcherFactory.antPath()
This commit is contained in:
Madhura Bhave 2018-07-17 16:53:56 -07:00
parent c36804908c 86ccb26c58
commit 777fc5e464
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
View File

@ -297,20 +297,12 @@ public final class EndpointRequest {
}
List<RequestMatcher> antPath(String... parts) {
List<RequestMatcher> matchers = new ArrayList<>();
this.servletPaths.stream().map((p) -> {
if (StringUtils.hasText(p) && !p.equals("/")) {
return p;
}
return "";
}).distinct().forEach((path) -> {
StringBuilder pattern = new StringBuilder(path);
for (String part : parts) {
pattern.append(part);
}
matchers.add(new AntPathRequestMatcher(pattern.toString()));
});
return matchers;
return this.servletPaths.stream()
.map((p) -> (StringUtils.hasText(p) && !p.equals("/") ? p : ""))
.distinct()
.map((path) -> Arrays.stream(parts)
.collect(Collectors.joining("", path, "")))
.map(AntPathRequestMatcher::new).collect(Collectors.toList());
}
}