org.apache.commons.dbutils.ResultSetIterator.next() now throws

NoSuchElementException as defined in java.util.Iterator.next()

See also PR apache#283

Author: garydgregory

src/changes/changes.xml

@@ -57,6 +57,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.hasNext() now throws IllegalStateException instead of RuntimeException to wrap cases of SQLException.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.next() now throws IllegalStateException instead of RuntimeException to wrap cases of SQLException.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">ResultSetIterator.remove() now throws IllegalStateException instead of RuntimeException to wrap cases of SQLException.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory, Matheus_Maas">org.apache.commons.dbutils.ResultSetIterator.next() now throws NoSuchElementException as defined in java.util.Iterator.next() #283.</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="strangelookingnerd, Gary Gregory">BaseResultSetHandler implements ResultSet.</action>
       <!-- UPDATE -->

src/main/java/org/apache/commons/dbutils/ResultSetIterator.java

@@ -19,6 +19,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 /**
  * <p>
@@ -97,17 +98,22 @@ public boolean hasNext() {
      *
      * @return An {@code Object[]} with the same number of elements as
      * columns in the {@code ResultSet}.
-     * @see java.util.Iterator#next()
      * @throws RuntimeException if an SQLException occurs.
+     * @throws NoSuchElementException if the iteration has no more elements.
+     * @see java.util.Iterator#next()
      */
     @Override
     public Object[] next() {
-        try {
-            return resultSet.next() ? this.convert.toArray(resultSet) : new Object[0];
-        } catch (final SQLException e) {
-            rethrow(e);
-            return null;
+        if (hasNext()) {
+            try {
+                resultSet.next();
+                return this.convert.toArray(resultSet);
+            } catch (final SQLException e) {
+                rethrow(e);
+                return null;
+            }
         }
+        throw new NoSuchElementException("No more rows in the ResultSet");
     }
 
     /**

src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java

@@ -18,13 +18,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 import org.junit.jupiter.api.Test;
 
@@ -63,7 +65,7 @@ void testNext() {
         assertEquals("SIX", row[2]);
 
         assertFalse(iter.hasNext());
-        assertEquals(0, iter.next().length);
+        assertThrows(NoSuchElementException.class, iter::next);
     }
 
     @Test