Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-863: renamed ResourceLineReader to FlatFileItemReader

Browse Source
This commit is contained in:
trisberg
2008-10-07 17:58:48 +00:00
parent 2040c31c6c
commit 9ec2a67a97
20 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java
View File

@@ -6,11 +6,11 @@ import java.io.Writer;
import org.springframework.batch.item.file.FileWriterCallback;
import org.springframework.batch.item.file.FlatFileItemWriter;
import org.springframework.batch.item.file.LineCallbackHandler;
import org.springframework.batch.item.file.ResourceLineReader;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.util.Assert;
/**
* Designed to be registered with both {@link ResourceLineReader} and
* Designed to be registered with both {@link FlatFileItemReader} and
* {@link FlatFileItemWriter} and copy header line from input file to output
* file.
*/

22
spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
View File

@@ -36,7 +36,7 @@
<!-- INFRASTRUCTURE SETUP -->
<bean id="tradeFileItemReader" class="org.springframework.batch.item.file.ResourceLineReader">
<bean id="tradeFileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">
@@ -47,7 +47,7 @@
</property>
</bean>
<bean id="personFileItemReader" class="org.springframework.batch.item.file.ResourceLineReader">
<bean id="personFileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt" />
<property name="lineMapper">
@@ -83,15 +83,15 @@
</property>
</bean>
<bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
<property name="dataSource" ref="dataSource" />
<property name="incrementer">
<bean parent="incrementerParent">
<property name="incrementerName" value="TRADE_SEQ" />
</bean>
</property>
</bean>
<bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
<property name="dataSource" ref="dataSource" />
<property name="incrementer">
<bean parent="incrementerParent">
<property name="incrementerName" value="TRADE_SEQ" />
</bean>
</property>
</bean>
<bean id="tradeFieldSetMapper" class="org.springframework.batch.item.file.mapping.BeanWrapperFieldSetMapper">
<property name="prototypeBeanName" value="trade" />
</bean>

2
spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
View File

@@ -45,7 +45,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">

16
spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
<bean name="customerFilterJob" parent="simpleJob">
<property name="steps">
@@ -32,7 +32,7 @@
</property>
</bean>
<bean name="customerFileUploadReader" class="org.springframework.batch.item.file.ResourceLineReader" >
<bean name="customerFileUploadReader" class="org.springframework.batch.item.file.FlatFileItemReader" >
<property name="resource" ref="customerFileResource" />
<property name="lineMapper">
<bean class="org.springframework.batch.item.file.mapping.PassThroughLineMapper" />
@@ -41,7 +41,7 @@
<bean name="customerMapper" class="org.springframework.batch.sample.domain.trade.CustomerUpdateFieldSetMapper" />
<bean name="customerTokenizer" class="org.springframework.batch.sample.domain.trade.CompositeCustomerUpdateLineTokenizer" >
<bean name="customerTokenizer" class="org.springframework.batch.sample.domain.trade.CompositeCustomerUpdateLineTokenizer" >
<property name="customerTokenizer">
<bean class="org.springframework.batch.item.file.transform.FixedLengthTokenizer" >
<property name="columns" value="1,2-18,19-26" />
@@ -67,5 +67,5 @@
<bean name="customerFileResource" class="org.springframework.core.io.ClassPathResource" >
<constructor-arg value="data/customerFilterJob/input/customers.txt" />
</bean>
</bean>
</beans>

2
spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
View File

@@ -28,7 +28,7 @@
<!-- 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.file.ResourceLineReader">
<bean id="testItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">

4
spring-batch-samples/src/main/resources/jobs/footballJob.xml
View File

@@ -59,7 +59,7 @@
</bean>
<bean id="playerFileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/footballjob/input/${player.file.name}" />
<property name="lineMapper">
@@ -80,7 +80,7 @@
</bean>
<bean id="gameFileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/footballjob/input/${games.file.name}" />
<property name="lineMapper">

2
spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml
View File

