From bc18856459c9b4aa6ddc3afa88ffa9fe38645d83 Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 3 Jun 2008 13:33:08 +0000
Subject: [PATCH] RESOLVED - BATCH-520: Add a Delegating File Reader For
 Multiple Files

sample job for multi resource input
---
 spring-batch-samples/.springBeans             | 15 ++-
 .../data/multiResourceJob/input/file-1.txt    |  2 +
 .../data/multiResourceJob/input/file-2.txt    |  3 +
 .../data/multiResourceJob/input/ignored.txt   |  1 +
 .../main/resources/jobs/multiResourceJob.xml  | 91 +++++++++++++++++++
 .../MultiResourceJobFunctionalTests.java      |  5 +
 ...ultiResourceJobFunctionalTests-context.xml | 10 ++
 7 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-1.txt
 create mode 100644 spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-2.txt
 create mode 100644 spring-batch-samples/src/main/resources/data/multiResourceJob/input/ignored.txt
 create mode 100644 spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
 create mode 100644 spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java
 create mode 100644 spring-batch-samples/src/test/resources/org/springframework/batch/sample/multiResourceJobFunctionalTests-context.xml

diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index de51a46c0..610e49707 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
 		<config>src/main/resources/jobs/multilineJob.xml</config>
@@ -37,6 +36,7 @@
 		<config>src/main/resources/jobs/multilineOrderOutputAggregators.xml</config>
 		<config>src/main/resources/jobs/taskletJob.xml</config>
 		<config>src/main/resources/jobs/compositeItemWriterSampleJob.xml</config>
+		<config>src/main/resources/jobs/multiResourceJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -294,5 +294,16 @@
 				<config>src/main/resources/jobs/compositeItemWriterSampleJob.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[multiResourceJob]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+				<config>src/main/resources/jobs/multiResourceJob.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-1.txt b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-1.txt
new file mode 100644
index 000000000..965d6aceb
--- /dev/null
+++ b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-1.txt
@@ -0,0 +1,2 @@
+UK21341EAH4121131.11customer1
+UK21341EAH4221232.11customer2
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-2.txt b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-2.txt
new file mode 100644
index 000000000..90663c8ca
--- /dev/null
+++ b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/file-2.txt
@@ -0,0 +1,3 @@
+UK21341EAH4321333.11customer3
+UK21341EAH4421434.11customer4
+UK21341EAH4521535.11customer5
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/data/multiResourceJob/input/ignored.txt b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/ignored.txt
new file mode 100644
index 000000000..d4d1a9be0
--- /dev/null
+++ b/spring-batch-samples/src/main/resources/data/multiResourceJob/input/ignored.txt
@@ -0,0 +1 @@
+random input that would cause error if processed: g awegweagaer gw5t43 5643623456tr
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
new file mode 100644
index 000000000..7b4fe1886
--- /dev/null
+++ b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
@@ -0,0 +1,91 @@
+<?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">
+
+	<bean id="multiResourceJob" parent="simpleJob">
+		<property name="steps">
+			<bean id="step1" parent="simpleStep" p:commitInterval="3">
+				<property name="streams" ref="fileItemReader" />
+				<property name="itemReader">
+					<bean
+						class="org.springframework.batch.item.validator.ValidatingItemReader">
+						<property name="itemReader"
+							ref="fileItemReader" />
+						<property name="validator" ref="fixedValidator" />
+					</bean>
+				</property>
+				<property name="itemWriter">
+					<bean
+						class="org.springframework.batch.sample.item.writer.TradeWriter">
+						<property name="dao" ref="tradeDao" />
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<!-- INFRASTRUCTURE SETUP -->
+
+	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
+	<bean id="testItemReader"
+		class="org.springframework.batch.item.SortedMultiResourceItemReader">
+		<property name="resources"
+			value="classpath:data/multiResourceJob/input/file-*.txt" />
+		<property name="delegate" ref="flatFileItemReader" />
+	</bean>
+	
+	<bean id="fileItemReader" parent="testItemReader"
+		autowire-candidate="false" />
+	
+	<bean id="flatFileItemReader"
+		class="org.springframework.batch.item.file.FlatFileItemReader">
+		<property name="resource"
+			value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
+		<property name="lineTokenizer" ref="fixedFileTokenizer" />
+		<property name="fieldSetMapper" ref="fieldSetMapper" />
+	</bean>
+
+	<bean id="fixedFileTokenizer"
+		class="org.springframework.batch.item.file.transform.FixedLengthTokenizer">
+		<property name="names" value="ISIN, Quantity, Price, Customer" />
+		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
+	</bean>
+
+	<bean id="fixedValidator"
+		class="org.springframework.batch.item.validator.SpringValidator">
+		<property name="validator">
+			<bean id="tradeValidator"
+				class="org.springmodules.validation.valang.ValangValidator">
+				<property name="valang">
+					<value>
+						<![CDATA[
+						{ isin : length(?) < 13 : 'ISIN too long' : 'isin_length' : 12}
+					]]>
+					</value>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean id="tradeDao"
+		class="org.springframework.batch.sample.dao.JdbcTradeDao">
+		<property name="jdbcTemplate" ref="jdbcTemplate" />
+		<property name="incrementer">
+			<bean parent="incrementerParent">
+				<property name="incrementerName" value="TRADE_SEQ" />
+			</bean>
+
+		</property>
+	</bean>
+
+	<bean id="fieldSetMapper"
+		class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java
new file mode 100644
index 000000000..d5c996ec3
--- /dev/null
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java
@@ -0,0 +1,5 @@
+package org.springframework.batch.sample;
+
+public class MultiResourceJobFunctionalTests extends FixedLengthImportJobFunctionalTests {
+
+}
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/multiResourceJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/multiResourceJobFunctionalTests-context.xml
new file mode 100644
index 000000000..c37363d7f
--- /dev/null
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/multiResourceJobFunctionalTests-context.xml
@@ -0,0 +1,10 @@
+<?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/multiResourceJob.xml" />
+
+</beans>
\ No newline at end of file