Further clean up of refactored classes

hub4j · Feb 12, 2020 · eb4ce6d · eb4ce6d
1 parent 5939874
commit eb4ce6d
Show file tree

Hide file tree

Showing 26 changed files with 1,398 additions and 356 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotbugs-maven-plugin.version>3.1.12.2</spotbugs-maven-plugin.version>
-    <spotbugs.version>3.1.12</spotbugs.version>
+    <spotbugs.version>4.0.0-RC3</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
     <okhttp3.version>4.3.1</okhttp3.version>

diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -118,9 +118,9 @@ public PagedIterable<GHRepository> listRepositories(final int pageSize) {
     public synchronized Iterable<List<GHRepository>> iterateRepositories(final int pageSize) {
         return new Iterable<List<GHRepository>>() {
             public Iterator<List<GHRepository>> iterator() {
-                final Iterator<GHRepository[]> pager = root.createRequest()
-                        .withUrlPath("users", login, "repos")
-                        .fetchIterator(GHRepository[].class, pageSize);
+                final Iterator<GHRepository[]> pager = GitHubPageIterator.create(root.getClient(),
+                        GHRepository[].class,
+                        root.createRequest().withUrlPath("users", login, "repos").withPageSize(pageSize));
 
                 return new Iterator<List<GHRepository>>() {
                     public boolean hasNext() {

diff --git a/src/main/java/org/kohsuke/github/GHSearchBuilder.java b/src/main/java/org/kohsuke/github/GHSearchBuilder.java
@@ -1,6 +1,7 @@
 package org.kohsuke.github;
 
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,9 +44,11 @@ public GHQueryBuilder<T> q(String term) {
     @Override
     public PagedSearchIterable<T> list() {
         return new PagedSearchIterable<T>(root) {
+            @NotNull
             public PagedIterator<T> _iterator(int pageSize) {
                 req.set("q", StringUtils.join(terms, " "));
-                return new PagedIterator<T>(adapt(req.withUrlPath(getApiUrl()).fetchIterator(receiverType, pageSize))) {
+                return new PagedIterator<T>(adapt(GitHubPageIterator
+                        .create(req.client, receiverType, req.withUrlPath(getApiUrl()).withPageSize(pageSize)))) {
                     protected void wrapUp(T[] page) {
                         // SearchResult.getItems() should do it
                     }

diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java
@@ -52,7 +52,7 @@
 public class GitHub {
 
     @Nonnull
-    /* private */ final GitHubClient client;
+    private final GitHubClient client;
 
     @CheckForNull
     private GHMyself myself;
@@ -405,7 +405,7 @@ GHMyself getMyself() throws IOException {
         client.requireCredential();
         synchronized (this) {
             if (this.myself == null) {
-                GHMyself u = client.createRequest().withUrlPath("/user").fetch(GHMyself.class);
+                GHMyself u = createRequest().withUrlPath("/user").fetch(GHMyself.class);
                 setMyself(u);
             }
             return myself;
@@ -1175,8 +1175,14 @@ public Reader renderMarkdown(String text) throws IOException {
                 "UTF-8");
     }
 
+    @Nonnull
+    GitHubClient getClient() {
+        return client;
+    }
+
+    @Nonnull
     Requester createRequest() {
-        return client.createRequest();
+        return new Requester(client);
     }
 
     GHUser intern(GHUser user) throws IOException {