Merge pull request #678 from kazuki43zoo/polishing-cursor

Polishing codes for cursor feature

Author: emacarron

src/main/java/org/apache/ibatis/cursor/defaults/DefaultCursor.java

@@ -16,7 +16,6 @@
 package org.apache.ibatis.cursor.defaults;
 
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.cursor.CursorException;
 import org.apache.ibatis.executor.resultset.DefaultResultSetHandler;
 import org.apache.ibatis.executor.resultset.ResultSetWrapper;
 import org.apache.ibatis.mapping.ResultMap;
@@ -45,7 +44,7 @@ public class DefaultCursor<T> implements Cursor<T> {
     private final RowBounds rowBounds;
     private final ObjectWrapperResultHandler<T> objectWrapperResultHandler = new ObjectWrapperResultHandler<T>();
 
-    private CursorIterator cursorIterator = new CursorIterator();
+    private final CursorIterator cursorIterator = new CursorIterator();
     private boolean iteratorRetrieved = false;
 
     private CursorStatus status = CursorStatus.CREATED;
@@ -166,13 +165,13 @@ private int getReadItemsCount() {
         return indexWithRowBound + 1;
     }
 
-    private static class ObjectWrapperResultHandler<E> implements ResultHandler<E> {
+    private static class ObjectWrapperResultHandler<T> implements ResultHandler<T> {
 
-        private E result;
+        private T result;
 
         @Override
-        public void handleResult(ResultContext<? extends E> context) {
-            this.result = (E) context.getResultObject();
+        public void handleResult(ResultContext<? extends T> context) {
+            this.result = context.getResultObject();
             context.stop();
         }
     }

src/main/java/org/apache/ibatis/cursor/defaults/package-info.java

@@ -0,0 +1,19 @@
+/**
+ *    Copyright 2009-2016 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+/**
+ * Default implementation for cursor feature
+ */
+package org.apache.ibatis.cursor.defaults;

src/main/java/org/apache/ibatis/cursor/CursorException.java renamed to src/main/java/org/apache/ibatis/cursor/package-info.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2016 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -13,24 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package org.apache.ibatis.cursor;
-
-import org.apache.ibatis.exceptions.PersistenceException;
-
 /**
- * @author Guillaume Darmont / [email protected]
+ * Base package for cursor feature
  */
-public class CursorException extends PersistenceException {
-
-    public CursorException(String message) {
-        super(message);
-    }
-
-    public CursorException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public CursorException(Throwable cause) {
-        super(cause);
-    }
-}
+package org.apache.ibatis.cursor;

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

@@ -16,7 +16,6 @@
 package org.apache.ibatis.submitted.cursor_simple;
 
 import org.apache.ibatis.cursor.Cursor;
-import org.apache.ibatis.cursor.CursorException;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.RowBounds;