Rename Storage.createFromStream create, add create for empty content

mziccard · mziccard · commit 86065a7fc7d1 · 2015-09-30T09:21:24.000+02:00
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
@@ -493,6 +493,14 @@ public static Builder builder() {
    */
   BucketInfo create(BucketInfo bucketInfo, BucketTargetOption... options);
 
+  /**
+   * Create a new blob with no content.
+   *
+   * @return a complete blob information.
+   * @throws StorageException upon failure
+   */
+  BlobInfo create(BlobInfo blobInfo, BlobTargetOption... options);
+
   /**
    * Create a new blob. Direct upload is used to upload {@code content}. For large content,
    * {@link #writer} is recommended as it uses resumable upload.
@@ -509,7 +517,7 @@ public static Builder builder() {
    * @return a complete blob information.
    * @throws StorageException upon failure
    */
-  BlobInfo createFromStream(BlobInfo blobInfo, InputStream content, BlobTargetOption... options);
+  BlobInfo create(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
@@ -114,14 +114,19 @@ public com.google.api.services.storage.model.Bucket call() {
         }, options().retryParams(), EXCEPTION_HANDLER));
   }
 
+  @Override
+  public BlobInfo create(BlobInfo blobInfo, BlobTargetOption... options) {
+    return create(blobInfo, new ByteArrayInputStream(EMPTY_BYTE_ARRAY), options);
+  }
+
   @Override
   public BlobInfo create(BlobInfo blobInfo, final byte[] content, BlobTargetOption... options) {
-    return createFromStream(blobInfo,
+    return create(blobInfo,
         new ByteArrayInputStream(firstNonNull(content, EMPTY_BYTE_ARRAY)), options);
   }
 
   @Override
-  public BlobInfo createFromStream(BlobInfo blobInfo, final InputStream content,
+  public BlobInfo create(BlobInfo blobInfo, final InputStream content,
       BlobTargetOption... options) {
     final StorageObject blobPb = blobInfo.toPb();
     final Map<StorageRpc.Option, ?> optionsMap = optionMap(blobInfo, options);
