createFromStream added to Storage, StorageRpc.create uses InputStream

mziccard · mziccard · commit 93b7a0c7edc3 · 2015-09-28T21:47:01.000+02:00
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -43,6 +43,7 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.InputStreamContent;
 import com.google.api.client.http.json.JsonHttpContent;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson.JacksonFactory;
@@ -63,6 +64,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -119,13 +121,14 @@ public Bucket create(Bucket bucket, Map<Option, ?> options) throws StorageExcept
   }
 
   @Override
-  public StorageObject create(StorageObject storageObject, final byte[] content,
+  public StorageObject create(StorageObject storageObject, final InputStream content,
       Map<Option, ?> options) throws StorageException {
     try {
-      return storage.objects()
+      Storage.Objects.Insert insert = storage.objects()
           .insert(storageObject.getBucket(), storageObject,
-              new ByteArrayContent(storageObject.getContentType(), content))
-          .setProjection(DEFAULT_PROJECTION)
+              new InputStreamContent(storageObject.getContentType(), content));
+      insert.getMediaHttpUploader().setDirectUploadEnabled(true);
+      return insert.setProjection(DEFAULT_PROJECTION)
           .setPredefinedAcl(PREDEFINED_ACL.getString(options))
           .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
           .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
@@ -521,4 +524,3 @@ public String open(StorageObject object, Map<Option, ?> options)
     }
   }
 }
-
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java b/gcloud-java-storage/src/main/java/com/google/gcloud/spi/StorageRpc.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.storage.StorageException;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -128,7 +129,7 @@ public BatchResponse(Map<StorageObject, Tuple<Boolean, StorageException>> delete
 
   Bucket create(Bucket bucket, Map<Option, ?> options) throws StorageException;
 
-  StorageObject create(StorageObject object, byte[] content, Map<Option, ?> options)
+  StorageObject create(StorageObject object, InputStream content, Map<Option, ?> options)
       throws StorageException;
 
   Tuple<String, Iterable<Bucket>> list(Map<Option, ?> options) throws StorageException;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java
@@ -25,6 +25,7 @@
 import com.google.gcloud.Service;
 import com.google.gcloud.spi.StorageRpc;
 
+import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Arrays;
@@ -500,6 +501,14 @@ public static Builder builder() {
    */
   BlobInfo create(BlobInfo blobInfo, byte[] content, BlobTargetOption... options);
 
+  /**
+   * Create a new blob.
+   *
+   * @return a complete blob information.
+   * @throws StorageException upon failure
+   */
+  BlobInfo createFromStream(BlobInfo blobInfo, InputStream content, BlobTargetOption... options);
+
   /**
    * Return the requested bucket or {@code null} if not found.
    *
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java
@@ -49,6 +49,8 @@
 import com.google.gcloud.spi.StorageRpc;
 import com.google.gcloud.spi.StorageRpc.Tuple;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -114,12 +116,20 @@ public com.google.api.services.storage.model.Bucket call() {
 
   @Override
   public BlobInfo create(BlobInfo blobInfo, final byte[] content, BlobTargetOption... options) {
+    return createFromStream(blobInfo,
+        new ByteArrayInputStream(firstNonNull(content, EMPTY_BYTE_ARRAY)), options);
+  }
+
+  @Override
+  public BlobInfo createFromStream(BlobInfo blobInfo, final InputStream content,
+      BlobTargetOption... options) {
     final StorageObject blobPb = blobInfo.toPb();
     final Map<StorageRpc.Option, ?> optionsMap = optionMap(blobInfo, options);
     return BlobInfo.fromPb(runWithRetries(new Callable<StorageObject>() {
       @Override
       public StorageObject call() {
-        return storageRpc.create(blobPb, firstNonNull(content, EMPTY_BYTE_ARRAY), optionsMap);
+        return storageRpc.create(blobPb,
+            firstNonNull(content, new ByteArrayInputStream(EMPTY_BYTE_ARRAY)), optionsMap);
       }
     }, options().retryParams(), EXCEPTION_HANDLER));
   }
