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

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

DefaultFlatFileItemReader renamed to FlatFileItemReader
This commit is contained in:
robokaso
2008-02-12 14:17:25 +00:00
parent 7ea45ca090
commit 2277261059
16 changed files with 89 additions and 88 deletions

View File

@@ -48,7 +48,7 @@
<!-- INFRASTRUCTURE SETUP -->
<bean id="fileInputTemplate"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />
@@ -57,7 +57,7 @@
</bean>
<bean id="fileInputTemplate2"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator2" />

View File

@@ -41,7 +41,7 @@
<!-- INFRASTRUCTURE SETUP -->
<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
<bean id="fileInputTemplate" class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />

View File

@@ -37,7 +37,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">
class="org.springframework.batch.io.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />

View File

@@ -66,7 +66,7 @@
</bean>
<bean id="playerFileItemReader"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource"
@@ -85,7 +85,7 @@
</bean>
<bean id="gameFileItemReader"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource"

View File

@@ -34,7 +34,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource"

View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
<bean id="fileInputTemplate" class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
<bean id="fileInputTemplate" class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileInputLocator" />

View File

@@ -92,7 +92,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">
class="org.springframework.batch.io.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="fixedFileDescriptor" />
<property name="fieldSetMapper" ref="fieldSetMapper" />

View File

@@ -43,7 +43,7 @@
</bean>
<bean id="fileItemReader"
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />

View File

@@ -38,7 +38,7 @@
</bean>
<!-- 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">
<bean id="testInputTemplate" class="org.springframework.batch.io.file.FlatFileItemReader">
<property name="resource" ref="fileLocator" />
<property name="lineTokenizer" ref="tradeTokenizer" />
<property name="fieldSetMapper" ref="tradeMapper" />

View File

@@ -36,7 +36,7 @@
</bean>
<bean
class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
class="org.springframework.batch.io.file.FlatFileItemReader"
id="fileInputTemplate" scope="step">
<aop:scoped-proxy />
<property name="resource" ref="fileLocator" />

View File

@@ -21,7 +21,7 @@ import java.io.FileReader;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.springframework.batch.io.file.DefaultFlatFileItemReader;
import org.springframework.batch.io.file.FlatFileItemReader;
import org.springframework.batch.io.file.transform.LineTokenizer;
import org.springframework.batch.sample.domain.Trade;
import org.springframework.batch.sample.mapping.TradeFieldSetMapper;
@@ -38,14 +38,14 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
//auto-injected attributes
private JdbcOperations jdbcTemplate;
private Resource fileLocator;
private DefaultFlatFileItemReader inputSource;
private FlatFileItemReader inputSource;
private LineTokenizer lineTokenizer;
protected void onSetUp() throws Exception {
super.onSetUp();
jdbcTemplate.update("delete from TRADE");
fileLocator = new ClassPathResource("data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt");
inputSource = new DefaultFlatFileItemReader();
inputSource = new FlatFileItemReader();
inputSource.setFieldSetMapper(new TradeFieldSetMapper());
inputSource.setLineTokenizer(lineTokenizer);
inputSource.setResource(fileLocator);

View File

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import junit.framework.TestCase;
import org.springframework.batch.io.file.DefaultFlatFileItemReader;
import org.springframework.batch.io.file.FlatFileItemReader;
import org.springframework.batch.sample.dao.TradeDao;
import org.springframework.batch.sample.domain.Trade;
@@ -16,7 +16,7 @@ public class SimpleTradeTaskletTests extends TestCase {
public void testReadAndProcess() throws Exception {
//create input
DefaultFlatFileItemReader input = new DefaultFlatFileItemReader() {
FlatFileItemReader input = new FlatFileItemReader() {
private boolean done = false;