From 194cc1db69f90ae23a1a2dbc9fbf015ebc0baabe Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 17 Dec 2008 16:31:13 +0000
Subject: [PATCH] IN PROGRESS - BATCH-971: add database writers to iosample

migrate ibatisJob to iosamples
fixed AbstractPagingItemReader to reset its state on close()
---
 .../database/AbstractPagingItemReader.java    |  4 +-
 spring-batch-samples/.springBeans             |  2 -
 .../main/resources/ibatis-customer-credit.xml |  4 ++
 .../src/main/resources/jobs/ibatisJob.xml     | 58 -------------------
 .../main/resources/jobs/iosample/ibatis.xml   | 24 ++++++++
 .../sample/IbatisJobFunctionalTests.java      | 17 ------
 .../iosample/IbatisFunctionalTests.java       | 19 ++++++
 .../IbatisJobFunctionalTests-context.xml      | 10 ----
 8 files changed, 50 insertions(+), 88 deletions(-)
 delete mode 100644 spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
 create mode 100644 spring-batch-samples/src/main/resources/jobs/iosample/ibatis.xml
 delete mode 100644 spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java
 create mode 100644 spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/IbatisFunctionalTests.java
 delete mode 100644 spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java
index 17dd42c30..8025c9400 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java
@@ -111,7 +111,9 @@ public abstract class AbstractPagingItemReader<T> extends AbstractItemCountingIt
 	protected void doClose() throws Exception {
 
 		initialized = false;
-
+		current = 0;
+		page = 0;
+		results = null;
 	}
 
 
diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index 99c64a722..ab8a45ad9 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -18,7 +18,6 @@
 		<config>src/main/resources/jobs/adhocLoopJob.xml</config>
 		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
 		<config>src/main/resources/data-source-context-init.xml</config>
-		<config>src/main/resources/jobs/ibatisJob.xml</config>
 		<config>src/main/resources/jobs/footballJob.xml</config>
 		<config>src/main/resources/jobs/delegatingJob.xml</config>
 		<config>src/main/resources/jobs/parallelJob.xml</config>
@@ -108,7 +107,6 @@
 			<incomplete>false</incomplete>
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/ibatisJob.xml</config>
 				<config>src/main/resources/simple-job-launcher-context.xml</config>
 				<config>src/main/resources/org/springframework/batch/sample/config/common-context.xml</config>
 			</configs>
diff --git a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
index 6c1f9d78c..cd23cf0a7 100644
--- a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
+++ b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml
@@ -13,6 +13,10 @@
     select ID from CUSTOMER
   </select>
   
+  <select id="getAllCustomerCredits" resultMap="result">
+ 	select ID, NAME, CREDIT from CUSTOMER 
+  </select>
+  
   <select id="getCustomerCreditById" parameterClass="int" resultMap="result">
   	select NAME, CREDIT from CUSTOMER where ID = #value#
   </select>
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
deleted file mode 100644
index 818b6bc71..000000000
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-	<description>Example for iBATIS integration.</description>
-
-	<bean id="ibatisJob" parent="simpleJob">
-		<property name="steps">
-			<bean id="step1" parent="simpleStep">
-				<property name="itemReader" ref="ibatisItemReader" />
-				<property name="itemProcessor">
-					<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor" />	
-				</property>
-				<property name="itemWriter">
-					<bean
-						class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditItemWriter">
-						<property name="customerCreditDao">
-							<bean
-								class="org.springframework.batch.sample.domain.trade.internal.IbatisCustomerCreditDao">
-								<property name="sqlMapClient"
-									ref="sqlMapClient" />
-								<property name="statementId"
-									value="updateCredit" />
-							</bean>
-						</property>
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="ibatisItemReader"
-		class="org.springframework.batch.item.database.IbatisDrivingQueryItemReader">
-		<property name="detailsQueryId" value="getCustomerCreditById" />
-		<property name="sqlMapClient" ref="sqlMapClient" />
-		<property name="keyCollector" ref="ibatisKeyGenerator" />
-	</bean>
-
-	<bean id="ibatisKeyGenerator"
-		class="org.springframework.batch.item.database.support.IbatisKeyCollector">
-		<property name="drivingQueryId" value="getAllCustomerCreditIds" />
-		<property name="sqlMapClient" ref="sqlMapClient" />
-	</bean>
-
-	<bean id="sqlMapClient"
-		class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
-		<property name="configLocation" value="ibatis-config.xml" />
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/ibatis.xml b/spring-batch-samples/src/main/resources/jobs/iosample/ibatis.xml
new file mode 100644
index 000000000..6261739d7
--- /dev/null
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/ibatis.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+
+	<bean id="itemReader"
+		class="org.springframework.batch.item.database.IbatisPagingItemReader">
+		<property name="queryId" value="getAllCustomerCredits" />
+		<property name="sqlMapClient" ref="sqlMapClient" />
+	</bean>
+
+	<bean id="itemWriter"
+		class="org.springframework.batch.item.database.IbatisBatchItemWriter">
+		<property name="statementId" value="updateCredit" />
+		<property name="sqlMapClient" ref="sqlMapClient" />
+	</bean>
+	
+	<bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="configLocation" value="ibatis-config.xml" />	
+	</bean>
+
+</beans>
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java
deleted file mode 100644
index faa023c79..000000000
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.springframework.batch.sample;
-
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-
-/**
- * Test for IbatisJob - checks that customer credit has been updated to expected value.
- * 
- * @author Robert Kasanicky
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration()
-public class IbatisJobFunctionalTests extends AbstractCustomerCreditIncreaseTests{
-
-}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/IbatisFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/IbatisFunctionalTests.java
new file mode 100644
index 000000000..9c81154ac
--- /dev/null
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/IbatisFunctionalTests.java
@@ -0,0 +1,19 @@
+package org.springframework.batch.sample.iosample;
+
+import org.junit.runner.RunWith;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml",
+		"/jobs/iosample/ibatis.xml" })
+public class IbatisFunctionalTests extends AbstractIoSampleTests {
+
+	@Override
+	protected void pointReaderToOutput(ItemReader<CustomerCredit> reader) {
+		// no-op
+	}
+
+}
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml
deleted file mode 100644
index febb709fa..000000000
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<import resource="classpath:/simple-job-launcher-context.xml" />
-	<import resource="classpath:/jobs/ibatisJob.xml*" />
-
-</beans>