diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java b/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java index 54d6c3c0e4..7380d802bc 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/filters/SignRequest.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Patterns.NEWLINE_PATTERN; import static org.jclouds.util.Strings2.toInputStream; import java.util.Set; -import java.util.regex.Pattern; import javax.annotation.Resource; import javax.inject.Inject; @@ -136,8 +135,6 @@ public class SignRequest implements HttpRequestFilter { toSign.append(request.getMethod()).append("\n"); } - private static final Pattern TWO_SPACE_PATTERN = Pattern.compile(" "); - private void appendCanonicalizedHeaders(HttpRequest request, StringBuilder toSign) { // TreeSet == Sort the headers alphabetically. Set headers = Sets.newTreeSet(request.getHeaders().keySet()); @@ -149,7 +146,7 @@ public class SignRequest implements HttpRequestFilter { // replacing any // newline characters and extra embedded white spaces in the value. for (String value : request.getHeaders().get(header)) { - value = Strings2.replaceAll(value, TWO_SPACE_PATTERN, " "); + value = value.replace(" ", " "); value = Strings2.replaceAll(value, NEWLINE_PATTERN, ""); toSign.append(value).append(' '); } diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java index 9f322de7d9..99c0335856 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java @@ -31,7 +31,6 @@ import org.jclouds.s3.domain.ListBucketResponse; import org.jclouds.s3.domain.ObjectMetadata; import org.jclouds.s3.domain.ObjectMetadataBuilder; import org.jclouds.s3.domain.internal.ListBucketResponseImpl; -import org.jclouds.util.Strings2; import org.xml.sax.Attributes; import com.google.common.collect.ImmutableSet; @@ -102,7 +101,7 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult CHAR_TO_PATTERN = CacheBuilder.newBuilder() - . build(new CacheLoader() { - @Override - public Pattern load(Character plain) { - return Pattern.compile(plain + ""); - } - }); - public static String toString(InputSupplier supplier) throws IOException { return CharStreams.toString(CharStreams.newReaderSupplier(supplier,