From 3956423afefb7ab8f4d029c52933195f0d952823 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Thu, 7 Sep 2017 14:03:46 -0700 Subject: [PATCH] Polish The high level matchStarting API was removed a few commits ago. This change tidies up by removing the supporting infrastructure for that from the PathElements. --- .../web/util/pattern/CaptureVariablePathElement.java | 5 +---- .../web/util/pattern/LiteralPathElement.java | 3 --- .../org/springframework/web/util/pattern/PathPattern.java | 6 ------ .../springframework/web/util/pattern/RegexPathElement.java | 3 --- .../web/util/pattern/SeparatorPathElement.java | 3 --- .../web/util/pattern/SingleCharWildcardedPathElement.java | 3 --- .../web/util/pattern/WildcardPathElement.java | 3 --- 7 files changed, 1 insertion(+), 25 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java index db2daaec01..510f31894c 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/CaptureVariablePathElement.java @@ -111,10 +111,7 @@ class CaptureVariablePathElement extends PathElement { } } else { - if (matchingContext.isMatchStartMatching && pathIndex == matchingContext.pathLength) { - match = true; // no more data but matches up to this point - } - else if (this.next != null) { + if (this.next != null) { match = this.next.matches(pathIndex, matchingContext); } } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java index a6b9b23f58..6482b030ef 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/LiteralPathElement.java @@ -104,9 +104,6 @@ class LiteralPathElement extends PathElement { } } else { - if (matchingContext.isMatchStartMatching && pathIndex == matchingContext.pathLength) { - return true; // no more data but everything matched so far - } return (this.next != null && this.next.matches(pathIndex, matchingContext)); } } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index 3e54c740f1..738b03e824 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -581,8 +581,6 @@ public class PathPattern implements Comparable { final int pathLength; - boolean isMatchStartMatching = false; - @Nullable private Map extractedUriVariables; @@ -613,10 +611,6 @@ public class PathPattern implements Comparable { return matchOptionalTrailingSeparator; } - public void setMatchStartMatching(boolean b) { - isMatchStartMatching = b; - } - public void set(String key, String value, MultiValueMap parameters) { if (this.extractedUriVariables == null) { this.extractedUriVariables = new HashMap<>(); diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java index 3f5eaa028a..45a3326e97 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java @@ -153,9 +153,6 @@ class RegexPathElement extends PathElement { } } else { - if (matchingContext.isMatchStartMatching && (pathIndex + 1 >= matchingContext.pathLength)) { - return true; // no more data but matches up to this point - } matches = (this.next != null && this.next.matches(pathIndex + 1, matchingContext)); } } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java index 8290a89d0d..48a0535d74 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SeparatorPathElement.java @@ -51,9 +51,6 @@ class SeparatorPathElement extends PathElement { } else { pathIndex++; - if (matchingContext.isMatchStartMatching && pathIndex == matchingContext.pathLength) { - return true; // no more data but matches up to this point - } return (this.next != null && this.next.matches(pathIndex, matchingContext)); } } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java index 681f4dd6d9..bd6d94030f 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/SingleCharWildcardedPathElement.java @@ -111,9 +111,6 @@ class SingleCharWildcardedPathElement extends PathElement { } } else { - if (matchingContext.isMatchStartMatching && pathIndex == matchingContext.pathLength) { - return true; // no more data but everything matched so far - } return (this.next != null && this.next.matches(pathIndex, matchingContext)); } } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java index 2b07954e57..f267b4a6e2 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/WildcardPathElement.java @@ -73,9 +73,6 @@ class WildcardPathElement extends PathElement { } } else { - if (matchingContext.isMatchStartMatching && pathIndex == matchingContext.pathLength) { - return true; // no more data but matches up to this point - } // Within a path (e.g. /aa/*/bb) there must be at least one character to match the wildcard if (segmentData == null || segmentData.length() == 0) { return false;