Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #982 from andrewgaul/simplify-regex-replace 

Simplify regular expression replacement
This commit is contained in:
Adrian Cole 2012-11-12 08:21:12 -08:00
parent e0ebfa8e25 03c287dfa1
commit 528eda3e93
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
providers/aws-s3/src/main/java/org/jclouds/aws/s3/functions/ETagFromHttpResponseViaRegex.java
View File

@ -36,7 +36,7 @@ import com.google.common.base.Function;
@Singleton @Singleton
public class ETagFromHttpResponseViaRegex implements Function<HttpResponse, String> { public class ETagFromHttpResponseViaRegex implements Function<HttpResponse, String> {
private static Pattern pattern = Pattern.compile("<ETag>([\\S&&[^<]]+)</ETag>"); private static Pattern pattern = Pattern.compile("<ETag>([\\S&&[^<]]+)</ETag>");
private static Pattern quotPattern = Pattern.compile("(&quot;)"); private static String ESCAPED_QUOTE = "&quot;";
private final ReturnStringIf2xx returnStringIf200; private final ReturnStringIf2xx returnStringIf200;
@Inject @Inject
@ -52,16 +52,8 @@ public class ETagFromHttpResponseViaRegex implements Function<HttpResponse, Stri
Matcher matcher = pattern.matcher(content); Matcher matcher = pattern.matcher(content);
if (matcher.find()) { if (matcher.find()) {
value = matcher.group(1); value = matcher.group(1);
Matcher quotMatcher = quotPattern.matcher(value); if (value.indexOf(ESCAPED_QUOTE) != -1) {
StringBuffer quotBuffer = new StringBuffer(); value = value.replace(ESCAPED_QUOTE, "\"");
boolean foundUnescapedQuote = false;
while (quotMatcher.find()) {
quotMatcher.appendReplacement(quotBuffer, "\"");
foundUnescapedQuote = true;
}
if (foundUnescapedQuote) {
quotMatcher.appendTail(quotBuffer);
value = quotBuffer.toString();
} }
} }
} }