Refactor: Remove label usage for improved efficiency

spring-projects · Nov 17, 2024 · dc443ec · dc443ec
1 parent cea5d9e
commit dc443ec
Showing 1 changed file with 30 additions and 9 deletions.
diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -311,17 +311,12 @@ else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {
 			int strLength = (pathIdxEnd - pathIdxStart + 1);
 			int foundIdx = -1;
 
-			strLoop:
 			for (int i = 0; i <= strLength - patLength; i++) {
-				for (int j = 0; j < patLength; j++) {
-					String subPat = pattDirs[pattIdxStart + j + 1];
-					String subStr = pathDirs[pathIdxStart + i + j];
-					if (!matchStrings(subPat, subStr, uriTemplateVariables)) {
-						continue strLoop;
-					}
+				MatchContext context = new MatchContext(pattDirs, pathDirs, pattIdxStart, pathIdxStart, uriTemplateVariables );
+				if(checkSubPatternMatch(context, i, patLength)){
+					foundIdx = pathIdxStart + i;
+					break;
 				}
-				foundIdx = pathIdxStart + i;
-				break;
 			}
 
 			if (foundIdx == -1) {
@@ -340,6 +335,32 @@ else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) {
 
 		return true;
 	}
+	private static class MatchContext{
+		String[] pattDirs;
+		String[] pathDirs;
+		int pattIdxStart;
+		int pathIdxStart;
+		Map<String, String> uriTemplateVariables;
+
+		MatchContext(String[] pattDirs, String[] pathDirs, int pattIdxStart, int pathIdxStart, Map<String, String> uriTemplateVariables) {
+			this.pattDirs = pattDirs;
+			this.pathDirs = pathDirs;
+			this.pattIdxStart = pattIdxStart;
+			this.pathIdxStart = pathIdxStart;
+			this.uriTemplateVariables = uriTemplateVariables;
+		}
+	}
+
+	private boolean checkSubPatternMatch(MatchContext context, int i, int patLength) {
+		for (int j = 0; j < patLength; j++) {
+			String subPat = context.pattDirs[context.pattIdxStart + j + 1];
+			String subStr = context.pathDirs[context.pathIdxStart + i + j];
+			if (!matchStrings(subPat, subStr, context.uriTemplateVariables)) {
+				return false;
+			}
+		}
+		return true;
+	}
 
 	private boolean isPotentialMatch(String path, String[] pattDirs) {
 		if (!this.trimTokens) {