From c60698ff7e80f7d9b61374597917ca21ac01094e Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Sun, 23 Feb 2020 21:29:36 -0800
Subject: [PATCH] Iterator.remove() has a default implementation

---
 .../java/org/kohsuke/github/GHNotificationStream.java     | 4 ----
 src/main/java/org/kohsuke/github/GHPerson.java            | 4 ----
 src/main/java/org/kohsuke/github/GitHubPageIterator.java  | 4 ----
 src/main/java/org/kohsuke/github/PagedIterator.java       | 4 ----
 src/main/java/org/kohsuke/github/PagedSearchIterable.java | 4 ----
 src/test/java/org/kohsuke/github/GitHubTest.java          | 8 ++++++++
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/kohsuke/github/GHNotificationStream.java b/src/main/java/org/kohsuke/github/GHNotificationStream.java
index b8942d6124..0c16694c9e 100644
--- a/src/main/java/org/kohsuke/github/GHNotificationStream.java
+++ b/src/main/java/org/kohsuke/github/GHNotificationStream.java
@@ -207,10 +207,6 @@ private long calcNextCheckTime(GitHubResponse<GHThread[]> response) {
                 long seconds = Integer.parseInt(v);
                 return System.currentTimeMillis() + seconds * 1000;
             }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
         };
     }
 
diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
index efd3164044..d09648a821 100644
--- a/src/main/java/org/kohsuke/github/GHPerson.java
+++ b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -131,10 +131,6 @@ public List<GHRepository> next() {
                             r.root = root;
                         return Arrays.asList(batch);
                     }
-
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
                 };
             }
         };
diff --git a/src/main/java/org/kohsuke/github/GitHubPageIterator.java b/src/main/java/org/kohsuke/github/GitHubPageIterator.java
index fcdc26eba5..a57f51195d 100644
--- a/src/main/java/org/kohsuke/github/GitHubPageIterator.java
+++ b/src/main/java/org/kohsuke/github/GitHubPageIterator.java
@@ -114,10 +114,6 @@ public GitHubResponse<T> finalResponse() {
         return finalResponse;
     }
 
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Fetch is called at the start of {@link #hasNext()} or {@link #next()} to fetch another page of data if it is
      * needed.
diff --git a/src/main/java/org/kohsuke/github/PagedIterator.java b/src/main/java/org/kohsuke/github/PagedIterator.java
index 59d79ffa83..9e210ac0c0 100644
--- a/src/main/java/org/kohsuke/github/PagedIterator.java
+++ b/src/main/java/org/kohsuke/github/PagedIterator.java
@@ -97,10 +97,6 @@ private void fetch() {
         }
     }
 
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Gets the next page worth of data.
      *
diff --git a/src/main/java/org/kohsuke/github/PagedSearchIterable.java b/src/main/java/org/kohsuke/github/PagedSearchIterable.java
index 4caec25550..f6d87d3ef2 100644
--- a/src/main/java/org/kohsuke/github/PagedSearchIterable.java
+++ b/src/main/java/org/kohsuke/github/PagedSearchIterable.java
@@ -75,10 +75,6 @@ public T[] next() {
                     result = v;
                 return v.getItems(root);
             }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
         };
     }
 }
diff --git a/src/test/java/org/kohsuke/github/GitHubTest.java b/src/test/java/org/kohsuke/github/GitHubTest.java
index 0d4887a7a7..872cd9a3ee 100644
--- a/src/test/java/org/kohsuke/github/GitHubTest.java
+++ b/src/test/java/org/kohsuke/github/GitHubTest.java
@@ -53,6 +53,14 @@ public void testListAllRepositories() throws Exception {
             assertNotNull(r.getUrl());
             assertNotEquals(0L, r.getId());
         }
+
+        // ensure the iterator throws as expected
+        try {
+            itr.remove();
+            fail();
+        } catch (UnsupportedOperationException e) {
+            assertThat(e, notNullValue());
+        }
     }
 
     @Test