From 74e45fa86298e41ad61e9c8e79d4491c1d0d2bdb Mon Sep 17 00:00:00 2001 From: ozarov Date: Tue, 2 Jun 2015 21:20:08 -0700 Subject: [PATCH] rename load to readAllBytes --- .../main/java/com/google/gcloud/examples/StorageExample.java | 2 +- .../src/main/java/com/google/gcloud/storage/Storage.java | 4 ++-- .../src/main/java/com/google/gcloud/storage/StorageImpl.java | 2 +- .../src/main/java/com/google/gcloud/storage/package-info.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java index 76016a1c8790..26437b995bd2 100644 --- a/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java +++ b/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java @@ -329,7 +329,7 @@ private void run(Storage storage, String bucket, String blobName, Path downloadT } if (blobInfo.size() < 1_000_000) { // Blob is small read all its content in one request - byte[] content = storage.load(blobInfo.bucket(), blobInfo.name()); + byte[] content = storage.readAllBytes(blobInfo.bucket(), blobInfo.name()); writeTo.write(content); } else { // When Blob size is big or unknown use the blob's channel reader. 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 index 770a5a924ff6..6427bfaccf58 100644 --- 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 @@ -560,12 +560,12 @@ public static Builder builder() { BlobInfo copy(CopyRequest copyRequest); /** - * Load the content of the given blob. + * Reads all the bytes from a blob. * * @return the blob's content. * @throws StorageException upon failure */ - byte[] load(String bucket, String blob, BlobSourceOption... options); + byte[] readAllBytes(String bucket, String blob, BlobSourceOption... options); /** * Send a batch request. 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 index 44c940f1c64a..6eb8e3359a4d 100644 --- 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 @@ -354,7 +354,7 @@ public StorageObject call() { } @Override - public byte[] load(String bucket, String blob, BlobSourceOption... options) { + public byte[] readAllBytes(String bucket, String blob, BlobSourceOption... options) { final StorageObject storageObject = BlobInfo.of(bucket, blob).toPb(); final Map optionsMap = optionMap(options); return runWithRetries(new Callable() { diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java index f689d264a828..cb43dd0be1b2 100644 --- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java +++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java @@ -26,7 +26,7 @@ * if (blobInfo == null) { * storage.create(BlobInfo.of("bucket", "blob_name"), content); * } else { - * byte[] prevContent = storage.load("bucket", "blob_name"); + * byte[] prevContent = storage.readAllBytes("bucket", "blob_name"); * content = mergeContent(prevContent, content); * WritableByteChannel channel = storage.writer(blob); * channel.write(ByteBuffer.wrap(content));