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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

246
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
View File

@@ -16,16 +16,29 @@
package org.springframework.batch.io.file;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.io.Skippable;
import org.springframework.batch.io.exception.FlatFileParsingException;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.separator.LineReader;
import org.springframework.batch.io.file.separator.RecordSeparatorPolicy;
import org.springframework.batch.io.file.separator.ResourceLineReader;
import org.springframework.batch.io.file.transform.AbstractLineTokenizer;
import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
import org.springframework.batch.io.file.transform.LineTokenizer;
import org.springframework.batch.item.ExecutionAttributes;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.exception.StreamException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
/**
* <p>
@@ -38,7 +51,7 @@ import org.springframework.batch.item.exception.StreamException;
* @author Robert Kasanicky
* @author Dave Syer
*/
public class DefaultFlatFileItemReader extends SimpleFlatFileItemReader implements Skippable, ItemStream {
public class DefaultFlatFileItemReader implements ItemReader, Skippable, ItemStream, InitializingBean {
private static Log log = LogFactory.getLog(DefaultFlatFileItemReader.class);
@@ -46,16 +59,113 @@ public class DefaultFlatFileItemReader extends SimpleFlatFileItemReader implemen
public static final String SKIPPED_STATISTICS_NAME = "skipped.lines.count";
// default encoding for input files
public static final String DEFAULT_CHARSET = "ISO-8859-1";
private String encoding = DEFAULT_CHARSET;
private Set skippedLines = new HashSet();
private Resource resource;
private String path;
private RecordSeparatorPolicy recordSeparatorPolicy;
private String[] comments;
private int linesToSkip = 0;
private boolean firstLineIsHeader = false;
private LineTokenizer tokenizer = new DelimitedLineTokenizer();
private FieldSetMapper fieldSetMapper;
/**
* Initialize the input source.
* Encapsulates the state of the input source. If it is null then we are
* uninitialized.
*/
public void open() {
super.open();
protected LineReader reader;
/**
* Initialize the reader if necessary.
* @throws IllegalStateException if the resource cannot be opened
*/
public void open() throws IllegalStateException {
Assert.state(resource.exists(), "Resource must exist: [" + resource + "]");
log.debug("Opening flat file for reading: " + resource);
if (this.reader == null) {
ResourceLineReader reader = new ResourceLineReader(resource, encoding);
if (recordSeparatorPolicy != null) {
reader.setRecordSeparatorPolicy(recordSeparatorPolicy);
}
if (comments != null) {
reader.setComments(comments);
}
reader.open();
this.reader = reader;
}
for (int i = 0; i < linesToSkip; i++) {
readLine();
}
if (firstLineIsHeader) {
// skip the header
String firstLine = readLine();
// set names in tokenizer if they haven't been set already
if (tokenizer instanceof AbstractLineTokenizer && !((AbstractLineTokenizer) tokenizer).hasNames()) {
String[] names = tokenizer.tokenize(firstLine).getValues();
((AbstractLineTokenizer) tokenizer).setNames(names);
}
}
mark();
}
/**
* Close and null out the reader.
* @throws Exception
*/
public void close() throws StreamException {
try {
if (reader != null) {
log.debug("Closing flat file for reading: " + resource);
reader.close();
}
}
finally {
reader = null;
}
}
/**
* Reads a line from input, tokenizes is it using the {@link #tokenizer} and
* maps to domain object using {@link #fieldSetMapper}.
*
* @see org.springframework.batch.io.ItemReader#read()
*/
public Object read() throws Exception {
String line = readLine();
if (line != null) {
try {
FieldSet tokenizedLine = tokenizer.tokenize(line);
return fieldSetMapper.mapLine(tokenizedLine);
}
catch (RuntimeException ex) {
// add current line count to message and re-throw
int lineCount = getReader().getPosition();
throw new FlatFileParsingException("Parsing error at line: " + lineCount + " in resource=" + path
+ ", input=[" + line + "]", ex, line, lineCount);
}
}
return null;
}
/**
* This method initialises the Input Source for Restart. It opens the input
* file and position the buffer reader according to information provided by
@@ -112,14 +222,16 @@ public class DefaultFlatFileItemReader extends SimpleFlatFileItemReader implemen
return true;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.batch.item.ItemStream#mark(org.springframework.batch.item.ExecutionAttributes)
*/
public void mark() {
getReader().mark();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.springframework.batch.item.ItemStream#reset(org.springframework.batch.item.ExecutionAttributes)
*/
public void reset() {
@@ -136,12 +248,130 @@ public class DefaultFlatFileItemReader extends SimpleFlatFileItemReader implemen
log.debug("Skipping line in template=[" + this + "], line=" + count);
}
/**
* @return next line to be tokenized and mapped
*/
protected String readLine() {
String line = super.readLine();
String line = nextLine();
while (line != null && skippedLines.contains(new Integer(getReader().getPosition()))) {
line = super.readLine();
line = nextLine();
}
return line;
}
/**
* @return next line from the input
*/
private String nextLine() {
try {
return (String) getReader().read();
}
catch (Exception e) {
throw new IllegalStateException(e);
}
}
/**
* @return line reader used to read input file
*/
protected LineReader getReader() {
if (reader == null) {
open();
// reader is now not null, or else an exception is thrown
}
return reader;
}
/**
* Setter for resource property. The location of an input stream that can be
* read.
*
* @param resource
* @throws IOException
*/
public void setResource(Resource resource) throws IOException {
this.resource = resource;
path = resource.toString();
if (path.length() > 50) {
path = path.substring(0, 20) + "..." + path.substring(path.length());
}
}
/**
* Public setter for the recordSeparatorPolicy. Used to determine where the
* line endings are and do things like continue over a line ending if inside
* a quoted string.
*
* @param recordSeparatorPolicy the recordSeparatorPolicy to set
*/
public void setRecordSeparatorPolicy(RecordSeparatorPolicy recordSeparatorPolicy) {
this.recordSeparatorPolicy = recordSeparatorPolicy;
}
/**
* Setter for comment prefixes. Can be used to ignore header lines as well
* by using e.g. the first couple of column names as a prefix.
*
* @param comments an array of comment line prefixes.
*/
public void setComments(String[] comments) {
this.comments = new String[comments.length];
System.arraycopy(comments, 0, this.comments, 0, comments.length);
}
/**
* Indicates whether first line is a header. If the tokenizer is an
* {@link AbstractLineTokenizer} and the column names haven't been set
* already then the header will be used to setup column names. Default is
* <code>false</code>.
*/
public void setFirstLineIsHeader(boolean firstLineIsHeader) {
this.firstLineIsHeader = firstLineIsHeader;
}
/**
* @param lineTokenizer tokenizes each line from file into {@link FieldSet}.
*/
public void setLineTokenizer(LineTokenizer lineTokenizer) {
this.tokenizer = lineTokenizer;
}
/**
* Set the FieldSetMapper to be used for each line.
*
* @param fieldSetMapper
*/
public void setFieldSetMapper(FieldSetMapper fieldSetMapper) {
this.fieldSetMapper = fieldSetMapper;
}
/**
* Public setter for the number of lines to skip at the start of a file. Can
* be used if the file contains a header without useful (column name)
* information, and without a comment delimiter at the beginning of the
* lines.
*
* @param linesToSkip the number of lines to skip
*/
public void setLinesToSkip(int linesToSkip) {
this.linesToSkip = linesToSkip;
}
/**
* Setter for the encoding for this input source. Default value is
* {@value #DEFAULT_CHARSET}.
*
* @param encoding a properties object which possibly contains the encoding
* for this input file;
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
}
public void afterPropertiesSet() throws Exception {
Assert.notNull(resource, "Input resource must not be null");
Assert.notNull(fieldSetMapper, "FieldSetMapper must not be null.");
}
}

294
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/SimpleFlatFileItemReader.java
View File

@@ -1,294 +0,0 @@
/*
* Copyright 2006-2007 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.io.file;
import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.io.exception.FlatFileParsingException;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.separator.LineReader;
import org.springframework.batch.io.file.separator.RecordSeparatorPolicy;
import org.springframework.batch.io.file.separator.ResourceLineReader;
import org.springframework.batch.io.file.transform.AbstractLineTokenizer;
import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
import org.springframework.batch.io.file.transform.LineTokenizer;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.exception.StreamException;
import org.springframework.batch.item.reader.AbstractItemReader;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
/**
* This class represents a basic input source, that reads data from the file and
* returns it as structured tuples in the form of{@link DefaultFieldSet} instances.
* The location of the file is defined by the resource property. To separate the
* structure of the file, {@link LineTokenizer} is used to parse data obtained
* from the file. <br/>
*
* A {@link SimpleFlatFileItemReader} is not thread safe because it maintains
* state in the form of a {@link ResourceLineReader}. Be careful to configure a
* {@link SimpleFlatFileItemReader} using an appropriate factory or scope so
* that it is not shared between threads.<br/>
*
* @see FieldSetItemReader
*
* @author Dave Syer
*/
public class SimpleFlatFileItemReader extends AbstractItemReader implements ItemReader,
InitializingBean, DisposableBean {
private static Log log = LogFactory.getLog(SimpleFlatFileItemReader.class);
// default encoding for input files - set to ISO-8859-1
public static final String DEFAULT_CHARSET = "ISO-8859-1";
private Resource resource;
/**
* Encapsulates the state of the input source. If it is null then we are
* uninitialized.
*/
protected LineReader reader;
private RecordSeparatorPolicy recordSeparatorPolicy;
private String[] comments;
private LineTokenizer tokenizer = new DelimitedLineTokenizer();
private FieldSetMapper fieldSetMapper;
private String encoding = DEFAULT_CHARSET;
private boolean firstLineIsHeader = false;
private int linesToSkip = 0;
private String path;
/**
* Setter for resource property. The location of an input stream that can be
* read.
*
* @param resource
* @throws IOException
*/
public void setResource(Resource resource) throws IOException {
this.resource = resource;
path = resource.toString();
if (path.length()>50) {
path = path.substring(0,20)+"..."+path.substring(path.length());
}
}
/**
* Public setter for the recordSeparatorPolicy. Used to determine where the
* line endings are and do things like continue over a line ending if inside
* a quoted string.
*
* @param recordSeparatorPolicy
* the recordSeparatorPolicy to set
*/
public void setRecordSeparatorPolicy(
RecordSeparatorPolicy recordSeparatorPolicy) {
this.recordSeparatorPolicy = recordSeparatorPolicy;
}
/**
* Setter for comment prefixes. Can be used to ignore header lines as well
* by using e.g. the first couple of column names as a prefix.
*
* @param comments
* an array of comment line prefixes.
*/
public void setComments(String[] comments) {
this.comments = new String[comments.length];
System.arraycopy(comments, 0, this.comments, 0, comments.length);
}
public void afterPropertiesSet() throws Exception {
Assert.notNull(resource);
Assert.notNull(fieldSetMapper, "FieldSetMapper must not be null.");
}
/**
* Initialize the reader if necessary.
* @throws IllegalStateException if the resource cannot be opened
*/
public void open() throws IllegalStateException {
Assert.state(resource.exists(), "Resource must exist: [" + resource
+ "]");
log.debug("Opening flat file for reading: "+resource);
if (this.reader == null) {
ResourceLineReader reader = new ResourceLineReader(resource, encoding);
if (recordSeparatorPolicy != null) {
reader.setRecordSeparatorPolicy(recordSeparatorPolicy);
}
if (comments != null) {
reader.setComments(comments);
}
reader.open();
this.reader = reader;
}
for (int i = 0; i < linesToSkip; i++) {
readLine();
}
if (firstLineIsHeader) {
// skip the header
String firstLine = readLine();
// set names in tokenizer if they haven't been set already
if (tokenizer instanceof AbstractLineTokenizer
&& !((AbstractLineTokenizer) tokenizer).hasNames()) {
String[] names = tokenizer.tokenize(firstLine).getValues();
((AbstractLineTokenizer) tokenizer).setNames(names);
}
}
}
/**
* Close and null out the reader.
* @throws Exception
*
* @see ResourceLifecycle
*/
public void close() throws StreamException {
try {
if (reader != null) {
log.debug("Closing flat file for reading: "+resource);
reader.close();
}
} finally {
reader = null;
}
}
/**
* Calls close to ensure that bean factories can close and always release
* resources.
*
* @see org.springframework.beans.factory.DisposableBean#destroy()
*/
public void destroy() throws Exception {
close();
}
// Reads first valid line.
protected String readLine() {
try {
return (String) getReader().read();
}
catch (Exception e) {
throw new IllegalStateException(e);
}
}
/**
* A wrapper for {@link #readFieldSet()} to make this into a real
* {@link ItemReader}.
* @throws Exception
*
* @see org.springframework.batch.io.ItemReader#read()
*/
public Object read() throws Exception {
String line = readLine();
if (line != null) {
try {
FieldSet tokenizedLine = tokenizer.tokenize(line);
return fieldSetMapper.mapLine(tokenizedLine);
} catch (RuntimeException ex) {
// add current line count to message and re-throw
int lineCount = getReader().getPosition();
throw new FlatFileParsingException("Parsing error at line: "+lineCount+" in resource="+path+", input=["+line+"]", ex, line,
lineCount);
}
}
return null;
}
/**
* Setter for the encoding for this input source. Default value is
* {@value #DEFAULT_CHARSET}.
*
* @param encoding
* a properties object which possibly contains the encoding for
* this input file;
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
}
/**
* Sets descriptor for this input template.
*/
public void setTokenizer(LineTokenizer lineTokenizer) {
this.tokenizer = lineTokenizer;
}
/**
* Set the FieldSetMapper to be used for each line.
*
* @param fieldSetMapper
*/
public void setFieldSetMapper(FieldSetMapper fieldSetMapper) {
this.fieldSetMapper = fieldSetMapper;
}
// Returns object representing state of the input template.
protected LineReader getReader() {
if (reader == null) {
open();
// reader is now not null, or else an exception is thrown
}
return reader;
}
/**
* Indicates whether first line is a header. If the tokenizer is an
* {@link AbstractLineTokenizer} and the column names haven't been set
* already then the header will be used to setup column names. Default is
* <code>false</code>.
*/
public void setFirstLineIsHeader(boolean firstLineIsHeader) {
this.firstLineIsHeader = firstLineIsHeader;
}
/**
* Public setter for the number of lines to skip at the start of a file. Can
* be used if the file contains a header without useful (column name)
* information, and without a comment delimiter at the beginning of the
* lines.
*
* @param linesToSkip
* the number of lines to skip
*/
public void setLinesToSkip(int linesToSkip) {
this.linesToSkip = linesToSkip;
}
}

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
View File

@@ -32,10 +32,6 @@ import org.springframework.core.io.Resource;
/**
* Tests for {@link DefaultFlatFileItemReader}
*
* @author robert.kasanicky
*
* TODO only regular reading is tested currently, add exception cases, restart,
* skip, validation...
*/
public class DefaultFlatFileItemReaderTests extends TestCase {
@@ -65,7 +61,7 @@ public class DefaultFlatFileItemReaderTests extends TestCase {
protected void setUp() throws Exception {
inputSource.setResource(getInputResource(TEST_STRING));
inputSource.setTokenizer(tokenizer);
inputSource.setLineTokenizer(tokenizer);
inputSource.setFieldSetMapper(fieldSetMapper);
// context argument is necessary only for the FileLocator, which
// is mocked

49
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
View File

@@ -18,16 +18,14 @@ package org.springframework.batch.io.file;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.io.exception.BatchEnvironmentException;
import org.springframework.batch.io.exception.FlatFileParsingException;
import org.springframework.batch.io.file.mapping.DefaultFieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy;
import org.springframework.batch.io.file.transform.DelimitedLineTokenizer;
import org.springframework.batch.io.file.transform.LineTokenizer;
@@ -44,7 +42,7 @@ import org.springframework.core.io.Resource;
public class SimpleFlatFileItemReaderTests extends TestCase {
// object under test
private SimpleFlatFileItemReader itemReader = new SimpleFlatFileItemReader();
private DefaultFlatFileItemReader itemReader = new DefaultFlatFileItemReader();
// common value used for writing to a file
private String TEST_STRING = "FlatFileInputTemplate-TestData";
@@ -70,7 +68,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
protected void setUp() throws Exception {
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setTokenizer(tokenizer);
itemReader.setLineTokenizer(tokenizer);
itemReader.setFieldSetMapper(fieldSetMapper);
itemReader.afterPropertiesSet();
@@ -107,7 +105,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
* Regular usage of <code>read</code> method
*/
public void testReadWithTokenizerError() throws Exception {
itemReader.setTokenizer(new LineTokenizer() {
itemReader.setLineTokenizer(new LineTokenizer() {
public FieldSet tokenize(String line) {
throw new RuntimeException("foo");
}
@@ -138,14 +136,14 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testReadBeforeOpen() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
assertEquals("[FlatFileInputTemplate-TestData]", itemReader.read().toString());
}
public void testCloseBeforeOpen() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
itemReader.close();
@@ -153,19 +151,8 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
assertEquals("[FlatFileInputTemplate-TestData]", itemReader.read().toString());
}
public void testCloseOnDestroy() throws Exception {
final List list = new ArrayList();
itemReader = new SimpleFlatFileItemReader() {
public void close() {
list.add("close");
}
};
itemReader.destroy();
assertEquals(1, list.size());
}
public void testInitializationWithNullResource() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
try {
itemReader.afterPropertiesSet();
fail("Expected IllegalArgumentException");
@@ -181,7 +168,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetValidEncoding() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setEncoding("UTF-8");
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
@@ -189,7 +176,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetNullEncoding() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setEncoding(null);
itemReader.setResource(getInputResource(TEST_STRING));
try {
@@ -202,7 +189,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetInvalidEncoding() throws Exception {
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setEncoding("foo");
itemReader.setResource(getInputResource(TEST_STRING));
try {
@@ -237,9 +224,9 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
public void testColumnNamesInHeader() throws Exception {
final String INPUT = "name1|name2\nvalue1|value2\nvalue3|value4";
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setResource(getInputResource(INPUT));
itemReader.setTokenizer(new DelimitedLineTokenizer('|'));
itemReader.setLineTokenizer(new DelimitedLineTokenizer('|'));
itemReader.setFieldSetMapper(fieldSetMapper);
itemReader.setFirstLineIsHeader(true);
itemReader.afterPropertiesSet();
@@ -260,9 +247,9 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
public void testLinesToSkip() throws Exception {
final String INPUT = "foo bar spam\none two\nthree four";
itemReader = new SimpleFlatFileItemReader();
itemReader = new DefaultFlatFileItemReader();
itemReader.setResource(getInputResource(INPUT));
itemReader.setTokenizer(new DelimitedLineTokenizer(' '));
itemReader.setLineTokenizer(new DelimitedLineTokenizer(' '));
itemReader.setFieldSetMapper(fieldSetMapper);
itemReader.setLinesToSkip(1);
itemReader.afterPropertiesSet();
@@ -281,9 +268,9 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
Resource resource = new NonExistentResource();
SimpleFlatFileItemReader testReader = new SimpleFlatFileItemReader();
DefaultFlatFileItemReader testReader = new DefaultFlatFileItemReader();
testReader.setResource(resource);
testReader.setTokenizer(tokenizer);
testReader.setLineTokenizer(tokenizer);
testReader.setFieldSetMapper(fieldSetMapper);
testReader.setResource(resource);
@@ -303,9 +290,9 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
Resource resource = new NonExistentResource();
SimpleFlatFileItemReader testReader = new SimpleFlatFileItemReader();
DefaultFlatFileItemReader testReader = new DefaultFlatFileItemReader();
testReader.setResource(resource);
testReader.setTokenizer(tokenizer);
testReader.setLineTokenizer(tokenizer);
testReader.setFieldSetMapper(fieldSetMapper);
testReader.setResource(resource);

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.batch.repeat.support;
import junit.framework.TestCase;
import org.springframework.batch.io.file.SimpleFlatFileItemReader;
import org.springframework.batch.io.file.DefaultFlatFileItemReader;
import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetMapper;
import org.springframework.batch.item.reader.DelegatingItemReader;
@@ -51,7 +51,7 @@ public abstract class AbstractTradeBatchTests extends TestCase {
protected TradeItemReader(Resource resource) throws Exception {
super();
SimpleFlatFileItemReader inputSource = new SimpleFlatFileItemReader();
DefaultFlatFileItemReader inputSource = new DefaultFlatFileItemReader();
inputSource.setResource(resource);
inputSource.setFieldSetMapper(new TradeMapper());
inputSource.afterPropertiesSet();

4
spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
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>

2
spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
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>

2
spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
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>

4
spring-batch-samples/src/main/resources/jobs/footballJob.xml
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"

2
spring-batch-samples/src/main/resources/jobs/multilineJob.xml
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>

2
spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml
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>

2
spring-batch-samples/src/main/resources/jobs/parallelJob.xml
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>

2
spring-batch-samples/src/main/resources/jobs/restartSample.xml
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>

2
spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
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>

2
spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
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" />

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
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);
}