IN PROGRESS - issue BATCH-352: SimpleFlatFileItemReader vs. DefaultFlatFileItemReader

http://jira.springframework.org/browse/BATCH-352

Merged SimpleFlatFileItemReader into DefaultFlatFileItemReader
This commit is contained in:
robokaso
2008-02-12 14:00:59 +00:00
parent 12cce44e67
commit 7ea45ca090
16 changed files with 272 additions and 353 deletions

View File

@@ -52,7 +52,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>
@@ -61,7 +61,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator2" />
<property name="tokenizer" ref="fixedFileDescriptor2" />
<property name="lineTokenizer" ref="fixedFileDescriptor2" />
<property name="fieldSetMapper" ref="fieldSetMapper2" />
<!-- <property name="validator" ref="fixedValidator" />-->
</bean>

View File

@@ -45,7 +45,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>

View File

@@ -39,7 +39,7 @@
<bean id="testInputTemplate"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>

View File

@@ -71,7 +71,7 @@
<aop:scoped-proxy />
<property name="resource"
value="classpath:data/footballjob/input/${player.file.name}" />
<property name="tokenizer">
<property name="lineTokenizer">
<bean
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
<property name="names"
@@ -90,7 +90,7 @@
<aop:scoped-proxy />
<property name="resource"
value="classpath:data/footballjob/input/${games.file.name}" />
<property name="tokenizer">
<property name="lineTokenizer">
<bean
class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
<property name="names"

View File

@@ -39,7 +39,7 @@
<aop:scoped-proxy />
<property name="resource"
value="classpath:data/multilineJob/input/20070122.teststream.multilineStep.txt" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="tradeLineMapper" />
<!-- <property name="validator" ref="fixedValidator" /> -->
</bean>

View File

@@ -12,7 +12,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileInputLocator" />
<property name="tokenizer" ref="orderFileDescriptor" />
<property name="lineTokenizer" ref="orderFileDescriptor" />
<property name="fieldSetMapper">
<bean class="org.springframework.batch.io.file.mapping.PassThroughFieldSetMapper" />
</property>

View File

@@ -94,7 +94,7 @@
<bean id="testInputTemplate"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>

View File

@@ -47,7 +47,7 @@
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="fixedFileDescriptor" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />
</bean>

View File

@@ -40,7 +40,7 @@
<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
<bean id="testInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="tradeTokenizer" />
<property name="lineTokenizer" ref="tradeTokenizer" />
<property name="fieldSetMapper" ref="tradeMapper" />
</bean>

View File

@@ -40,7 +40,7 @@
id="fileInputTemplate" scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />
<property name="tokenizer" ref="tradeFileDescriptor" />
<property name="lineTokenizer" ref="tradeFileDescriptor" />
<property name="fieldSetMapper">
<bean
class="org.springframework.batch.sample.mapping.TradeFieldSetMapper" />

View File

@@ -47,7 +47,7 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
fileLocator = new ClassPathResource("data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt");
inputSource = new DefaultFlatFileItemReader();
inputSource.setFieldSetMapper(new TradeFieldSetMapper());
inputSource.setTokenizer(lineTokenizer);
inputSource.setLineTokenizer(lineTokenizer);
inputSource.setResource(fileLocator);
}