Issue 414: fixed length problem on string payload by eagerly encoding to UTF-8

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java

@@ -120,8 +120,8 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
          Map<Integer, Future<?>> responses = Maps.newHashMap();
          for (int i = 0; i < 10; i++) {
 
-            responses.put(i, Futures.compose(context.getAsyncBlobStore().getBlob(containerName, key),
+            responses.put(i,
-                     new Function<Blob, Void>() {
+                  Futures.compose(context.getAsyncBlobStore().getBlob(containerName, key), new Function<Blob, Void>() {
 
                      @Override
                      public Void apply(Blob from) {
@@ -156,7 +156,6 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
       context.getBlobStore().putBlob(containerName, sourceObject);
    }
 
-
    @Test(groups = { "integration", "live" })
    public void testGetIfModifiedSince() throws InterruptedException {
       String containerName = getContainerName();
@@ -365,15 +364,15 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
 
    @DataProvider(name = "delete")
    public Object[][] createData() {
-      return new Object[][] { { "normal" }, { "sp ace" }, { "qu?stion" }, { "unic₪de" }, { "path/foo" }, { "colon:" },
+      return new Object[][] { { "normal" }, { "sp ace" }, { "qu?stion" }, { "unic₪de" }, { "path/foo" },
-               { "asteri*k" }, { "quote\"" }, { "{great<r}" }, { "lesst>en" }, { "p|pe" } };
+            { "colon:" }, { "asteri*k" }, { "quote\"" }, { "{great<r}" }, { "lesst>en" }, { "p|pe" } };
    }
 
    @Test(groups = { "integration", "live" }, dataProvider = "delete")
    public void deleteObject(String key) throws InterruptedException {
       String containerName = getContainerName();
       try {
-         addBlobToContainer(containerName, key);
+         addBlobToContainer(containerName, key, key, MediaType.TEXT_PLAIN);
          context.getBlobStore().removeBlob(containerName, key);
          assertContainerEmptyDeleting(containerName, key);
       } finally {
@@ -391,9 +390,11 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
                }
 
             });
-      assertEquals(Iterables.size(listing), 0, String.format(
+      assertEquals(
-               "deleting %s, we still have %s blobs left in container %s, using encoding %s", key, Iterables
+            Iterables.size(listing),
-                        .size(listing), containerName, LOCAL_ENCODING));
+            0,
+            String.format("deleting %s, we still have %s blobs left in container %s, using encoding %s", key,
+                  Iterables.size(listing), containerName, LOCAL_ENCODING));
    }
 
    @Test(groups = { "integration", "live" })

blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java

@@ -25,8 +25,8 @@ import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CancellationException;
@@ -35,6 +35,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.attr.ConsistencyModel;
 import org.jclouds.blobstore.domain.Blob;
@@ -63,10 +65,10 @@ public class BaseBlobStoreIntegrationTest {
          String.format(XML_STRING_FORMAT, "bear"), "three", String.format(XML_STRING_FORMAT, "candy"), "four",
          String.format(XML_STRING_FORMAT, "dogma"), "five", String.format(XML_STRING_FORMAT, "emma"));
 
-   protected Map<String, String> fiveStringsUnderPath = ImmutableMap.of("path/1", String.format(XML_STRING_FORMAT,
+   protected Map<String, String> fiveStringsUnderPath = ImmutableMap.of("path/1",
-            "apple"), "path/2", String.format(XML_STRING_FORMAT, "bear"), "path/3", String.format(XML_STRING_FORMAT,
+         String.format(XML_STRING_FORMAT, "apple"), "path/2", String.format(XML_STRING_FORMAT, "bear"), "path/3",
-            "candy"), "path/4", String.format(XML_STRING_FORMAT, "dogma"), "path/5", String.format(XML_STRING_FORMAT,
+         String.format(XML_STRING_FORMAT, "candy"), "path/4", String.format(XML_STRING_FORMAT, "dogma"), "path/5",
-            "emma"));
+         String.format(XML_STRING_FORMAT, "emma"));
 
    public static long INCONSISTENCY_WINDOW = 10000;
    protected static volatile AtomicInteger containerIndex = new AtomicInteger(0);
@@ -238,9 +240,13 @@ public class BaseBlobStoreIntegrationTest {
    }
 
    protected String addBlobToContainer(String sourceContainer, String key) {
+      return addBlobToContainer(sourceContainer, key, TEST_STRING, MediaType.TEXT_XML);
+   }
+
+   protected String addBlobToContainer(String sourceContainer, String key, String payload, String contentType) {
       Blob sourceObject = context.getBlobStore().newBlob(key);
-      sourceObject.setPayload(TEST_STRING);
+      sourceObject.setPayload(payload);
-      sourceObject.getMetadata().getContentMetadata().setContentType("text/xml");
+      sourceObject.getMetadata().getContentMetadata().setContentType(contentType);
       return addBlobToContainer(sourceContainer, sourceObject);
    }
 

core/src/main/java/org/jclouds/io/payloads/StringPayload.java

@@ -19,18 +19,27 @@
 
 package org.jclouds.io.payloads;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.jclouds.util.Utils;
+import com.google.common.base.Charsets;
 
 /**
+ * This implementation converts the String to a byte array using UTF-8 encoding. If you wish to use
+ * a different encoding, please use {@link ByteArrayPayload}.
+ * 
  * @author Adrian Cole
  */
 public class StringPayload extends BasePayload<String> {
 
+   private final byte[] bytes;
+
+   // it is possible to discover length by walking the string and updating current length based on
+   // character code. However, this is process intense, and assumes an encoding type of UTF-8
    public StringPayload(String content) {
       super(content);
-      getContentMetadata().setContentLength((long) content.length());
+      this.bytes = content.getBytes(Charsets.UTF_8);
+      getContentMetadata().setContentLength(new Long(bytes.length));
    }
 
    /**
@@ -38,7 +47,7 @@ public class StringPayload extends BasePayload<String> {
     */
    @Override
    public InputStream getInput() {
-      return Utils.toInputStream(content);
+      return new ByteArrayInputStream(bytes);
    }
 
 }

core/src/main/java/org/jclouds/util/Utils.java

@@ -47,10 +47,10 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;