@@ -28,7 +28,7 @@
</bean>
</property>
</bean>
<bean id="reader" class="org.springframework.batch.item.file.ResourceLineReader">
<bean id="reader" class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="inputResource" />
<property name="lineMapper">
<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">

2
spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
View File

@@ -42,7 +42,7 @@
autowire-candidate="false" />
<bean id="flatFileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">

18
spring-batch-samples/src/main/resources/jobs/multilineJob.xml
View File

@@ -2,16 +2,16 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
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">
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">
<bean id="multilineJob" parent="simpleJob">
<property name="steps">
<bean id="multilineJob" parent="simpleJob">
<property name="steps">
<bean id="step1" parent="simpleStep">
<property name="streams" ref="fileItemReader"/>
<property name="itemReader">
<property name="streams" ref="fileItemReader"/>
<property name="itemReader">
<bean
class="org.springframework.batch.item.support.AggregateItemReader">
<property name="itemReader"
@@ -33,7 +33,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/multilineJob/input/20070122.teststream.multilineStep.txt" />
<property name="lineMapper">

24
spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
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">
<bean id="fileItemReader" class="org.springframework.batch.item.file.ResourceLineReader">
<property name="resource" ref="fileInputLocator" />
<property name="lineMapper">
<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
<property name="lineTokenizer" ref="orderFileTokenizer" />
<property name="fieldSetMapper">
<bean class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>
<bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource" ref="fileInputLocator" />
<property name="lineMapper">
<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
<property name="lineTokenizer" ref="orderFileTokenizer" />
<property name="fieldSetMapper">
<bean class="org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper" />
</property>
</bean>
</property>
</bean>

2
spring-batch-samples/src/main/resources/jobs/parallelJob.xml
View File

@@ -66,7 +66,7 @@
<!-- 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.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">

2
spring-batch-samples/src/main/resources/jobs/restartSample.xml
View File

@@ -38,7 +38,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.item.file.ResourceLineReader">
class="org.springframework.batch.item.file.FlatFileItemReader">
<property name="resource"
value="classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt" />
<property name="lineMapper">

20
spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
View File

@@ -9,15 +9,15 @@
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
<bean class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao"
id="tradeDao" p:dataSource-ref="dataSource">
<property name="incrementer">
<bean parent="incrementerParent">
<property name="incrementerName" value="TRADE_SEQ" />
</bean>
</property>
</bean>
<bean class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao"
id="tradeDao" p:dataSource-ref="dataSource">
<property name="incrementer">
<bean parent="incrementerParent">
<property name="incrementerName" value="TRADE_SEQ" />
</bean>
</property>
</bean>
<bean
class="org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao"
id="customerDao" p:dataSource-ref="dataSource" />
@@ -38,7 +38,7 @@
</property>
</bean>
<bean class="org.springframework.batch.item.file.ResourceLineReader"
<bean class="org.springframework.batch.item.file.FlatFileItemReader"
id="fileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineMapper">

6
spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
View File

@@ -29,7 +29,7 @@ import javax.sql.DataSource;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.file.ResourceLineReader;
import org.springframework.batch.item.file.FlatFileItemReader;
import org.springframework.batch.item.file.mapping.DefaultLineMapper;
import org.springframework.batch.item.file.mapping.FieldSetMapper;
import org.springframework.batch.item.file.transform.LineTokenizer;
@@ -53,7 +53,7 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
//auto-injected attributes
private SimpleJdbcTemplate simpleJdbcTemplate;
private Resource fileLocator;
private ResourceLineReader<Trade> inputSource;
private FlatFileItemReader<Trade> inputSource;
private LineTokenizer lineTokenizer;
@Autowired
@@ -71,7 +71,7 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
public void onSetUp() throws Exception {
simpleJdbcTemplate.update("delete from TRADE");
fileLocator = new ClassPathResource("data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt");
inputSource = new ResourceLineReader<Trade>();
inputSource = new FlatFileItemReader<Trade>();
FieldSetMapper<Trade> mapper = new TradeFieldSetMapper();
DefaultLineMapper<Trade> lineMapper = new DefaultLineMapper<Trade>();