spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-07 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Reuse cached PathPattern

Browse Source 
See gh-51852

Signed-off-by: crapxxi <aibynkairatov@gmail.com>
This commit is contained in:
crapxxi
2026-09-28 11:09:26 +02:00
committed by Stéphane Nicoll
parent 593344ccc1
commit 5cf401758d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/endpoint/web/AbstractWebMvcEndpointHandlerMapping.java
+7 -10
View File
@@ -78,7 +78,6 @@ import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
import org.springframework.web.util.ServletRequestPathUtils;
import org.springframework.web.util.pattern.PathPattern;
import org.springframework.web.util.pattern.PathPatternParser;
/**
* A custom {@link HandlerMapping} that makes {@link ExposableWebEndpoint web endpoints}
@@ -196,7 +195,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
protected void registerMapping(ExposableWebEndpoint endpoint, WebOperationRequestPredicate predicate,
WebOperation operation, String path) {
ServletWebOperation servletWebOperation = wrapServletWebOperation(endpoint, operation,
new ServletWebOperationAdapter(operation, getPatternParser()));
new ServletWebOperationAdapter(operation));
registerMapping(createRequestMappingInfo(predicate, path), new OperationHandler(servletWebOperation),
this.handleMethod);
}
@@ -337,11 +336,8 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
private final WebOperation operation;
private final @Nullable PathPatternParser patternParser;
ServletWebOperationAdapter(WebOperation operation, @Nullable PathPatternParser patternParser) {
ServletWebOperationAdapter(WebOperation operation) {
this.operation = operation;
this.patternParser = patternParser;
}
@Override
@@ -397,10 +393,10 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
}
private Object getRemainingPathSegments(HttpServletRequest request) {
Assert.state(this.patternParser != null, "'patternParser' must not be null");
String pattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
Assert.state(pattern != null, "'pattern' must not be null");
PathPattern pathPattern = this.patternParser.parse(pattern);
PathPattern pathPattern = (PathPattern) request
.getAttribute(HandlerMapping.BEST_MATCHING_PATH_PATTERN_ATTRIBUTE);
Assert.state(pathPattern != null, "'pathPattern' must not be null");
if (pathPattern.hasPatternSyntax()) {
String remainingSegments = pathPattern
.extractPathWithinPattern(
@@ -408,6 +404,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
.value();
return tokenizePathSegments(remainingSegments);
}
return tokenizePathSegments(pathPattern.toString());
}