Implemented pagenation size support.

hub4j · Dec 3, 2015 · dbddf5b · dbddf5b
1 parent 841f77b
commit dbddf5b
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 82 deletions.
diff --git a/src/main/java/org/kohsuke/github/GHCommit.java b/src/main/java/org/kohsuke/github/GHCommit.java
@@ -273,8 +273,8 @@ private GHUser resolveUser(User author) throws IOException {
      */
     public PagedIterable<GHCommitComment> listComments() {
         return new PagedIterable<GHCommitComment>() {
-            public PagedIterator<GHCommitComment> iterator() {
-                return new PagedIterator<GHCommitComment>(owner.root.retrieve().asIterator(String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha), GHCommitComment[].class)) {
+            public PagedIterator<GHCommitComment> _iterator(int pageSize) {
+                return new PagedIterator<GHCommitComment>(owner.root.retrieve().asIterator(String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha), GHCommitComment[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHCommitComment[] page) {
                         for (GHCommitComment c : page)

diff --git a/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java b/src/main/java/org/kohsuke/github/GHCommitQueryBuilder.java
@@ -92,8 +92,8 @@ public GHCommitQueryBuilder until(long timestamp) {
      */
     public PagedIterable<GHCommit> list() {
         return new PagedIterable<GHCommit>() {
-            public PagedIterator<GHCommit> iterator() {
-                return new PagedIterator<GHCommit>(req.asIterator(repo.getApiTailUrl("commits"), GHCommit[].class)) {
+            public PagedIterator<GHCommit> _iterator(int pageSize) {
+                return new PagedIterator<GHCommit>(req.asIterator(repo.getApiTailUrl("commits"), GHCommit[].class, pageSize)) {
                     protected void wrapUp(GHCommit[] page) {
                         for (GHCommit c : page)
                             c.wrapUp(repo);

diff --git a/src/main/java/org/kohsuke/github/GHContent.java b/src/main/java/org/kohsuke/github/GHContent.java
@@ -152,8 +152,8 @@ public PagedIterable<GHContent> listDirectoryContent() throws IOException {
             throw new IllegalStateException(path+" is not a directory");
 
         return new PagedIterable<GHContent>() {
-            public PagedIterator<GHContent> iterator() {
-                return new PagedIterator<GHContent>(root.retrieve().asIterator(url, GHContent[].class)) {
+            public PagedIterator<GHContent> _iterator(int pageSize) {
+                return new PagedIterator<GHContent>(root.retrieve().asIterator(url, GHContent[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHContent[] page) {
                         GHContent.wrap(page, repository);

diff --git a/src/main/java/org/kohsuke/github/GHGist.java b/src/main/java/org/kohsuke/github/GHGist.java
@@ -140,8 +140,8 @@ public GHGist fork() throws IOException {
 
     public PagedIterable<GHGist> listForks() {
         return new PagedIterable<GHGist>() {
-            public PagedIterator<GHGist> iterator() {
-                return new PagedIterator<GHGist>(root.retrieve().asIterator(getApiTailUrl("forks"), GHGist[].class)) {
+            public PagedIterator<GHGist> _iterator(int pageSize) {
+                return new PagedIterator<GHGist>(root.retrieve().asIterator(getApiTailUrl("forks"), GHGist[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHGist[] page) {
                         try {

diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java
@@ -205,8 +205,8 @@ public List<GHIssueComment> getComments() throws IOException {
      */
     public PagedIterable<GHIssueComment> listComments() throws IOException {
         return new PagedIterable<GHIssueComment>() {
-            public PagedIterator<GHIssueComment> iterator() {
-                return new PagedIterator<GHIssueComment>(root.retrieve().asIterator(getIssuesApiRoute() + "/comments", GHIssueComment[].class)) {
+            public PagedIterator<GHIssueComment> _iterator(int pageSize) {
+                return new PagedIterator<GHIssueComment>(root.retrieve().asIterator(getIssuesApiRoute() + "/comments", GHIssueComment[].class, pageSize)) {
                     protected void wrapUp(GHIssueComment[] page) {
                         for (GHIssueComment c : page)
                             c.wrapUp(GHIssue.this);

diff --git a/src/main/java/org/kohsuke/github/GHMyself.java b/src/main/java/org/kohsuke/github/GHMyself.java
@@ -158,9 +158,9 @@ public PagedIterable<GHRepository> listRepositories(final int pageSize) {
      */
     public PagedIterable<GHRepository> listRepositories(final int pageSize, final RepositoryListFilter repoType) {
         return new PagedIterable<GHRepository>() {
-            public PagedIterator<GHRepository> iterator() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
                 return new PagedIterator<GHRepository>(root.retrieve().asIterator("/user/repos?per_page=" + pageSize +
-                    "&type=" + repoType.name().toLowerCase(Locale.ENGLISH), GHRepository[].class)) {
+                    "&type=" + repoType.name().toLowerCase(Locale.ENGLISH), GHRepository[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)

diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java
@@ -57,8 +57,8 @@ public Map<String,GHTeam> getTeams() throws IOException {
      */
     public PagedIterable<GHTeam> listTeams() throws IOException {
         return new PagedIterable<GHTeam>() {
-            public PagedIterator<GHTeam> iterator() {
-                return new PagedIterator<GHTeam>(root.retrieve().asIterator(String.format("/orgs/%s/teams", login), GHTeam[].class)) {
+            public PagedIterator<GHTeam> _iterator(int pageSize) {
+                return new PagedIterator<GHTeam>(root.retrieve().asIterator(String.format("/orgs/%s/teams", login), GHTeam[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHTeam[] page) {
                         for (GHTeam c : page)
@@ -150,9 +150,9 @@ public PagedIterable<GHUser> listMembersWithFilter(String filter) throws IOExcep
 
     private PagedIterable<GHUser> listMembers(final String suffix, final String filter) throws IOException {
         return new PagedIterable<GHUser>() {
-            public PagedIterator<GHUser> iterator() {
+            public PagedIterator<GHUser> _iterator(int pageSize) {
                 String filterParams = (filter == null) ? "" : ("?filter=" + filter);
-                return new PagedIterator<GHUser>(root.retrieve().asIterator(String.format("/orgs/%s/%s%s", login, suffix, filterParams), GHUser[].class)) {
+                return new PagedIterator<GHUser>(root.retrieve().asIterator(String.format("/orgs/%s/%s%s", login, suffix, filterParams), GHUser[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHUser[] users) {
                         GHUser.wrap(users, root);
@@ -222,8 +222,8 @@ public List<GHPullRequest> getPullRequests() throws IOException {
      */
     public PagedIterable<GHEventInfo> listEvents() throws IOException {
         return new PagedIterable<GHEventInfo>() {
-            public PagedIterator<GHEventInfo> iterator() {
-                return new PagedIterator<GHEventInfo>(root.retrieve().asIterator(String.format("/orgs/%s/events", login), GHEventInfo[].class)) {
+            public PagedIterator<GHEventInfo> _iterator(int pageSize) {
+                return new PagedIterator<GHEventInfo>(root.retrieve().asIterator(String.format("/orgs/%s/events", login), GHEventInfo[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHEventInfo[] page) {
                         for (GHEventInfo c : page)
@@ -244,8 +244,8 @@ protected void wrapUp(GHEventInfo[] page) {
     @Override
     public PagedIterable<GHRepository> listRepositories(final int pageSize) {
         return new PagedIterable<GHRepository>() {
-            public PagedIterator<GHRepository> iterator() {
-                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos?per_page=" + pageSize, GHRepository[].class)) {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)

diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -76,8 +76,8 @@ public PagedIterable<GHRepository> listRepositories() {
      */
     public PagedIterable<GHRepository> listRepositories(final int pageSize) {
         return new PagedIterable<GHRepository>() {
-            public PagedIterator<GHRepository> iterator() {
-                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/users/" + login + "/repos?per_page=" + pageSize, GHRepository[].class)) {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/users/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)
@@ -104,7 +104,7 @@ protected void wrapUp(GHRepository[] page) {
     public synchronized Iterable<List<GHRepository>> iterateRepositories(final int pageSize) {
         return new Iterable<List<GHRepository>>() {
             public Iterator<List<GHRepository>> iterator() {
-                final Iterator<GHRepository[]> pager = root.retrieve().asIterator("/users/" + login + "/repos?per_page="+pageSize,GHRepository[].class);
+                final Iterator<GHRepository[]> pager = root.retrieve().asIterator("/users/" + login + "/repos?per_page="+pageSize,GHRepository[].class, pageSize);
 
                 return new Iterator<List<GHRepository>>() {
                     public boolean hasNext() {

diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java
@@ -210,9 +210,9 @@ private void populate() throws IOException {
      */
     public PagedIterable<GHPullRequestFileDetail> listFiles() {
         return new PagedIterable<GHPullRequestFileDetail>() {
-            public PagedIterator<GHPullRequestFileDetail> iterator() {
+            public PagedIterator<GHPullRequestFileDetail> _iterator(int pageSize) {
                 return new PagedIterator<GHPullRequestFileDetail>(root.retrieve().asIterator(String.format("%s/files", getApiURL()),
-                        GHPullRequestFileDetail[].class)) {
+                        GHPullRequestFileDetail[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHPullRequestFileDetail[] page) {
                     }
@@ -226,9 +226,9 @@ protected void wrapUp(GHPullRequestFileDetail[] page) {
      */
     public PagedIterable<GHPullRequestReviewComment> listReviewComments() throws IOException {
         return new PagedIterable<GHPullRequestReviewComment>() {
-            public PagedIterator<GHPullRequestReviewComment> iterator() {
+            public PagedIterator<GHPullRequestReviewComment> _iterator(int pageSize) {
                 return new PagedIterator<GHPullRequestReviewComment>(root.retrieve().asIterator(getApiRoute() + "/comments",
-                        GHPullRequestReviewComment[].class)) {
+                        GHPullRequestReviewComment[].class, pageSize)) {
                     protected void wrapUp(GHPullRequestReviewComment[] page) {
                         for (GHPullRequestReviewComment c : page)
                             c.wrapUp(GHPullRequest.this);
@@ -243,10 +243,10 @@ protected void wrapUp(GHPullRequestReviewComment[] page) {
      */
     public PagedIterable<GHPullRequestCommitDetail> listCommits() {
         return new PagedIterable<GHPullRequestCommitDetail>() {
-            public PagedIterator<GHPullRequestCommitDetail> iterator() {
+            public PagedIterator<GHPullRequestCommitDetail> _iterator(int pageSize) {
                 return new PagedIterator<GHPullRequestCommitDetail>(root.retrieve().asIterator(
                         String.format("%s/commits", getApiURL()),
-                        GHPullRequestCommitDetail[].class)) {
+                        GHPullRequestCommitDetail[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHPullRequestCommitDetail[] page) {
                         for (GHPullRequestCommitDetail c : page)