---

mziccard · mziccard · commit b7ae943a405e · 2015-10-22T16:41:59.000+02:00
yaml --- r: 2303 b: refs/heads/update-datastore c: cd1c8cf h: refs/heads/master i: 2301: 3155aaf 2299: bb202d9 2295: 5d81b0a 2287: 569a582 2271: a4b49bc 2239: 890f189 2175: 586a74e 2047: 9b1d5b2
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 75d90658261a380c1573ecf2a5f533dc3ed986ed
+refs/heads/update-datastore: cd1c8cf05dd0446be2b3b059ffd5367e9a49fdc4
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/branches/update-datastore/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -193,6 +193,25 @@ public Blob create(String blob, byte[] content, String contentType, BlobTargetOp
     return new Blob(storage, storage.create(blobInfo, content, options));
   }
 
+  /**
+   * Creates a new blob in this bucket. Direct upload is used to upload {@code content}.
+   * For large content, {@link Blob#writer(com.google.gcloud.storage.Storage.BlobWriteOption...)}
+   * is recommended as it uses resumable upload.
+   * 
+   * @param blob a blob name
+   * @param content the blob content as a stream
+   * @param contentType the blob content type
+   * @param options options for blob creation
+   * @return a complete blob information.
+   * @throws StorageException upon failure
+   */
+  public Blob create(String blob, InputStream content, String contentType,
+      BlobWriteOption... options) {
+    BlobInfo blobInfo = BlobInfo.builder(BlobId.of(info.name(), blob))
+        .contentType(MoreObjects.firstNonNull(contentType, Storage.DEFAULT_CONTENT_TYPE)).build();
+    return new Blob(storage, storage.create(blobInfo, content, options));
+  }
+
   /**
    * Returns the bucket's {@code Storage} object used to issue requests.
    */
diff --git a/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -28,6 +28,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.gcloud.storage.BatchResponse.Result;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -180,6 +182,28 @@ public void testCreateNullContentType() throws Exception {
     assertEquals(info, blob.info());
   }
 
+  @Test
+  public void testCreateFromStream() throws Exception {
+    BlobInfo info = BlobInfo.builder("b", "n").contentType(CONTENT_TYPE).build();
+    byte[] content = {0xD, 0xE, 0xA, 0xD};
+    InputStream streamContent = new ByteArrayInputStream(content);
+    expect(storage.create(info, streamContent)).andReturn(info);
+    replay(storage);
+    Blob blob = bucket.create("n", streamContent, CONTENT_TYPE);
+    assertEquals(info, blob.info());
+  }
+
+  @Test
+  public void testCreateFromStreamNullContentType() throws Exception {
+    BlobInfo info = BlobInfo.builder("b", "n").contentType(Storage.DEFAULT_CONTENT_TYPE).build();
+    byte[] content = {0xD, 0xE, 0xA, 0xD};
+    InputStream streamContent = new ByteArrayInputStream(content);
+    expect(storage.create(info, streamContent)).andReturn(info);
+    replay(storage);
+    Blob blob = bucket.create("n", streamContent, null);
+    assertEquals(info, blob.info());
+  }
+
   @Test
   public void testLoad() throws Exception {
     expect(storage.get(BUCKET_INFO.name())).andReturn(BUCKET_INFO);
