Merge pull request hub4j#446 from daniel-beck/fix-page-size

kohsuke · web-flow · commit 53612ad2e413 · 2018-08-30T05:20:53.000+02:00
Fix pagination for APIs that supported it ad hoc
diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java
@@ -269,15 +269,15 @@ protected void wrapUp(GHEventInfo[] page) {
     public PagedIterable<GHRepository> listRepositories(final int pageSize) {
         return new PagedIterable<GHRepository>() {
             public PagedIterator<GHRepository> _iterator(int pageSize) {
-                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos", GHRepository[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)
                             c.wrap(root);
                     }
                 };
             }
-        };
+        }.withPageSize(pageSize);
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -81,15 +81,15 @@ public PagedIterable<GHRepository> listRepositories() {
     public PagedIterable<GHRepository> listRepositories(final int pageSize) {
         return new PagedIterable<GHRepository>() {
             public PagedIterator<GHRepository> _iterator(int pageSize) {
-                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/users/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/users/" + login + "/repos", GHRepository[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)
                             c.wrap(root);
                     }
                 };
             }
-        };
+        }.withPageSize(pageSize);
     }
 
     /**
@@ -108,7 +108,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, pageSize);
+                final Iterator<GHRepository[]> pager = root.retrieve().asIterator("/users/" + login + "/repos",GHRepository[].class, pageSize);
 
                 return new Iterator<List<GHRepository>>() {
                     public boolean hasNext() {

Original file line number	Diff line number	Diff line change
`@@ -269,15 +269,15 @@ protected void wrapUp(GHEventInfo[] page) {`
`269`	`269`	`public PagedIterable<GHRepository> listRepositories(final int pageSize) {`
`270`	`270`	`return new PagedIterable<GHRepository>() {`
`271`	`271`	`public PagedIterator<GHRepository> _iterator(int pageSize) {`
`272`		`- return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {`
	`272`	`+ return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos", GHRepository[].class, pageSize)) {`
`273`	`273`	`@Override`
`274`	`274`	`protected void wrapUp(GHRepository[] page) {`
`275`	`275`	`for (GHRepository c : page)`
`276`	`276`	`c.wrap(root);`
`277`	`277`	`}`
`278`	`278`	`};`
`279`	`279`	`}`
`280`		`- };`
	`280`	`+ }.withPageSize(pageSize);`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`/**`