Use transform in BlobListResult

mziccard · mziccard · commit 2e90926ac904 · 2015-09-24T14:13:05.000+02:00
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobListResult.java
@@ -18,6 +18,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
+
 import java.util.Iterator;
 import java.util.Objects;
 
@@ -29,30 +32,6 @@ public class BlobListResult implements ListResult<Blob> {
   private final ListResult<BlobInfo> infoList;
   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 = checkNotNull(storage);
     this.infoList = checkNotNull(infoList);
@@ -74,7 +53,12 @@ public ListResult<Blob> nextPage() {
 
   @Override
   public Iterator<Blob> iterator() {
-    return new BlobListIterator();
+    return Iterators.transform(infoList.iterator(), new Function<BlobInfo, Blob>() {
+      @Override
+      public Blob apply(BlobInfo info) {
+        return new Blob(storage, info);
+      }
+    });
   }
 
   @Override
