Change Cursor to implement AutoCloseable instead of Closeable, and override close() to no longer throw IOException

Author: hutteman

src/main/java/org/apache/ibatis/cursor/Cursor.java

@@ -25,7 +25,7 @@
  *
  * @author Guillaume Darmont / [email protected]
  */
-public interface Cursor<T> extends Closeable, Iterable<T> {
+public interface Cursor<T> extends AutoCloseable, Iterable<T> {
 
   /**
    * @return true if the cursor has started to fetch items from database.
@@ -43,4 +43,10 @@ public interface Cursor<T> extends Closeable, Iterable<T> {
    * @return -1 if the first cursor item has not been retrieved. The index of the current item retrieved.
    */
   int getCurrentIndex();
+
+  /**
+   * Closes the cursor.
+   */
+  @Override
+  void close();
 }

src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSession.java

@@ -271,11 +271,7 @@ public void close() {
   private void closeCursors() {
     if (cursorList != null && cursorList.size() != 0) {
       for (Cursor<?> cursor : cursorList) {
-        try {
-          cursor.close();
-        } catch (IOException e) {
-          throw ExceptionFactory.wrapException("Error closing cursor.  Cause: " + e, e);
-        }
+        cursor.close();
       }
       cursorList.clear();
     }

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -675,8 +675,6 @@ void executeWithCursorAndRowBounds() {
         assertEquals(2, blog.getId());
         assertFalse(blogIterator.hasNext());
       }
-    } catch (IOException e) {
-      Assertions.fail(e.getMessage());
     }
   }
 

src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java

@@ -158,7 +158,7 @@ void testCursorWithRowBound() {
   }
 
   @Test
-  void testCursorIteratorNoSuchElementExceptionWithHasNext() throws IOException {
+  void testCursorIteratorNoSuchElementExceptionWithHasNext() {
 
     try (SqlSession sqlSession = sqlSessionFactory.openSession();
         Cursor<User> usersCursor = sqlSession.selectCursor("getAllUsers", null, new RowBounds(1, 1))) {
@@ -180,7 +180,7 @@ void testCursorIteratorNoSuchElementExceptionWithHasNext() throws IOException {
   }
 
   @Test
-  void testCursorIteratorNoSuchElementExceptionNoHasNext() throws IOException {
+  void testCursorIteratorNoSuchElementExceptionNoHasNext() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession();
         Cursor<User> usersCursor = sqlSession.selectCursor("getAllUsers", null, new RowBounds(1, 1))) {
       try {
@@ -257,7 +257,7 @@ void testCursorMultipleIteratorCall() {
   }
 
   @Test
-  void testCursorMultipleCloseCall() throws IOException {
+  void testCursorMultipleCloseCall() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       Cursor<User> usersCursor = mapper.getAllUsers();
@@ -287,7 +287,7 @@ void testCursorMultipleCloseCall() throws IOException {
   }
 
   @Test
-  void testCursorUsageAfterClose() throws IOException {
+  void testCursorUsageAfterClose() {
 
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);

src/test/java/org/apache/ibatis/submitted/cursor_simple/PostgresCursorTest.java

@@ -71,7 +71,7 @@ static void tearDown() {
   }
 
   @Test
-  void shouldBeAbleToReuseStatement() throws IOException {
+  void shouldBeAbleToReuseStatement() {
     // #1351
     try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.REUSE)) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);