From 9f30b61cace5351117f97a5eaafc70dc524cda25 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Mon, 5 Oct 2015 15:32:22 +0200
Subject: [PATCH 1/4] Update storage examples, add storage section to readme

---
 README.md                                     | 42 +++++++++++++++++++
 .../gcloud/examples/StorageExample.java       | 42 +++++++++++--------
 .../google/gcloud/storage/package-info.java   | 10 ++---
 3 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 82d133495559..fe5a5e39f545 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 This client supports the following Google Cloud Platform services:
 
 -  [Google Cloud Datastore] (#google-cloud-datastore)
+-  [Google Cloud Storage] (#google-cloud-storage)
 
 <!---
 -  [Google Cloud Storage] (https://cloud.google.com/storage/)
@@ -86,6 +87,45 @@ if (entity == null) {
 }
 ```
 
+Google Cloud Storage
+----------------------
+
+Google [Cloud Storage][cloud-storage] is a durable and highly available
+object storage service. Google Cloud Storage is almost infinitely scalable
+and guarantees consistency: when a write succeeds, the latest copy of the
+object will be returned to any GET, globally.
+
+See the [Google Cloud Storage docs][cloud-storage-activation] for more details on how to activate
+Cloud Storage for your project.
+
+See the ``gcloud-java`` API [storage documentation][storage-api] to learn how to interact
+with the Cloud Storage using this Client Library.
+
+```java
+import com.google.gcloud.storage.Blob;
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageFactory;
+import com.google.gcloud.storage.StorageOptions;
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+
+StorageOptions options = StorageOptions.builder().projectId(PROJECT_ID).build();
+Storage storage = StorageFactory.instance().get(options);
+byte[] content = readContent();
+Blob blob = new Blob(storage, "bucket", "blob_name");
+if (!blob.exists()) {
+  storage.create(blob.info(), content);
+} else {
+  System.out.println("Updating content for " + blob.info().name());
+  byte[] prevContent = blob.content();
+  content = mergeContent(prevContent, content);
+  WritableByteChannel channel = blob.writer();
+  channel.write(ByteBuffer.wrap(content));
+  channel.close();
+  }
+}
+```
+
 Contributing
 ------------
 
@@ -130,3 +170,5 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-storage]: https://cloud.google.com/storage/
 [cloud-storage-docs]: https://cloud.google.com/storage/docs/overview
 [cloud-storage-create-bucket]: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets
+[cloud-storage-activation]: https://cloud.google.com/storage/docs/signup
+[storage-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/storage/package-summary.html
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 26437b995bd2..2ac1dcacce52 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
@@ -22,9 +22,11 @@
 import com.google.gcloud.spi.StorageRpc.Tuple;
 import com.google.gcloud.storage.BatchRequest;
 import com.google.gcloud.storage.BatchResponse;
+import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.BlobInfo;
 import com.google.gcloud.storage.BlobReadChannel;
 import com.google.gcloud.storage.BlobWriteChannel;
+import com.google.gcloud.storage.Bucket;
 import com.google.gcloud.storage.BucketInfo;
 import com.google.gcloud.storage.Storage;
 import com.google.gcloud.storage.Storage.ComposeRequest;
@@ -142,12 +144,12 @@ public void run(Storage storage, BlobInfo... blobInfos) {
       if (blobInfos.length == 1) {
         if (blobInfos[0].name().isEmpty()) {
           // get Bucket
-          BucketInfo bucketInfo = storage.get(blobInfos[0].bucket());
-          System.out.println("Bucket info: " + bucketInfo);
+          Bucket bucket = new Bucket(storage, blobInfos[0].bucket());
+          System.out.println("Bucket info: " + bucket.reload().info());
         } else {
           // get Blob
-          BlobInfo blobInfo = storage.get(blobInfos[0].bucket(), blobInfos[0].name());
-          System.out.println("Blob info: " + blobInfo);
+          Blob blob = new Blob(storage, blobInfos[0]);
+          System.out.println("Blob info: " + blob.reload().info());
         }
       } else {
         // use batch to get multiple blobs.
@@ -187,7 +189,7 @@ private static class DeleteAction extends BlobsAction {
     @Override
     public void run(Storage storage, BlobInfo... blobInfos) {
       if (blobInfos.length == 1) {
-        boolean wasDeleted = storage.delete(blobInfos[0].bucket(), blobInfos[0].name());
+        boolean wasDeleted = new Blob(storage, blobInfos[0]).delete();
         if (wasDeleted) {
           System.out.println("Blob " + blobInfos[0] + " was deleted");
         }
@@ -237,8 +239,9 @@ public void run(Storage storage, String bucket) {
         }
       } else {
         // list a bucket's blobs
-        for (BlobInfo b : storage.list(bucket)) {
-          System.out.println(b);
+        Bucket functionalBucket = new Bucket(storage, bucket);
+        for (Blob b : functionalBucket.list()) {
+          System.out.println(b.info());
         }
       }
     }
@@ -264,7 +267,8 @@ private void run(Storage storage, Path uploadFrom, BlobInfo blobInfo) throws IOE
       if (Files.size(uploadFrom) > 1_000_000) {
         // When content is not available or large (1MB or more) it is recommended
         // to write it in chunks via the blob's channel writer.
-        try (BlobWriteChannel writer = storage.writer(blobInfo)) {
+        Blob blob = new Blob(storage, blobInfo);
+        try (BlobWriteChannel writer = blob.writer()) {
           byte[] buffer = new byte[1024];
           try (InputStream input = Files.newInputStream(uploadFrom)) {
             int limit;
@@ -318,8 +322,9 @@ public void run(Storage storage, Tuple<BlobInfo, Path> tuple) throws IOException
 
     private void run(Storage storage, String bucket, String blobName, Path downloadTo)
         throws IOException {
+      Blob blob = new Blob(storage, bucket, blobName);
       BlobInfo blobInfo = storage.get(bucket, blobName);
-      if (blobInfo == null) {
+      if (!blob.exists()) {
         System.out.println("No such object");
         return;
       }
@@ -329,11 +334,11 @@ 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.readAllBytes(blobInfo.bucket(), blobInfo.name());
+        byte[] content = blob.content();
         writeTo.write(content);
       } else {
         // When Blob size is big or unknown use the blob's channel reader.
-        try (BlobReadChannel reader = storage.reader(blobInfo.bucket(), blobInfo.name())) {
+        try (BlobReadChannel reader = blob.reader()) {
           WritableByteChannel channel = Channels.newChannel(writeTo);
           ByteBuffer bytes = ByteBuffer.allocate(64 * 1024);
           while (reader.read(bytes) > 0) {
@@ -435,7 +440,8 @@ public String params() {
    *
    * @see <a href="https://cloud.google.com/storage/docs/json_api/v1/objects/update">Objects: update</a>
    */
-  private static class UpdateMetadataAction extends StorageAction<Tuple<BlobInfo, Map<String, String>>> {
+  private static class UpdateMetadataAction extends
+      StorageAction<Tuple<BlobInfo, Map<String, String>>> {
 
     @Override
     public void run(Storage storage, Tuple<BlobInfo, Map<String, String>> tuple)
@@ -445,13 +451,13 @@ public void run(Storage storage, Tuple<BlobInfo, Map<String, String>> tuple)
 
     private void run(Storage storage, String bucket, String blobName,
         Map<String, String> metadata) {
-      BlobInfo blobInfo = storage.get(bucket, blobName);
-      if (blobInfo == null) {
+      Blob blob = new Blob(storage, bucket, blobName).reload();
+      if (!blob.exists()) {
         System.out.println("No such object");
         return;
       }
-      blobInfo = storage.update(blobInfo.toBuilder().metadata(metadata).build());
-      System.out.println("Updated " + blobInfo);
+      Blob updateBlob = blob.update(blob.info().toBuilder().metadata(metadata).build());
+      System.out.println("Updated " + updateBlob.info());
     }
 
     @Override
@@ -487,7 +493,7 @@ public String params() {
   private static class SignUrlAction extends
       StorageAction<Tuple<ServiceAccountAuthCredentials, BlobInfo>> {
 
-    private static final char[] PASSWORD =  "notasecret".toCharArray();
+    private static final char[] PASSWORD = "notasecret".toCharArray();
 
     @Override
     public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, BlobInfo> tuple)
@@ -501,7 +507,7 @@ private void run(Storage storage, ServiceAccountAuthCredentials cred, BlobInfo b
       cal.add(Calendar.DATE, 1);
       long expiration = cal.getTimeInMillis() / 1000;
       System.out.println("Signed URL: " +
-          storage.signUrl(blobInfo, expiration, SignUrlOption.serviceAccount(cred)));
+          new Blob(storage, blobInfo).signUrl(expiration, SignUrlOption.serviceAccount(cred)));
     }
 
     @Override
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 cb43dd0be1b2..1f7dc8218caf 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
@@ -22,13 +22,13 @@
  * StorageOptions options = StorageOptions.builder().projectId("project").build();
  * Storage storage = StorageFactory.instance().get(options);
  * byte[] content = readContent();
- * BlobInfo blobInfo = storage.get("bucket", "blob_name");
- * if (blobInfo == null) {
- *   storage.create(BlobInfo.of("bucket", "blob_name"), content);
+ * Blob blob = new Blob(storage, "bucket", "blob_name");
+ * if (!blob.exists()) {
+ *   storage.create(blob.info(), content);
  * } else {
- *   byte[] prevContent = storage.readAllBytes("bucket", "blob_name");
+ *   byte[] prevContent = blob.content();
  *   content = mergeContent(prevContent, content);
- *   WritableByteChannel channel = storage.writer(blob);
+ *   WritableByteChannel channel = blob.writer();
  *   channel.write(ByteBuffer.wrap(content));
  *   channel.close();
  * }}</pre>

From ebfde4b2a0983385f4189d04e18611f4a9f26ee4 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Mon, 5 Oct 2015 16:27:23 +0200
Subject: [PATCH 2/4] Make readme anchors consistent

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fe5a5e39f545..eef58a375ab7 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Example Applications
 Google Cloud Datastore
 ----------------------
 
-Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
+[Google Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
 storing non-relational data. Cloud Datastore automatically scales with
 your users and supports ACID transactions, high availability of reads and
 writes, strong consistency for reads and ancestor queries, and eventual
@@ -90,7 +90,7 @@ if (entity == null) {
 Google Cloud Storage
 ----------------------
 
-Google [Cloud Storage][cloud-storage] is a durable and highly available
+[Google Cloud Storage][cloud-storage] is a durable and highly available
 object storage service. Google Cloud Storage is almost infinitely scalable
 and guarantees consistency: when a write succeeds, the latest copy of the
 object will be returned to any GET, globally.

From abc9a0091cea65adf7682c2c31493d5ab0f00d37 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Tue, 6 Oct 2015 14:49:01 +0200
Subject: [PATCH 3/4] Refactor storage readme example to use strings

---
 README.md                                             | 11 ++++++-----
 .../java/com/google/gcloud/storage/package-info.java  |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index eef58a375ab7..baca66b35ec1 100644
--- a/README.md
+++ b/README.md
@@ -102,27 +102,28 @@ See the ``gcloud-java`` API [storage documentation][storage-api] to learn how to
 with the Cloud Storage using this Client Library.
 
 ```java
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.gcloud.storage.Blob;
 import com.google.gcloud.storage.Storage;
 import com.google.gcloud.storage.StorageFactory;
 import com.google.gcloud.storage.StorageOptions;
+
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
 StorageOptions options = StorageOptions.builder().projectId(PROJECT_ID).build();
 Storage storage = StorageFactory.instance().get(options);
-byte[] content = readContent();
 Blob blob = new Blob(storage, "bucket", "blob_name");
 if (!blob.exists()) {
-  storage.create(blob.info(), content);
+  storage2.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
 } else {
   System.out.println("Updating content for " + blob.info().name());
   byte[] prevContent = blob.content();
-  content = mergeContent(prevContent, content);
+  System.out.println(new String(prevContent, UTF_8));
   WritableByteChannel channel = blob.writer();
-  channel.write(ByteBuffer.wrap(content));
+  channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
   channel.close();
-  }
 }
 ```
 
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 1f7dc8218caf..0ee04b92e857 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
@@ -21,15 +21,15 @@
  * <pre>{@code
  * StorageOptions options = StorageOptions.builder().projectId("project").build();
  * Storage storage = StorageFactory.instance().get(options);
- * byte[] content = readContent();
  * Blob blob = new Blob(storage, "bucket", "blob_name");
  * if (!blob.exists()) {
- *   storage.create(blob.info(), content);
+ *   storage.create(blob.info(), "Hello, Cloud Storage!".getBytes(UTF_8));
  * } else {
+ *   System.out.println("Updating content for " + blob.info().name());
  *   byte[] prevContent = blob.content();
- *   content = mergeContent(prevContent, content);
+ *   System.out.println(new String(prevContent, UTF_8));
  *   WritableByteChannel channel = blob.writer();
- *   channel.write(ByteBuffer.wrap(content));
+ *   channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
  *   channel.close();
  * }}</pre>
  *

From 167197fad96045bb8d6ce057761732bb83547585 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Tue, 6 Oct 2015 14:49:33 +0200
Subject: [PATCH 4/4] Update StorageExample actions to use functional Blob and
 Bucket

---
 .../gcloud/examples/StorageExample.java       | 130 +++++++++---------
 1 file changed, 63 insertions(+), 67 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 2ac1dcacce52..99b543107483 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
@@ -88,21 +88,21 @@ private static abstract class StorageAction<T> {
 
     abstract void run(Storage storage, T request) throws Exception;
 
-    abstract T parse(String... args) throws Exception;
+    abstract T parse(Storage storage, String... args) throws Exception;
 
     protected String params() {
       return "";
     }
   }
 
-  private static abstract class BlobAction extends StorageAction<BlobInfo> {
+  private static abstract class BlobAction extends StorageAction<Blob> {
 
     @Override
-    BlobInfo parse(String... args) {
+    Blob parse(Storage storage, String... args) {
       if (args.length != 2) {
         throw new IllegalArgumentException();
       }
-      return BlobInfo.of(args[0], args[1]);
+      return new Blob(storage, args[0], args[1]);
     }
 
     @Override
@@ -111,18 +111,18 @@ public String params() {
     }
   }
 
-  private static abstract class BlobsAction extends StorageAction<BlobInfo[]> {
+  private static abstract class BlobsAction extends StorageAction<Blob[]> {
 
     @Override
-    BlobInfo[] parse(String... args) {
+    Blob[] parse(Storage storage, String... args) {
       if (args.length < 2) {
         throw new IllegalArgumentException();
       }
-      BlobInfo[] blobInfos = new BlobInfo[args.length - 1];
+      Blob[] blobs = new Blob[args.length - 1];
       for (int i = 1; i < args.length; i++) {
-        blobInfos[i - 1] = BlobInfo.of(args[0], args[i]);
+        blobs[i - 1] = new Blob(storage, args[0], args[i]);
       }
-      return blobInfos;
+      return blobs;
     }
 
     @Override
@@ -140,22 +140,21 @@ public String params() {
    */
   private static class InfoAction extends BlobsAction {
     @Override
-    public void run(Storage storage, BlobInfo... blobInfos) {
-      if (blobInfos.length == 1) {
-        if (blobInfos[0].name().isEmpty()) {
+    public void run(Storage storage, Blob... blobs) {
+      if (blobs.length == 1) {
+        if (blobs[0].info().name().isEmpty()) {
           // get Bucket
-          Bucket bucket = new Bucket(storage, blobInfos[0].bucket());
+          Bucket bucket = new Bucket(storage, blobs[0].info().bucket());
           System.out.println("Bucket info: " + bucket.reload().info());
         } else {
           // get Blob
-          Blob blob = new Blob(storage, blobInfos[0]);
-          System.out.println("Blob info: " + blob.reload().info());
+          System.out.println("Blob info: " + blobs[0].reload().info());
         }
       } else {
         // use batch to get multiple blobs.
         BatchRequest.Builder batch = BatchRequest.builder();
-        for (BlobInfo blobInfo : blobInfos) {
-          batch.get(blobInfo.bucket(), blobInfo.name());
+        for (Blob blob : blobs) {
+          batch.get(blob.info().bucket(), blob.info().name());
         }
         BatchResponse response = storage.apply(batch.build());
         for (BatchResponse.Result<BlobInfo> result : response.gets()) {
@@ -165,11 +164,11 @@ public void run(Storage storage, BlobInfo... blobInfos) {
     }
 
     @Override
-    BlobInfo[] parse(String... args) {
+    Blob[] parse(Storage storage, String... args) {
       if (args.length < 2) {
-        return new BlobInfo[] {BlobInfo.of(args[0], "")};
+        return new Blob[] {new Blob(storage, args[0], "")};
       }
-      return super.parse(args);
+      return super.parse(storage, args);
     }
 
     @Override
@@ -187,24 +186,24 @@ public String params() {
    */
   private static class DeleteAction extends BlobsAction {
     @Override
-    public void run(Storage storage, BlobInfo... blobInfos) {
-      if (blobInfos.length == 1) {
-        boolean wasDeleted = new Blob(storage, blobInfos[0]).delete();
+    public void run(Storage storage, Blob... blobs) {
+      if (blobs.length == 1) {
+        boolean wasDeleted = blobs[0].delete();
         if (wasDeleted) {
-          System.out.println("Blob " + blobInfos[0] + " was deleted");
+          System.out.println("Blob " + blobs[0].info() + " was deleted");
         }
       } else {
         // use batch operation
         BatchRequest.Builder batch = BatchRequest.builder();
-        for (BlobInfo blobInfo : blobInfos) {
-          batch.delete(blobInfo.bucket(), blobInfo.name());
+        for (Blob blob : blobs) {
+          batch.delete(blob.info().bucket(), blob.info().name());
         }
         int index = 0;
         BatchResponse response = storage.apply(batch.build());
         for (BatchResponse.Result<Boolean> result : response.deletes()) {
           if (result.get()) {
             // request order is maintained
-            System.out.println("Blob " + blobInfos[index] + " was deleted");
+            System.out.println("Blob " + blobs[index].info() + " was deleted");
           }
           index++;
         }
@@ -220,7 +219,7 @@ public void run(Storage storage, BlobInfo... blobInfos) {
   private static class ListAction extends StorageAction<String> {
 
     @Override
-    String parse(String... args) {
+    String parse(Storage storage, String... args) {
       if (args.length == 0) {
         return null;
       }
@@ -231,16 +230,16 @@ String parse(String... args) {
     }
 
     @Override
-    public void run(Storage storage, String bucket) {
-      if (bucket == null) {
+    public void run(Storage storage, String bucketName) {
+      if (bucketName == null) {
         // list buckets
         for (BucketInfo b : storage.list()) {
           System.out.println(b);
         }
       } else {
         // list a bucket's blobs
-        Bucket functionalBucket = new Bucket(storage, bucket);
-        for (Blob b : functionalBucket.list()) {
+        Bucket bucket = new Bucket(storage, bucketName);
+        for (Blob b : bucket.list()) {
           System.out.println(b.info());
         }
       }
@@ -257,17 +256,16 @@ public String params() {
    *
    * @see <a href="https://cloud.google.com/storage/docs/json_api/v1/objects/insert">Objects: insert</a>
    */
-  private static class UploadAction extends StorageAction<Tuple<Path, BlobInfo>> {
+  private static class UploadAction extends StorageAction<Tuple<Path, Blob>> {
     @Override
-    public void run(Storage storage, Tuple<Path, BlobInfo> tuple) throws Exception {
+    public void run(Storage storage, Tuple<Path, Blob> tuple) throws Exception {
       run(storage, tuple.x(), tuple.y());
     }
 
-    private void run(Storage storage, Path uploadFrom, BlobInfo blobInfo) throws IOException {
+    private void run(Storage storage, Path uploadFrom, Blob blob) throws IOException {
       if (Files.size(uploadFrom) > 1_000_000) {
         // When content is not available or large (1MB or more) it is recommended
         // to write it in chunks via the blob's channel writer.
-        Blob blob = new Blob(storage, blobInfo);
         try (BlobWriteChannel writer = blob.writer()) {
           byte[] buffer = new byte[1024];
           try (InputStream input = Files.newInputStream(uploadFrom)) {
@@ -284,20 +282,21 @@ private void run(Storage storage, Path uploadFrom, BlobInfo blobInfo) throws IOE
       } else {
         byte[] bytes = Files.readAllBytes(uploadFrom);
         // create the blob in one request.
-        storage.create(blobInfo, bytes);
+        storage.create(blob.info(), bytes);
       }
       System.out.println("Blob was created");
     }
 
     @Override
-    Tuple<Path, BlobInfo> parse(String... args) throws IOException {
+    Tuple<Path, Blob> parse(Storage storage, String... args) throws IOException {
       if (args.length < 2 || args.length > 3) {
         throw new IllegalArgumentException();
       }
       Path path = Paths.get(args[0]);
       String contentType = Files.probeContentType(path);
       String blob = args.length < 3 ? path.getFileName().toString() : args[2];
-      return Tuple.of(path, BlobInfo.builder(args[1], blob).contentType(contentType).build());
+      BlobInfo info = BlobInfo.builder(args[1], blob).contentType(contentType).build();
+      return Tuple.of(path, new Blob(storage, info));
     }
 
     @Override
@@ -313,17 +312,15 @@ public String params() {
    *
    * @see <a href="https://cloud.google.com/storage/docs/json_api/v1/objects/get">Objects: get</a>
    */
-  private static class DownloadAction extends StorageAction<Tuple<BlobInfo, Path>> {
+  private static class DownloadAction extends StorageAction<Tuple<Blob, Path>> {
 
     @Override
-    public void run(Storage storage, Tuple<BlobInfo, Path> tuple) throws IOException {
-      run(storage, tuple.x().bucket(), tuple.x().name(), tuple.y());
+    public void run(Storage storage, Tuple<Blob, Path> tuple) throws IOException {
+      run(storage, tuple.x(), tuple.y());
     }
 
-    private void run(Storage storage, String bucket, String blobName, Path downloadTo)
-        throws IOException {
-      Blob blob = new Blob(storage, bucket, blobName);
-      BlobInfo blobInfo = storage.get(bucket, blobName);
+    private void run(Storage storage, Blob blob, Path downloadTo) throws IOException {
+      blob = blob.reload();
       if (!blob.exists()) {
         System.out.println("No such object");
         return;
@@ -332,7 +329,7 @@ private void run(Storage storage, String bucket, String blobName, Path downloadT
       if (downloadTo != null) {
         writeTo = new PrintStream(new FileOutputStream(downloadTo.toFile()));
       }
-      if (blobInfo.size() < 1_000_000) {
+      if (blob.info().size() < 1_000_000) {
         // Blob is small read all its content in one request
         byte[] content = blob.content();
         writeTo.write(content);
@@ -356,7 +353,7 @@ private void run(Storage storage, String bucket, String blobName, Path downloadT
     }
 
     @Override
-    Tuple<BlobInfo, Path> parse(String... args) {
+    Tuple<Blob, Path> parse(Storage storage, String... args) {
       if (args.length < 2 || args.length > 3) {
         throw new IllegalArgumentException();
       }
@@ -369,7 +366,7 @@ Tuple<BlobInfo, Path> parse(String... args) {
       } else {
         path = null;
       }
-      return Tuple.of(BlobInfo.of(args[0], args[1]), path);
+      return Tuple.of(new Blob(storage, args[0], args[1]), path);
     }
 
     @Override
@@ -391,7 +388,7 @@ public void run(Storage storage, CopyRequest request) {
     }
 
     @Override
-    CopyRequest parse(String... args) {
+    CopyRequest parse(Storage storage, String... args) {
       if (args.length != 4) {
         throw new IllegalArgumentException();
       }
@@ -417,7 +414,7 @@ public void run(Storage storage, ComposeRequest request) {
     }
 
     @Override
-    ComposeRequest parse(String... args) {
+    ComposeRequest parse(Storage storage, String... args) {
       if (args.length < 3) {
         throw new IllegalArgumentException();
       }
@@ -441,17 +438,16 @@ public String params() {
    * @see <a href="https://cloud.google.com/storage/docs/json_api/v1/objects/update">Objects: update</a>
    */
   private static class UpdateMetadataAction extends
-      StorageAction<Tuple<BlobInfo, Map<String, String>>> {
+      StorageAction<Tuple<Blob, Map<String, String>>> {
 
     @Override
-    public void run(Storage storage, Tuple<BlobInfo, Map<String, String>> tuple)
+    public void run(Storage storage, Tuple<Blob, Map<String, String>> tuple)
         throws IOException {
-      run(storage, tuple.x().bucket(), tuple.x().name(), tuple.y());
+      run(storage, tuple.x(), tuple.y());
     }
 
-    private void run(Storage storage, String bucket, String blobName,
-        Map<String, String> metadata) {
-      Blob blob = new Blob(storage, bucket, blobName).reload();
+    private void run(Storage storage, Blob blob, Map<String, String> metadata) {
+      blob = blob.reload();
       if (!blob.exists()) {
         System.out.println("No such object");
         return;
@@ -461,11 +457,11 @@ private void run(Storage storage, String bucket, String blobName,
     }
 
     @Override
-    Tuple<BlobInfo, Map<String, String>> parse(String... args) {
+    Tuple<Blob, Map<String, String>> parse(Storage storage, String... args) {
       if (args.length < 2) {
         throw new IllegalArgumentException();
       }
-      BlobInfo blobInfo = BlobInfo.of(args[0], args[1]);
+      Blob blob = new Blob(storage, args[0], args[1]);
       Map<String, String> metadata = new HashMap<>();
       for (int i = 2; i < args.length; i++) {
         int idx = args[i].indexOf('=');
@@ -475,7 +471,7 @@ Tuple<BlobInfo, Map<String, String>> parse(String... args) {
           metadata.put(args[i].substring(0, idx), args[i].substring(idx + 1));
         }
       }
-      return Tuple.of(blobInfo, metadata);
+      return Tuple.of(blob, metadata);
     }
 
     @Override
@@ -491,27 +487,27 @@ public String params() {
    * @see <a href="https://cloud.google.com/storage/docs/access-control#Signed-URLs">Signed URLs</a>
    */
   private static class SignUrlAction extends
-      StorageAction<Tuple<ServiceAccountAuthCredentials, BlobInfo>> {
+      StorageAction<Tuple<ServiceAccountAuthCredentials, Blob>> {
 
     private static final char[] PASSWORD = "notasecret".toCharArray();
 
     @Override
-    public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, BlobInfo> tuple)
+    public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, Blob> tuple)
         throws Exception {
       run(storage, tuple.x(), tuple.y());
     }
 
-    private void run(Storage storage, ServiceAccountAuthCredentials cred, BlobInfo blobInfo)
+    private void run(Storage storage, ServiceAccountAuthCredentials cred, Blob blob)
         throws IOException {
       Calendar cal = Calendar.getInstance();
       cal.add(Calendar.DATE, 1);
       long expiration = cal.getTimeInMillis() / 1000;
       System.out.println("Signed URL: " +
-          new Blob(storage, blobInfo).signUrl(expiration, SignUrlOption.serviceAccount(cred)));
+          blob.signUrl(expiration, SignUrlOption.serviceAccount(cred)));
     }
 
     @Override
-    Tuple<ServiceAccountAuthCredentials, BlobInfo> parse(String... args)
+    Tuple<ServiceAccountAuthCredentials, Blob> parse(Storage storage, String... args)
         throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException,
         UnrecoverableKeyException {
       if (args.length != 4) {
@@ -521,7 +517,7 @@ Tuple<ServiceAccountAuthCredentials, BlobInfo> parse(String... args)
       keystore.load(Files.newInputStream(Paths.get(args[0])), PASSWORD);
       PrivateKey privateKey = (PrivateKey) keystore.getKey("privatekey", PASSWORD);
       ServiceAccountAuthCredentials cred = AuthCredentials.createFor(args[1], privateKey);
-      return Tuple.of(cred, BlobInfo.of(args[2], args[3]));
+      return Tuple.of(cred, new Blob(storage, args[2], args[3]));
     }
 
     @Override
@@ -582,7 +578,7 @@ public static void main(String... args) throws Exception {
     Storage storage = StorageFactory.instance().get(optionsBuilder.build());
     Object request;
     try {
-      request = action.parse(args);
+      request = action.parse(storage, args);
     } catch (IllegalArgumentException ex) {
       System.out.println("Invalid input for action '" + args[1] + "'");
       System.out.println("Expected: " + action.params());