From 55bc498f9d773737691b9c01092ddcd89c86731e Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 11 Jun 2021 10:20:47 +1200
Subject: [PATCH] No functional change - refactor QueryIterator to use
 Iterator.remove()  default method

Iterator.remove() has a default implementation that throws UnsupportedOperationException which is what we want. Remove the close() method from QueryIterator and implementations so that we just use the Iterator.remove() default implementation.
---
 ebean-api/src/main/java/io/ebean/QueryIterator.java         | 6 ------
 .../io/ebeaninternal/server/query/CQueryIteratorSimple.java | 6 +-----
 .../server/query/CQueryIteratorWithBuffer.java              | 4 ----
 .../io/ebeaninternal/server/query/DtoQueryIterator.java     | 4 ----
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/QueryIterator.java b/ebean-api/src/main/java/io/ebean/QueryIterator.java
index 2ac789073..6ad523151 100644
--- a/ebean-api/src/main/java/io/ebean/QueryIterator.java
+++ b/ebean-api/src/main/java/io/ebean/QueryIterator.java
@@ -70,12 +70,6 @@ public interface QueryIterator<T> extends Iterator<T>, AutoCloseable {
   @Override
   T next();
 
-  /**
-   * Remove is not allowed.
-   */
-  @Override
-  void remove();
-
   /**
    * Close the underlying resources held by this iterator.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
index fb434a6de..17cec9d15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
@@ -14,7 +14,7 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
   private final CQuery<T> cquery;
 
   private final OrmQueryRequest<T> request;
-  
+
   private boolean closed;
 
   CQueryIteratorSimple(CQuery<T> cquery, OrmQueryRequest<T> request) {
@@ -54,8 +54,4 @@ class CQueryIteratorSimple<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new PersistenceException("Remove not allowed");
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
index 2ba431da5..e2a9bdad2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java
@@ -76,8 +76,4 @@ class CQueryIteratorWithBuffer<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new PersistenceException("Remove not allowed");
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
index cb22fdd3a..bdf4e2df6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java
@@ -48,8 +48,4 @@ class DtoQueryIterator<T> implements QueryIterator<T> {
     }
   }
 
-  @Override
-  public void remove() {
-    throw new IllegalStateException("remove() not allowed");
-  }
 }