---

mziccard · mziccard · commit ca55908aef68 · 2015-09-23T11:11:04.000+02:00
yaml --- r: 6145 b: refs/heads/tswast-patch-1 c: c1f018c h: refs/heads/master i: 6143: b81efd6
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: 44cefb06a9f1a2393f0191fe93e34b9776ced00d
+refs/heads/tswast-patch-1: c1f018c35c46b9d9e2416fc0a8c542d972d78518
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java
@@ -16,9 +16,9 @@
 
 package com.google.gcloud.storage;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -27,13 +27,35 @@
 public class BlobListResult implements ListResult<Blob> {
 
   private final ListResult<BlobInfo> infoList;
-  private final transient Storage storage;
-  private transient List<Blob> results;
+  private final Storage storage;
+
+  private class BlobListIterator implements Iterator<Blob> {
+
+    private final Iterator<BlobInfo> blobInfoIterator;
+
+    public BlobListIterator() {
+      this.blobInfoIterator = infoList.iterator();
+    }
+
+    @Override
+    public boolean hasNext() {
+      return blobInfoIterator.hasNext();
+    }
+
+    @Override
+    public Blob next() {
+      return new Blob(storage, blobInfoIterator.next());
+    }
+
+    @Override
+    public void remove() {
+      blobInfoIterator.remove();
+    }
+  }
 
   public BlobListResult(Storage storage, ListResult<BlobInfo> infoList) {
-    this.storage = storage;
-    this.infoList = infoList;
-    this.results = null;
+    this.storage = checkNotNull(storage);
+    this.infoList = checkNotNull(infoList);
   }
 
   @Override
@@ -52,13 +74,7 @@ public ListResult<Blob> nextPage() {
 
   @Override
   public Iterator<Blob> iterator() {
-    if (results == null) {
-      this.results = new LinkedList<>();
-      for (Iterator<BlobInfo> it = infoList.iterator(); it.hasNext();) {
-        results.add(new Blob(storage, it.next()));
-      }
-    }
-    return results.iterator();
+    return new BlobListIterator();
   }
 
   @Override
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/ListResult.java
@@ -16,28 +16,19 @@
 
 package com.google.gcloud.storage;
 
-import java.util.Iterator;
-
 /**
  * Interface for Google Cloud storage list result.
  */
 public interface ListResult<T> extends Iterable<T> {
 
   /**
-   * Returns the cursor for the nextPage or {@code null} if no more results.
-   * 
-   * @return the string cursor for next page
+   * Return the cursor for the nextPage or {@code null} if no more results.
    */
-  public String nextPageCursor();
+  String nextPageCursor();
 
   /**
-   * Returns the results of the nextPage or {@code null} if no more result.
-   * 
-   * @return the {@code ListResult} object for the next page
+   * Return the results of the nextPage or {@code null} if no more result.
    */
-  public ListResult<T> nextPage();
-
-  @Override
-  public Iterator<T> iterator();
+  ListResult<T> nextPage();
 
 }
