Refactor pagination

Author: bitwiseman

src/main/java/org/kohsuke/github/GHAppInstallation.java

@@ -267,6 +267,7 @@ public PagedSearchIterable<GHRepository> listRepositories() {
 
         request = root().createRequest().withUrlPath("/installation/repositories").build();
 
-        return new PagedSearchIterable<>(root(), request, GHAppInstallationRepositoryResult.class);
+        return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()
+                .getClient(), request, GHAppInstallationRepositoryResult.class, GHRepository.class, null));
     }
 }

src/main/java/org/kohsuke/github/GHAppInstallationRequest.java

@@ -10,7 +10,6 @@
  */
 public class GHAppInstallationRequest extends GHObject {
     private GHOrganization account;
-
     private GHUser requester;
 
     /**

src/main/java/org/kohsuke/github/GHAppInstallationsIterable.java

@@ -1,9 +1,5 @@
 package org.kohsuke.github;
 
-import java.util.Iterator;
-
-import javax.annotation.Nonnull;
-
 // TODO: Auto-generated Javadoc
 /**
  * Iterable for GHAppInstallation listing.
@@ -12,8 +8,6 @@ class GHAppInstallationsIterable extends PagedIterable<GHAppInstallation> {
 
     /** The Constant APP_INSTALLATIONS_URL. */
     public static final String APP_INSTALLATIONS_URL = "/user/installations";
-    private GHAppInstallationsPage result;
-    private final transient GitHub root;
 
     /**
      * Instantiates a new GH app installations iterable.
@@ -22,45 +16,10 @@ class GHAppInstallationsIterable extends PagedIterable<GHAppInstallation> {
      *            the root
      */
     public GHAppInstallationsIterable(GitHub root) {
-        this.root = root;
-    }
-
-    /**
-     * Iterator.
-     *
-     * @param pageSize
-     *            the page size
-     * @return the paged iterator
-     */
-    @Nonnull
-    @Override
-    public PagedIterator<GHAppInstallation> _iterator(int pageSize) {
-        final GitHubRequest request = root.createRequest().withUrlPath(APP_INSTALLATIONS_URL).build();
-        return new PagedIterator<>(
-                adapt(GitHubPageIterator.create(root.getClient(), GHAppInstallationsPage.class, request, pageSize)),
-                null);
-    }
-
-    /**
-     * Adapt.
-     *
-     * @param base
-     *            the base
-     * @return the iterator
-     */
-    protected Iterator<GHAppInstallation[]> adapt(final Iterator<GHAppInstallationsPage> base) {
-        return new Iterator<GHAppInstallation[]>() {
-            public boolean hasNext() {
-                return base.hasNext();
-            }
-
-            public GHAppInstallation[] next() {
-                GHAppInstallationsPage v = base.next();
-                if (result == null) {
-                    result = v;
-                }
-                return v.getInstallations();
-            }
-        };
+        super(new GitHubEndpointIterable<>(root.getClient(),
+                root.createRequest().withUrlPath(APP_INSTALLATIONS_URL).build(),
+                GHAppInstallationsPage.class,
+                GHAppInstallation.class,
+                null));
     }
 }

src/main/java/org/kohsuke/github/GHAppInstallationsPage.java

@@ -4,10 +4,15 @@
 /**
  * Represents the one page of GHAppInstallations.
  */
