Merge pull request #89 from aozarov/temp

rename load to readAllBytes
googleapis · Jun 3, 2015 · 25067fb · 25067fb
2 parents 9a7cc80 + 74e45fa
commit 25067fb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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<StorageRpc.Option, ?> optionsMap = optionMap(options);
     return runWithRetries(new Callable<byte[]>() {

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
@@ -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));