---

mziccard · mziccard · commit 2ec885e421cb · 2015-10-22T16:36:24.000+02:00
yaml --- r: 6347 b: refs/heads/tswast-patch-1 c: 75d9065 h: refs/heads/master i: 6345: 2135a21 6343: 5b36928
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 0dd3d971bafc2d724787a76e69fdde6dedba51df
+refs/heads/tswast-patch-1: 75d90658261a380c1573ecf2a5f533dc3ed986ed
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -19,10 +19,13 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.MoreObjects;
 import com.google.gcloud.storage.Storage.BlobSourceOption;
 import com.google.gcloud.storage.Storage.BlobTargetOption;
+import com.google.gcloud.storage.Storage.BlobWriteOption;
 import com.google.gcloud.storage.Storage.BucketSourceOption;
 import com.google.gcloud.storage.Storage.BucketTargetOption;
+import java.io.InputStream;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -172,17 +175,22 @@ public List<Blob> get(String blobName1, String blobName2, String... blobNames) {
   }
 
   /**
-   * Creates a new blob in this bucket.
+   * 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. MD5 and CRC32C hashes of {@code content} are
+   * computed and used for validating transferred data.
    * 
    * @param blob a blob name
    * @param content the blob content
+   * @param contentType the blob content type
    * @param options options for blob creation
    * @return a complete blob information.
    * @throws StorageException upon failure
    */
-  Blob create(String blob, byte[] content, BlobTargetOption... options) {
-    BlobId blobId = BlobId.of(info.name(), blob);
-    return new Blob(storage, storage.create(BlobInfo.builder(blobId).build(), content, options));
+  public Blob create(String blob, byte[] content, String contentType, BlobTargetOption... 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));
   }
 
   /**
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -46,6 +46,8 @@
  */
 public interface Storage extends Service<StorageOptions> {
 
+  public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+
   enum PredefinedAcl {
     AUTHENTICATED_READ("authenticatedRead"),
     ALL_AUTHENTICATED_USERS("allAuthenticatedUsers"),
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java b/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java
@@ -45,6 +45,7 @@ public class BucketTest {
       BlobInfo.builder("b", "n1").build(),
       BlobInfo.builder("b", "n2").build(),
       BlobInfo.builder("b", "n3").build());
+  private static final String CONTENT_TYPE = "text/plain";
 
   private Storage storage;
   private Bucket bucket;
@@ -161,11 +162,21 @@ public void testGetAll() throws Exception {
 
   @Test
   public void testCreate() throws Exception {
-    BlobInfo info = BlobInfo.builder("b", "n").build();
+    BlobInfo info = BlobInfo.builder("b", "n").contentType(CONTENT_TYPE).build();
+    byte[] content = {0xD, 0xE, 0xA, 0xD};
+    expect(storage.create(info, content)).andReturn(info);
+    replay(storage);
+    Blob blob = bucket.create("n", content, CONTENT_TYPE);
+    assertEquals(info, blob.info());
+  }
+
+  @Test
+  public void testCreateNullContentType() throws Exception {
+    BlobInfo info = BlobInfo.builder("b", "n").contentType(Storage.DEFAULT_CONTENT_TYPE).build();
     byte[] content = {0xD, 0xE, 0xA, 0xD};
     expect(storage.create(info, content)).andReturn(info);
     replay(storage);
-    Blob blob = bucket.create("n", content);
+    Blob blob = bucket.create("n", content, null);
     assertEquals(info, blob.info());
   }
 
