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

SPR-5251: URI Templates support infix variables: A-{B}-C

Browse Source
This commit is contained in:
Arjen Poutsma
2008-11-19 11:48:13 +00:00
parent 90ef7649c2
commit bb5150361b
2 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
org.springframework.core/src/main/java/org/springframework/util/AntPatchStringMatcher.java
View File

@@ -28,12 +28,7 @@ class AntPatchStringMatcher {
private final Map<String, String> uriTemplateVariables;
/**
* Constructs a new instance of the <code>AntPatchStringMatcher</code>.
* @param pattern
* @param str
* @param uriTemplateVariables
*/
/** Constructs a new instance of the <code>AntPatchStringMatcher</code>. */
AntPatchStringMatcher(String pattern, String str, Map<String, String> uriTemplateVariables) {
patArr = pattern.toCharArray();
strArr = str.toCharArray();
@@ -42,12 +37,6 @@ class AntPatchStringMatcher {
strIdxEnd = strArr.length - 1;
}
private void addTemplateVariable(String varName, String varValue) {
if (uriTemplateVariables != null) {
uriTemplateVariables.put(varName, varValue);
}
}
private void addTemplateVariable(int curlyIdxStart, int curlyIdxEnd, int valIdxStart, int valIdxEnd) {
if (uriTemplateVariables != null) {
String varName = new String(patArr, curlyIdxStart + 1, curlyIdxEnd - curlyIdxStart - 1);
@@ -56,6 +45,11 @@ class AntPatchStringMatcher {
}
}
/**
* Main entry point.
*
* @return <code>true</code> if the string matches against the pattern, or <code>false</code> otherwise.
*/
boolean matchStrings() {
if (shortcutPossible()) {
return doShortcut();
@@ -82,10 +76,16 @@ class AntPatchStringMatcher {
// process pattern between stars. padIdxStart and patIdxEnd point
// always to a '*'.
while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
int patIdxTmp = findNextStar();
if (patIdxTmp == patIdxStart + 1 && patArr[patIdxTmp] == '*') {
// Two stars next to each other, skip the first one.
patIdxStart++;
int patIdxTmp;
if (patArr[patIdxStart] == '{') {
patIdxTmp = findClosingCurly();
addTemplateVariable(patIdxStart, patIdxTmp, strIdxStart, strIdxEnd);
patIdxStart = patIdxTmp + 1;
strIdxStart = strIdxEnd + 1;
continue;
}
patIdxTmp = findNextStarOrCurly();
if (consecutiveStars(patIdxTmp)) {
continue;
}
// Find the pattern between padIdxStart & padIdxTmp in str between
@@ -119,9 +119,27 @@ class AntPatchStringMatcher {
return onlyStarsLeft();
}
private int findNextStar() {
private boolean consecutiveStars(int patIdxTmp) {
if (patIdxTmp == patIdxStart + 1 && patArr[patIdxStart] == '*' && patArr[patIdxTmp] == '*') {
// Two stars next to each other, skip the first one.
patIdxStart++;
return true;
}
return false;
}
private int findNextStarOrCurly() {
for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
if (patArr[i] == '*') {
if (patArr[i] == '*' || patArr[i] == '{') {
return i;
}
}
return -1;
}
private int findClosingCurly() {
for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
if (patArr[i] == '}') {
return i;
}
}