spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Optimize single PathPattern match

Browse Source 
Closes gh-36275
This commit is contained in:
rstoyanchev
2026-02-09 16:33:22 +00:00
parent 02dc4b6342
commit 1d2351c87b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/PatternsRequestCondition.java
+6 -3
View File
@@ -157,12 +157,15 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
*/
@Override
public @Nullable PatternsRequestCondition getMatchingCondition(ServerWebExchange exchange) {
SortedSet<PathPattern> matches = getMatchingPatterns(exchange);
PathContainer lookupPath = exchange.getRequest().getPath().pathWithinApplication();
if (this.patterns.size() == 1) {
return (this.patterns.first().matches(lookupPath) ? this : null);
}
SortedSet<PathPattern> matches = getMatchingPatterns(lookupPath);
return (matches != null ? new PatternsRequestCondition(matches) : null);
}
private @Nullable SortedSet<PathPattern> getMatchingPatterns(ServerWebExchange exchange) {
PathContainer lookupPath = exchange.getRequest().getPath().pathWithinApplication();
private @Nullable SortedSet<PathPattern> getMatchingPatterns(PathContainer lookupPath) {
TreeSet<PathPattern> result = null;
for (PathPattern pattern : this.patterns) {
if (pattern.matches(lookupPath)) {
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestCondition.java
+3
View File
@@ -189,6 +189,9 @@ public final class PathPatternsRequestCondition extends AbstractRequestCondition
@Override
public @Nullable PathPatternsRequestCondition getMatchingCondition(HttpServletRequest request) {
PathContainer path = ServletRequestPathUtils.getParsedRequestPath(request).pathWithinApplication();
if (this.patterns.size() == 1) {
return (this.patterns.first().matches(path) ? this : null);
}
SortedSet<PathPattern> matches = getMatchingPatterns(path);
return (matches != null ? new PathPatternsRequestCondition(matches) : null);
}