---

mziccard · mziccard · commit cfb082a527a8 · 2015-10-22T16:41:59.000+02:00
yaml --- r: 1077 b: refs/heads/master c: cd1c8cf h: refs/heads/master i: 1075: b4b3b49 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 75d90658261a380c1573ecf2a5f533dc3ed986ed
+refs/heads/master: cd1c8cf05dd0446be2b3b059ffd5367e9a49fdc4
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/trunk/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/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/trunk/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);
