Author: cbegin
Date: Mon Sep 7 08:14:03 2009
New Revision: 812030
URL: http://svn.apache.org/viewvc?rev=812030&view=rev
Log:
made ResultContext an interface
Added:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/ResultContext.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
Added:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java?rev=812030&view=auto
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java
(added)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultContext.java
Mon Sep 7 08:14:03 2009
@@ -0,0 +1,36 @@
+package org.apache.ibatis.executor.result;
+
+public class DefaultResultContext implements ResultContext {
+
+private Object resultObject;
+ private int resultCount;
+ private boolean stopped;
+
+ public DefaultResultContext() {
+ resultObject = null;
+ resultCount = 0;
+ stopped = false;
+ }
+
+ public Object getResultObject() {
+ return resultObject;
+ }
+
+ public int getResultCount() {
+ return resultCount;
+ }
+
+ public boolean isStopped() {
+ return stopped;
+ }
+
+ public void nextResultObject(Object resultObject) {
+ resultCount++;
+ this.resultObject = resultObject;
+ }
+
+ public void stop() {
+ this.stopped = true;
+ }
+
+}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/ResultContext.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/ResultContext.java?rev=812030&r1=812029&r2=812030&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/ResultContext.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/ResultContext.java
Mon Sep 7 08:14:03 2009
@@ -1,37 +1,13 @@
package org.apache.ibatis.executor.result;
-public class ResultContext {
+public interface ResultContext {
- private Object resultObject;
- private int resultCount;
- private boolean stopped;
-
- public ResultContext() {
- resultObject = null;
- resultCount = 0;
- stopped = false;
- }
-
- public Object getResultObject() {
- return resultObject;
- }
-
- public int getResultCount() {
- return resultCount;
- }
-
- public boolean isStopped() {
- return stopped;
- }
-
- public void nextResultObject(Object resultObject) {
- resultCount++;
- this.resultObject = resultObject;
- }
-
- public void stop() {
- this.stopped = true;
- }
+ Object getResultObject();
+ int getResultCount();
+
+ boolean isStopped();
+
+ void stop();
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=812030&r1=812029&r2=812030&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
Mon Sep 7 08:14:03 2009
@@ -108,7 +108,7 @@
private void handleResults(ResultSet rs, ResultMap resultMap, ResultHandler
resultHandler, int skipResults, int maxResults) throws SQLException {
if (resultMap != null) {
skipResults(rs, skipResults);
- ResultContext context = new ResultContext();
+ DefaultResultContext context = new DefaultResultContext();
while ((maxResults == Executor.NO_ROW_LIMIT || context.getResultCount()
< maxResults)
&& !context.isStopped() && rs.next()) {
ResultMap rm = discriminatorHandler.resolveSubMap(rs, resultMap);
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java?rev=812030&r1=812029&r2=812030&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
Mon Sep 7 08:14:03 2009
@@ -10,6 +10,7 @@
import org.apache.ibatis.executor.result.DefaultResultHandler;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.result.ResultContext;
+import org.apache.ibatis.executor.result.DefaultResultContext;
import java.util.List;
import java.util.ArrayList;
@@ -95,7 +96,7 @@
}
private void handleResultSet(ResultSet rs, ResultMap resultMap,
ResultHandler resultHandler, RowLimit rowLimit) throws SQLException {
- final ResultContext resultContext = new ResultContext();
+ final DefaultResultContext resultContext = new DefaultResultContext();
final List<String> mappedColumnNames = new ArrayList<String>();
final List<String> unmappedColumnNames = new ArrayList<String>();
skipRows(rs, rowLimit);