-class GHAppInstallationsPage {
+class GHAppInstallationsPage implements GitHubPage<GHAppInstallation> {
     private GHAppInstallation[] installations;
     private int totalCount;
 
+    @Override
+    public GHAppInstallation[] getItems() {
+        return getInstallations();
+    }
+
     /**
      * Gets the total count.
      *

src/main/java/org/kohsuke/github/GHArtifactsIterable.java

@@ -1,18 +1,10 @@
 package org.kohsuke.github;
 
-import java.util.Iterator;
-
-import javax.annotation.Nonnull;
-
 // TODO: Auto-generated Javadoc
 /**
  * Iterable for artifacts listing.
  */
 class GHArtifactsIterable extends PagedIterable<GHArtifact> {
-    private final transient GHRepository owner;
-    private final GitHubRequest request;
-
-    private GHArtifactsPage result;
 
     /**
      * Instantiates a new GH artifacts iterable.
@@ -23,45 +15,10 @@ class GHArtifactsIterable extends PagedIterable<GHArtifact> {
      *            the request builder
      */
     public GHArtifactsIterable(GHRepository owner, GitHubRequest.Builder<?> requestBuilder) {
-        this.owner = owner;
-        this.request = requestBuilder.build();
-    }
-
-    /**
-     * Iterator.
-     *
-     * @param pageSize
-     *            the page size
-     * @return the paged iterator
-     */
-    @Nonnull
-    @Override
-    public PagedIterator<GHArtifact> _iterator(int pageSize) {
-        return new PagedIterator<>(
-                adapt(GitHubPageIterator.create(owner.root().getClient(), GHArtifactsPage.class, request, pageSize)),
-                null);
-    }
-
-    /**
-     * Adapt.
-     *
-     * @param base
-     *            the base
-     * @return the iterator
-     */
-    protected Iterator<GHArtifact[]> adapt(final Iterator<GHArtifactsPage> base) {
-        return new Iterator<GHArtifact[]>() {
-            public boolean hasNext() {
-                return base.hasNext();
-            }
-
-            public GHArtifact[] next() {
-                GHArtifactsPage v = base.next();
-                if (result == null) {
-                    result = v;
-                }
-                return v.getArtifacts(owner);
-            }
-        };
+        super(new GitHubEndpointIterable<>(owner.root().getClient(),
+                requestBuilder.build(),
+                GHArtifactsPage.class,
+                GHArtifact.class,
+                item -> item.wrapUp(owner)));
     }
 }

src/main/java/org/kohsuke/github/GHArtifactsPage.java

@@ -8,10 +8,15 @@
  */
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
-class GHArtifactsPage {
+class GHArtifactsPage implements GitHubPage<GHArtifact> {
     private GHArtifact[] artifacts;
     private int totalCount;
 
+    @Override
+    public GHArtifact[] getItems() {
+        return artifacts;
+    }
+
     /**
      * Gets the total count.
      *
@@ -20,18 +25,4 @@ class GHArtifactsPage {
     public int getTotalCount() {
         return totalCount;
     }
-
-    /**
-     * Gets the artifacts.
-     *
-     * @param owner
-     *            the owner
-     * @return the artifacts
-     */
-    GHArtifact[] getArtifacts(GHRepository owner) {
-        for (GHArtifact artifact : artifacts) {
-            artifact.wrapUp(owner);
-        }
-        return artifacts;
-    }
 }

src/main/java/org/kohsuke/github/GHAuthenticatedAppInstallation.java

@@ -39,7 +39,8 @@ public PagedSearchIterable<GHRepository> listRepositories() {
 
         request = root().createRequest().withUrlPath("/installation/repositories").build();
 
-        return new PagedSearchIterable<>(root(), request, GHAuthenticatedAppInstallationRepositoryResult.class);
+        return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()
+                .getClient(), request, GHAuthenticatedAppInstallationRepositoryResult.class, GHRepository.class, null));
     }
 
 }

src/main/java/org/kohsuke/github/GHCheckRunsIterable.java

@@ -1,19 +1,10 @@
 package org.kohsuke.github;
 
-import java.util.Iterator;
-
-import javax.annotation.Nonnull;
-
 // TODO: Auto-generated Javadoc
 /**
  * Iterable for check-runs listing.
  */
 class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {
-    private final GHRepository owner;
-    private final GitHubRequest request;
-
-    private GHCheckRunsPage result;
-
     /**
      * Instantiates a new GH check runs iterable.
      *
@@ -23,45 +14,7 @@ class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {
      *            the request
      */
     public GHCheckRunsIterable(GHRepository owner, GitHubRequest request) {
-        this.owner = owner;
-        this.request = request;
-    }
-
-    /**
-     * Iterator.
-     *
-     * @param pageSize
-     *            the page size
-     * @return the paged iterator
-     */
-    @Nonnull
-    @Override
-    public PagedIterator<GHCheckRun> _iterator(int pageSize) {
-        return new PagedIterator<>(
-                adapt(GitHubPageIterator.create(owner.root().getClient(), GHCheckRunsPage.class, request, pageSize)),
-                null);
-    }
-
-    /**
-     * Adapt.
-     *
-     * @param base
-     *            the base
-     * @return the iterator
-     */
-    protected Iterator<GHCheckRun[]> adapt(final Iterator<GHCheckRunsPage> base) {
-        return new Iterator<GHCheckRun[]>() {
-            public boolean hasNext() {
-                return base.hasNext();
-            }
-
-            public GHCheckRun[] next() {
-                GHCheckRunsPage v = base.next();
-                if (result == null) {
-                    result = v;
-                }
-                return v.getCheckRuns(owner);
-            }
-        };
+        super(new GitHubEndpointIterable<>(owner.root()
+                .getClient(), request, GHCheckRunsPage.class, GHCheckRun.class, item -> item.wrap(owner)));
     }
 }

src/main/java/org/kohsuke/github/GHCheckRunsPage.java

@@ -8,10 +8,15 @@
  */
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
-class GHCheckRunsPage {
+class GHCheckRunsPage implements GitHubPage<GHCheckRun> {
     private GHCheckRun[] checkRuns;
     private int totalCount;
 
+    @Override
+    public GHCheckRun[] getItems() {
+        return checkRuns;
+    }
+
     /**
      * Gets the total count.
      *
@@ -20,18 +25,4 @@ class GHCheckRunsPage {
     public int getTotalCount() {
         return totalCount;
     }
-
-    /**
-     * Gets the check runs.
-     *
-     * @param owner
-     *            the owner
-     * @return the check runs
-     */
-    GHCheckRun[] getCheckRuns(GHRepository owner) {
-        for (GHCheckRun checkRun : checkRuns) {
-            checkRun.wrap(owner);
-        }
-        return checkRuns;
-    }
 }