add multi info to example

aozarov · aozarov · commit a24c7bc15e30 · 2015-05-03T17:50:12.000-07:00
diff --git a/src/main/java/com/google/gcloud/examples/StorageExample.java b/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -18,11 +18,12 @@
 
 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.Bucket;
 import com.google.gcloud.storage.StorageService;
-import com.google.gcloud.storage.StorageService.CopyRequest;
 import com.google.gcloud.storage.StorageService.ComposeRequest;
+import com.google.gcloud.storage.StorageService.CopyRequest;
 import com.google.gcloud.storage.StorageServiceFactory;
 import com.google.gcloud.storage.StorageServiceOptions;
 
@@ -102,43 +103,51 @@ public String params() {
     }
   }
 
-  private static class InfoAction extends BlobAction {
+  private static class InfoAction extends BlobsAction {
     @Override
-    public void run(StorageService storage, Blob blob) {
-      if (blob.name().isEmpty()) {
-        System.out.println(storage.get(Bucket.of(blob.bucket())));
+    public void run(StorageService storage, Blob... blobs) {
+      if (blobs.length == 1) {
+        if (blobs[0].name().isEmpty()) {
+          System.out.println(storage.get(Bucket.of(blobs[0].bucket())));
+        } else {
+          System.out.println(storage.get(blobs[0]));
+        }
       } else {
-        System.out.println(storage.get(blob));
+        BatchRequest.Builder batch = BatchRequest.builder();
+        for (Blob blob : blobs) {
+          batch.get(blob);
+        }
+        BatchResponse response = storage.apply(batch.build());
+        System.out.println(response.gets());
       }
     }
 
     @Override
-    Blob parse(String... args) {
+    Blob[] parse(String... args) {
       if (args.length < 2) {
-        return Blob.of(args[0], "");
+        return new Blob[] {Blob.of(args[0], "")};
       }
       return super.parse(args);
     }
 
     @Override
     public String params() {
-      return "<bucket> [<path>]";
+      return "<bucket> [<path>+]";
     }
   }
 
   private static class DeleteAction extends BlobsAction {
     @Override
     public void run(StorageService storage, Blob... blobs) {
       if (blobs.length == 1) {
-        System.out.println("Calling delete");
         System.out.println(storage.delete(blobs[0]));
       } else {
         BatchRequest.Builder batch = BatchRequest.builder();
         for (Blob blob : blobs) {
           batch.delete(blob);
         }
-        System.out.println("Calling batch.delete");
-        storage.apply(batch.build());
+        BatchResponse response = storage.apply(batch.build());
+        System.out.println(response.deletes());
       }
     }
   }
diff --git a/src/main/java/com/google/gcloud/storage/BatchRequest.java b/src/main/java/com/google/gcloud/storage/BatchRequest.java
@@ -31,9 +31,9 @@ public class BatchRequest implements Serializable {
 
   private static final long serialVersionUID = -1527992265939800345L;
 
-  private Map<Blob, BlobSourceOption[]> toDelete;
-  private Map<Blob, BlobTargetOption[]> toUpdate;
-  private Map<Blob, BlobSourceOption[]> toGet;
+  private final Map<Blob, BlobSourceOption[]> toDelete;
+  private final Map<Blob, BlobTargetOption[]> toUpdate;
+  private final Map<Blob, BlobSourceOption[]> toGet;
 
   public static class Builder {
 
@@ -63,6 +63,7 @@ public BatchRequest build() {
   private BatchRequest(Builder builder) {
     toDelete = ImmutableMap.copyOf(builder.toDelete);
     toUpdate = ImmutableMap.copyOf(builder.toUpdate);
+    toGet = ImmutableMap.copyOf(builder.toGet);
   }
 
   public Map<Blob, BlobSourceOption[]> toDelete() {
diff --git a/src/main/java/com/google/gcloud/storage/BatchResponse.java b/src/main/java/com/google/gcloud/storage/BatchResponse.java
@@ -16,6 +16,7 @@
 
 package com.google.gcloud.storage;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 
 import java.io.Serializable;
@@ -70,6 +71,11 @@ public StorageServiceException failure() {
     public boolean failed() {
       return exception != null;
     }
+
+    @Override
+    public String toString() {
+      return MoreObjects.firstNonNull(value, exception).toString();
+    }
   }
 
   BatchResponse(List<Result<Boolean>> deleteResult, List<Result<Blob>> updateResult,
