Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Moritz Halbritter
2025-04-24 08:36:31 +02:00
parent 53e0685c7a 46a709a850
commit d98086c288
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,6 +190,7 @@ public final class EndpointRequest {
}
private PathPatternParserServerWebExchangeMatcher getDelegateMatcher(String path, HttpMethod httpMethod) {
Assert.notNull(path, "'path' must not be null");
return new PathPatternParserServerWebExchangeMatcher(path + "/**", httpMethod);
}
@@ -328,11 +329,18 @@ public final class EndpointRequest {
if (this.includeLinks && StringUtils.hasText(endpoints.getBasePath())) {
delegateMatchers.add(new LinksServerWebExchangeMatcher());
}
if (delegateMatchers.isEmpty()) {
return EMPTY_MATCHER;
}
return new OrServerWebExchangeMatcher(delegateMatchers);
}
private Stream<String> streamPaths(List<Object> source, PathMappedEndpoints endpoints) {
return source.stream().filter(Objects::nonNull).map(this::getEndpointId).map(endpoints::getPath);
return source.stream()
.filter(Objects::nonNull)
.map(this::getEndpointId)
.map(endpoints::getPath)
.filter(Objects::nonNull);
}
@Override

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

@@ -362,11 +362,18 @@ public final class EndpointRequest {
if (this.includeLinks && StringUtils.hasText(basePath)) {
delegateMatchers.addAll(getLinksMatchers(requestMatcherFactory, matcherProvider, basePath));
}
if (delegateMatchers.isEmpty()) {
return EMPTY_MATCHER;
}
return new OrRequestMatcher(delegateMatchers);
}
private Stream<String> streamPaths(List<Object> source, PathMappedEndpoints endpoints) {
return source.stream().filter(Objects::nonNull).map(this::getEndpointId).map(endpoints::getPath);
return source.stream()
.filter(Objects::nonNull)
.map(this::getEndpointId)
.map(endpoints::getPath)
.filter(Objects::nonNull);
}
@Override
@@ -484,6 +491,7 @@ public final class EndpointRequest {
RequestMatcher antPath(RequestMatcherProvider matcherProvider, HttpMethod httpMethod, String... parts) {
StringBuilder pattern = new StringBuilder();
for (String part : parts) {
Assert.notNull(part, "'part' must not be null");
pattern.append(part);
}
return matcherProvider.getRequestMatcher(pattern.toString(), httpMethod);