Rename

bitwiseman · bitwiseman · commit 024cb8f935d1 · 2025-05-04T00:27:20.000-07:00
diff --git a/src/main/java/org/kohsuke/github/GHAppInstallation.java b/src/main/java/org/kohsuke/github/GHAppInstallation.java
@@ -267,7 +267,7 @@ public PagedSearchIterable<GHRepository> listRepositories() {
 
         request = root().createRequest().withUrlPath("/installation/repositories").build();
 
-        return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()
+        return new PagedSearchIterable<>(new PaginatedEndpoint<>(root()
                 .getClient(), request, GHAppInstallationRepositoryResult.class, GHRepository.class, null));
     }
 }
diff --git a/src/main/java/org/kohsuke/github/GHAppInstallationsIterable.java b/src/main/java/org/kohsuke/github/GHAppInstallationsIterable.java
@@ -16,7 +16,7 @@ class GHAppInstallationsIterable extends PagedIterable<GHAppInstallation> {
      *            the root
      */
     public GHAppInstallationsIterable(GitHub root) {
-        super(new GitHubEndpointIterable<>(root.getClient(),
+        super(new PaginatedEndpoint<>(root.getClient(),
                 root.createRequest().withUrlPath(APP_INSTALLATIONS_URL).build(),
                 GHAppInstallationsPage.class,
                 GHAppInstallation.class,
diff --git a/src/main/java/org/kohsuke/github/GHArtifactsIterable.java b/src/main/java/org/kohsuke/github/GHArtifactsIterable.java
@@ -15,7 +15,7 @@ class GHArtifactsIterable extends PagedIterable<GHArtifact> {
      *            the request builder
      */
     public GHArtifactsIterable(GHRepository owner, GitHubRequest.Builder<?> requestBuilder) {
-        super(new GitHubEndpointIterable<>(owner.root().getClient(),
+        super(new PaginatedEndpoint<>(owner.root().getClient(),
                 requestBuilder.build(),
                 GHArtifactsPage.class,
                 GHArtifact.class,
diff --git a/src/main/java/org/kohsuke/github/GHAuthenticatedAppInstallation.java b/src/main/java/org/kohsuke/github/GHAuthenticatedAppInstallation.java
@@ -39,7 +39,7 @@ public PagedSearchIterable<GHRepository> listRepositories() {
 
         request = root().createRequest().withUrlPath("/installation/repositories").build();
 
-        return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()
+        return new PagedSearchIterable<>(new PaginatedEndpoint<>(root()
                 .getClient(), request, GHAuthenticatedAppInstallationRepositoryResult.class, GHRepository.class, null));
     }
 
diff --git a/src/main/java/org/kohsuke/github/GHCheckRunsIterable.java b/src/main/java/org/kohsuke/github/GHCheckRunsIterable.java
@@ -14,7 +14,7 @@ class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {
      *            the request
      */
     public GHCheckRunsIterable(GHRepository owner, GitHubRequest request) {
-        super(new GitHubEndpointIterable<>(owner.root()
+        super(new PaginatedEndpoint<>(owner.root()
                 .getClient(), request, GHCheckRunsPage.class, GHCheckRun.class, item -> item.wrap(owner)));
     }
 }
diff --git a/src/main/java/org/kohsuke/github/GHCommitFileIterable.java b/src/main/java/org/kohsuke/github/GHCommitFileIterable.java
@@ -17,19 +17,19 @@ class GHCommitFileIterable extends PagedIterable<GHCommit.File> {
      */
     private static final int GH_FILE_LIMIT_PER_COMMIT_PAGE = 300;
 
-    private static GitHubEndpointIterable<GHCommitFilesPage, File> createEndpointIterable(GHRepository owner,
+    private static PaginatedEndpoint<GHCommitFilesPage, File> createEndpointIterable(GHRepository owner,
             String sha,
             GHCommit.File[] files) {
-        GitHubEndpointIterable<GHCommitFilesPage, File> iterable;
+        PaginatedEndpoint<GHCommitFilesPage, File> iterable;
         if (files != null && files.length < GH_FILE_LIMIT_PER_COMMIT_PAGE) {
             // create a page iterator that only provides one page
-            iterable = GitHubEndpointIterable.ofSingleton(new GHCommitFilesPage(files));
+            iterable = PaginatedEndpoint.ofSingleton(new GHCommitFilesPage(files));
         } else {
             GitHubRequest request = owner.root()
                     .createRequest()
                     .withUrlPath(owner.getApiTailUrl("commits/" + sha))
                     .build();
-            iterable = new GitHubEndpointIterable<>(owner.root()
+            iterable = new PaginatedEndpoint<>(owner.root()
                     .getClient(), request, GHCommitFilesPage.class, GHCommit.File.class, null);
         }
         return iterable;
diff --git a/src/main/java/org/kohsuke/github/GHCompare.java b/src/main/java/org/kohsuke/github/GHCompare.java
@@ -345,7 +345,7 @@ public PagedIterable<Commit> listCommits() {
                     .withPageSize(10);
         } else {
             // if not using paginated commits, adapt the returned commits array
-            return new PagedIterable<>(GitHubEndpointIterable.ofSingleton(this.commits));
+            return new PagedIterable<>(PaginatedEndpoint.ofSingleton(this.commits));
         }
     }
 
diff --git a/src/main/java/org/kohsuke/github/GHExternalGroupIterable.java b/src/main/java/org/kohsuke/github/GHExternalGroupIterable.java
@@ -18,14 +18,14 @@ class GHExternalGroupIterable extends PagedIterable<GHExternalGroup> {
      *            the request builder
      */
     GHExternalGroupIterable(final GHOrganization owner, GitHubRequest.Builder<?> requestBuilder) {
-        super(new GitHubEndpointIterable<>(owner.root().getClient(),
+        super(new PaginatedEndpoint<>(owner.root().getClient(),
                 requestBuilder.build(),
                 GHExternalGroupPage.class,
                 GHExternalGroup.class,
                 item -> item.wrapUp(owner)) {
             @NotNull @Override
-            public GitHubEndpointPageIterator<GHExternalGroupPage, GHExternalGroup> pageIterator() {
-                return new GitHubEndpointPageIterator<>(client, pageType, request, pageSize, itemInitializer) {
+            public PaginatedEndpointPages<GHExternalGroupPage, GHExternalGroup> pages() {
+                return new PaginatedEndpointPages<>(client, pageType, request, pageSize, itemInitializer) {
                     @Override
                     public boolean hasNext() {
                         try {
diff --git a/src/main/java/org/kohsuke/github/GHSearchBuilder.java b/src/main/java/org/kohsuke/github/GHSearchBuilder.java
@@ -77,7 +77,7 @@ PagedSearchIterable<T> list(Consumer<T> itemInitializer) {
 
         req.set("q", StringUtils.join(terms, " "));
         return new PagedSearchIterable<>(
-                new GitHubEndpointIterable<>(root().getClient(), req.build(), receiverType, itemType, itemInitializer));
+                new PaginatedEndpoint<>(root().getClient(), req.build(), receiverType, itemType, itemInitializer));
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/GHWorkflowJobsIterable.java b/src/main/java/org/kohsuke/github/GHWorkflowJobsIterable.java
@@ -16,7 +16,7 @@ class GHWorkflowJobsIterable extends PagedIterable<GHWorkflowJob> {
      *            the request
      */
     public GHWorkflowJobsIterable(GHRepository repo, GitHubRequest request) {
-        super(new GitHubEndpointIterable<>(repo.root()
+        super(new PaginatedEndpoint<>(repo.root()
                 .getClient(), request, GHWorkflowJobsPage.class, GHWorkflowJob.class, item -> item.wrapUp(repo)));
     }
 }
diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunsIterable.java b/src/main/java/org/kohsuke/github/GHWorkflowRunsIterable.java
@@ -14,7 +14,7 @@ class GHWorkflowRunsIterable extends PagedIterable<GHWorkflowRun> {
      *            the request builder
      */
     public GHWorkflowRunsIterable(GHRepository owner, GitHubRequest.Builder<?> requestBuilder) {
-        super(new GitHubEndpointIterable<>(owner.root().getClient(),
+        super(new PaginatedEndpoint<>(owner.root().getClient(),
                 requestBuilder.build(),
                 GHWorkflowRunsPage.class,
                 GHWorkflowRun.class,
diff --git a/src/main/java/org/kohsuke/github/GHWorkflowsIterable.java b/src/main/java/org/kohsuke/github/GHWorkflowsIterable.java
@@ -13,7 +13,7 @@ class GHWorkflowsIterable extends PagedIterable<GHWorkflow> {
      *            the owner
      */
     public GHWorkflowsIterable(GHRepository owner) {
-        super(new GitHubEndpointIterable<>(owner.root().getClient(),
+        super(new PaginatedEndpoint<>(owner.root().getClient(),
                 owner.root().createRequest().withUrlPath(owner.getApiTailUrl("actions/workflows")).build(),
                 GHWorkflowsPage.class,
                 GHWorkflow.class,
diff --git a/src/main/java/org/kohsuke/github/PagedIterable.java b/src/main/java/org/kohsuke/github/PagedIterable.java
@@ -17,12 +17,12 @@
  */
 public class PagedIterable<T> implements Iterable<T> {
 
-    private final GitHubEndpointIterable<?, T> paginatedEndpoint;
+    private final PaginatedEndpoint<?, T> paginatedEndpoint;
 
     /**
      * Instantiates a new git hub page contents iterable.
      */
-    PagedIterable(GitHubEndpointIterable<?, T> paginatedEndpoint) {
+    PagedIterable(PaginatedEndpoint<?, T> paginatedEndpoint) {
         this.paginatedEndpoint = paginatedEndpoint;
     }
 
@@ -32,7 +32,7 @@ public PagedIterator<T> _iterator(int pageSize) {
 
     @Nonnull
     public final PagedIterator<T> iterator() {
-        return new PagedIterator<>(paginatedEndpoint.itemIterator());
+        return new PagedIterator<>(paginatedEndpoint.items());
     }
 
     @Nonnull
diff --git a/src/main/java/org/kohsuke/github/PagedIterator.java b/src/main/java/org/kohsuke/github/PagedIterator.java
@@ -19,15 +19,15 @@
  */
 public class PagedIterator<T> implements Iterator<T> {
 
-    private final GitHubPageItemIterator<?, T> endpointIterator;
+    private final PaginatedEndpointItems<?, T> endpointIterator;
 
     /**
      * Instantiates a new paged iterator.
      *
      * @param endpointIterator
      *            the base
      */
-    PagedIterator(GitHubPageItemIterator<?, T> endpointIterator) {
+    PagedIterator(PaginatedEndpointItems<?, T> endpointIterator) {
         this.endpointIterator = endpointIterator;
     }
 
diff --git a/src/main/java/org/kohsuke/github/PagedSearchIterable.java b/src/main/java/org/kohsuke/github/PagedSearchIterable.java
@@ -16,12 +16,12 @@
         justification = "Constructed by JSON API")
 public class PagedSearchIterable<T> extends PagedIterable<T> {
 
-    private final GitHubEndpointIterable<? extends SearchResult<T>, T> paginatedEndpoint;
+    private final PaginatedEndpoint<? extends SearchResult<T>, T> paginatedEndpoint;
 
     /**
      * Instantiates a new git hub page contents iterable.
      */
-    <Result extends SearchResult<T>> PagedSearchIterable(GitHubEndpointIterable<Result, T> paginatedEndpoint) {
+    <Result extends SearchResult<T>> PagedSearchIterable(PaginatedEndpoint<Result, T> paginatedEndpoint) {
         super(paginatedEndpoint);
         this.paginatedEndpoint = paginatedEndpoint;
     }
@@ -33,7 +33,7 @@ <Result extends SearchResult<T>> PagedSearchIterable(GitHubEndpointIterable<Resu
      */
     public int getTotalCount() {
         // populate();
-        return paginatedEndpoint.pageIterator().peek().totalCount;
+        return paginatedEndpoint.pages().peek().totalCount;
     }
 
     /**
@@ -43,6 +43,6 @@ public int getTotalCount() {
      */
     public boolean isIncomplete() {
         // populate();
-        return paginatedEndpoint.pageIterator().peek().incompleteResults;
+        return paginatedEndpoint.pages().peek().incompleteResults;
     }
 }
diff --git a/src/main/java/org/kohsuke/github/PaginatedEndpoint.java b/src/main/java/org/kohsuke/github/PaginatedEndpoint.java
diff --git a/src/main/java/org/kohsuke/github/PaginatedEndpointItems.java b/src/main/java/org/kohsuke/github/PaginatedEndpointItems.java
diff --git a/src/main/java/org/kohsuke/github/PaginatedEndpointPages.java b/src/main/java/org/kohsuke/github/PaginatedEndpointPages.java
diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public PagedSearchIterable<GHRepository> listRepositories() {`
`267`	`267`
`268`	`268`	`request = root().createRequest().withUrlPath("/installation/repositories").build();`
`269`	`269`
`270`		`- return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()`
	`270`	`+ return new PagedSearchIterable<>(new PaginatedEndpoint<>(root()`
`271`	`271`	`.getClient(), request, GHAppInstallationRepositoryResult.class, GHRepository.class, null));`
`272`	`272`	`}`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public PagedSearchIterable<GHRepository> listRepositories() {`
`39`	`39`
`40`	`40`	`request = root().createRequest().withUrlPath("/installation/repositories").build();`
`41`	`41`
`42`		`- return new PagedSearchIterable<>(new GitHubEndpointIterable<>(root()`
	`42`	`+ return new PagedSearchIterable<>(new PaginatedEndpoint<>(root()`
`43`	`43`	`.getClient(), request, GHAuthenticatedAppInstallationRepositoryResult.class, GHRepository.class, null));`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {`
`14`	`14`	`* the request`
`15`	`15`	`*/`
`16`	`16`	`public GHCheckRunsIterable(GHRepository owner, GitHubRequest request) {`
`17`		`- super(new GitHubEndpointIterable<>(owner.root()`
	`17`	`+ super(new PaginatedEndpoint<>(owner.root()`
`18`	`18`	`.getClient(), request, GHCheckRunsPage.class, GHCheckRun.class, item -> item.wrap(owner)));`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ public PagedIterable<Commit> listCommits() {`
`345`	`345`	`.withPageSize(10);`
`346`	`346`	`} else {`
`347`	`347`	`// if not using paginated commits, adapt the returned commits array`
`348`		`- return new PagedIterable<>(GitHubEndpointIterable.ofSingleton(this.commits));`
	`348`	`+ return new PagedIterable<>(PaginatedEndpoint.ofSingleton(this.commits));`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ PagedSearchIterable<T> list(Consumer<T> itemInitializer) {`
`77`	`77`
`78`	`78`	`req.set("q", StringUtils.join(terms, " "));`
`79`	`79`	`return new PagedSearchIterable<>(`
`80`		`- new GitHubEndpointIterable<>(root().getClient(), req.build(), receiverType, itemType, itemInitializer));`
	`80`	`+ new PaginatedEndpoint<>(root().getClient(), req.build(), receiverType, itemType, itemInitializer));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class GHWorkflowJobsIterable extends PagedIterable<GHWorkflowJob> {`
`16`	`16`	`* the request`
`17`	`17`	`*/`
`18`	`18`	`public GHWorkflowJobsIterable(GHRepository repo, GitHubRequest request) {`
`19`		`- super(new GitHubEndpointIterable<>(repo.root()`
	`19`	`+ super(new PaginatedEndpoint<>(repo.root()`
`20`	`20`	`.getClient(), request, GHWorkflowJobsPage.class, GHWorkflowJob.class, item -> item.wrapUp(repo)));`
`21`	`21`	`}`
`22`	`22`	`}`