---

aozarov · aozarov · commit 9299f66a381c · 2015-06-02T21:20:08.000-07:00
yaml --- r: 6055 b: refs/heads/tswast-patch-1 c: c47b9db h: refs/heads/master i: 6053: f8d7f7f 6051: 7a4e8ef 6047: 7a105db
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: 0a28868e4eceb2526aad76ab453697768ca7fb44
+refs/heads/tswast-patch-1: c47b9db43f90c346a600372ac5985820728cce52
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java b/branches/tswast-patch-1/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/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
@@ -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/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageImpl.java b/branches/tswast-patch-1/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/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/package-info.java b/branches/tswast-patch-1/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));

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ private void run(Storage storage, String bucket, String blobName, Path downloadT`
`329`	`329`	`}`
`330`	`330`	`if (blobInfo.size() < 1_000_000) {`
`331`	`331`	`// Blob is small read all its content in one request`
`332`		`- byte[] content = storage.load(blobInfo.bucket(), blobInfo.name());`
	`332`	`+ byte[] content = storage.readAllBytes(blobInfo.bucket(), blobInfo.name());`
`333`	`333`	`writeTo.write(content);`
`334`	`334`	`} else {`
`335`	`335`	`// When Blob size is big or unknown use the blob's channel reader.`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public StorageObject call() {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`@Override`
`357`		`- public byte[] load(String bucket, String blob, BlobSourceOption... options) {`
	`357`	`+ public byte[] readAllBytes(String bucket, String blob, BlobSourceOption... options) {`
`358`	`358`	`final StorageObject storageObject = BlobInfo.of(bucket, blob).toPb();`
`359`	`359`	`final Map<StorageRpc.Option, ?> optionsMap = optionMap(options);`
`360`	`360`	`return runWithRetries(new Callable<byte[]>() {`