diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
similarity index 98%
rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
index c8c1e0a60..5b530418e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/DefaultFlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
@@ -51,9 +51,9 @@ import org.springframework.util.Assert;
* @author Robert Kasanicky
* @author Dave Syer
*/
-public class DefaultFlatFileItemReader implements ItemReader, Skippable, ItemStream, InitializingBean {
+public class FlatFileItemReader implements ItemReader, Skippable, ItemStream, InitializingBean {
- private static Log log = LogFactory.getLog(DefaultFlatFileItemReader.class);
+ private static Log log = LogFactory.getLog(FlatFileItemReader.class);
public static final String READ_STATISTICS_NAME = "lines.read.count";
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/BasicFlatFileItemReaderTests.java
similarity index 89%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/BasicFlatFileItemReaderTests.java
index 7426e1f4a..fb4f27b6f 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/SimpleFlatFileItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/BasicFlatFileItemReaderTests.java
@@ -34,15 +34,15 @@ import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
/**
- * Tests for {@link SimpleFlatFileItemReaderTests}
+ * Tests for {@link FlatFileItemReader} - the fundamental item reading functionality.
*
+ * @see FlatFileItemReaderTests
* @author Dave Syer
- *
*/
-public class SimpleFlatFileItemReaderTests extends TestCase {
+public class BasicFlatFileItemReaderTests extends TestCase {
// object under test
- private DefaultFlatFileItemReader itemReader = new DefaultFlatFileItemReader();
+ private FlatFileItemReader itemReader = new FlatFileItemReader();
// common value used for writing to a file
private String TEST_STRING = "FlatFileInputTemplate-TestData";
@@ -136,14 +136,14 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testReadBeforeOpen() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
assertEquals("[FlatFileInputTemplate-TestData]", itemReader.read().toString());
}
public void testCloseBeforeOpen() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
itemReader.close();
@@ -152,7 +152,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testInitializationWithNullResource() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
try {
itemReader.afterPropertiesSet();
fail("Expected IllegalArgumentException");
@@ -168,7 +168,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetValidEncoding() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setEncoding("UTF-8");
itemReader.setResource(getInputResource(TEST_STRING));
itemReader.setFieldSetMapper(fieldSetMapper);
@@ -176,7 +176,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetNullEncoding() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setEncoding(null);
itemReader.setResource(getInputResource(TEST_STRING));
try {
@@ -189,7 +189,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
}
public void testSetInvalidEncoding() throws Exception {
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setEncoding("foo");
itemReader.setResource(getInputResource(TEST_STRING));
try {
@@ -224,7 +224,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
public void testColumnNamesInHeader() throws Exception {
final String INPUT = "name1|name2\nvalue1|value2\nvalue3|value4";
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setResource(getInputResource(INPUT));
itemReader.setLineTokenizer(new DelimitedLineTokenizer('|'));
itemReader.setFieldSetMapper(fieldSetMapper);
@@ -247,7 +247,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
public void testLinesToSkip() throws Exception {
final String INPUT = "foo bar spam\none two\nthree four";
- itemReader = new DefaultFlatFileItemReader();
+ itemReader = new FlatFileItemReader();
itemReader.setResource(getInputResource(INPUT));
itemReader.setLineTokenizer(new DelimitedLineTokenizer(' '));
itemReader.setFieldSetMapper(fieldSetMapper);
@@ -268,7 +268,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
Resource resource = new NonExistentResource();
- DefaultFlatFileItemReader testReader = new DefaultFlatFileItemReader();
+ FlatFileItemReader testReader = new FlatFileItemReader();
testReader.setResource(resource);
testReader.setLineTokenizer(tokenizer);
testReader.setFieldSetMapper(fieldSetMapper);
@@ -290,7 +290,7 @@ public class SimpleFlatFileItemReaderTests extends TestCase {
Resource resource = new NonExistentResource();
- DefaultFlatFileItemReader testReader = new DefaultFlatFileItemReader();
+ FlatFileItemReader testReader = new FlatFileItemReader();
testReader.setResource(resource);
testReader.setLineTokenizer(tokenizer);
testReader.setFieldSetMapper(fieldSetMapper);
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderTests.java
similarity index 59%
rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderTests.java
index 8430234de..b3cc91fa5 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/DefaultFlatFileItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderTests.java
@@ -30,13 +30,14 @@ import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
/**
- * Tests for {@link DefaultFlatFileItemReader}
+ * Tests for {@link FlatFileItemReader} - skip and restart functionality.
*
+ * @see FlatFileItemReaderBasicTests
*/
-public class DefaultFlatFileItemReaderTests extends TestCase {
+public class FlatFileItemReaderTests extends TestCase {
// object under test
- private DefaultFlatFileItemReader inputSource = new DefaultFlatFileItemReader();
+ private FlatFileItemReader reader = new FlatFileItemReader();
// common value used for writing to a file
private String TEST_STRING = "FlatFileInputTemplate-TestData";
@@ -60,19 +61,19 @@ public class DefaultFlatFileItemReaderTests extends TestCase {
*/
protected void setUp() throws Exception {
- inputSource.setResource(getInputResource(TEST_STRING));
- inputSource.setLineTokenizer(tokenizer);
- inputSource.setFieldSetMapper(fieldSetMapper);
+ reader.setResource(getInputResource(TEST_STRING));
+ reader.setLineTokenizer(tokenizer);
+ reader.setFieldSetMapper(fieldSetMapper);
// context argument is necessary only for the FileLocator, which
// is mocked
- inputSource.open();
+ reader.open();
}
/**
* Release resources and delete the temporary file
*/
protected void tearDown() throws Exception {
- inputSource.close();
+ reader.close();
}
private Resource getInputResource(String input) {
@@ -85,25 +86,25 @@ public class DefaultFlatFileItemReaderTests extends TestCase {
*/
public void testSkip() throws Exception {
- inputSource.close();
- inputSource.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
- inputSource.open();
+ reader.close();
+ reader.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
+ reader.open();
// read some records
- inputSource.read(); // #1
- inputSource.read(); // #2
+ reader.read(); // #1
+ reader.read(); // #2
// commit them
- inputSource.mark();
+ reader.mark();
// read next record
- inputSource.read(); // # 3
+ reader.read(); // # 3
// mark record as skipped
- inputSource.skip();
+ reader.skip();
// read next records
- inputSource.reset();
+ reader.reset();
// we should now process all records after first commit point, that are
// not marked as skipped
- assertEquals("[testLine4]", inputSource.read().toString());
+ assertEquals("[testLine4]", reader.read().toString());
// TODO update
// Map statistics = template.getStatistics();
@@ -120,79 +121,79 @@ public class DefaultFlatFileItemReaderTests extends TestCase {
*/
public void testSkipFirstChunk() throws Exception {
- inputSource.close();
- inputSource.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
- inputSource.open();
+ reader.close();
+ reader.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
+ reader.open();
// read some records
- inputSource.read(); // #1
- inputSource.read(); // #2
- inputSource.read(); // #3
+ reader.read(); // #1
+ reader.read(); // #2
+ reader.read(); // #3
// mark record as skipped
- inputSource.skip();
+ reader.skip();
// rollback
- inputSource.reset();
+ reader.reset();
// read next record
- inputSource.read(); // should be #1
+ reader.read(); // should be #1
// we should now process all records after first commit point, that are
// not marked as skipped
- assertEquals("[testLine2]", inputSource.read().toString());
+ assertEquals("[testLine2]", reader.read().toString());
}
public void testRestartFromNullData() throws Exception {
- inputSource.restoreFrom(null);
- assertEquals("[FlatFileInputTemplate-TestData]", inputSource.read().toString());
+ reader.restoreFrom(null);
+ assertEquals("[FlatFileInputTemplate-TestData]", reader.read().toString());
}
public void testRestartBeforeOpen() throws Exception {
- inputSource = new DefaultFlatFileItemReader();
- inputSource.setResource(getInputResource(TEST_STRING));
- inputSource.setFieldSetMapper(fieldSetMapper);
+ reader = new FlatFileItemReader();
+ reader.setResource(getInputResource(TEST_STRING));
+ reader.setFieldSetMapper(fieldSetMapper);
// do not open the template...
try {
- inputSource.restoreFrom(inputSource.getExecutionAttributes());
+ reader.restoreFrom(reader.getExecutionAttributes());
} catch (StreamException e) {
assertTrue("Message does not contain open: "+e.getMessage(), e.getMessage().contains("open"));
}
- assertEquals("[FlatFileInputTemplate-TestData]", inputSource.read().toString());
+ assertEquals("[FlatFileInputTemplate-TestData]", reader.read().toString());
}
public void testRestart() throws Exception {
- inputSource.close();
- inputSource.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
- inputSource.open();
+ reader.close();
+ reader.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
+ reader.open();
// read some records
- inputSource.read();
- inputSource.read();
+ reader.read();
+ reader.read();
// commit them
- inputSource.mark();
+ reader.mark();
// read next two records
- inputSource.read();
- inputSource.read();
+ reader.read();
+ reader.read();
// get restart data
- ExecutionAttributes streamContext = inputSource.getExecutionAttributes();
+ ExecutionAttributes streamContext = reader.getExecutionAttributes();
assertEquals("4", (String) streamContext.getProperties().getProperty(
- DefaultFlatFileItemReader.READ_STATISTICS_NAME));
+ FlatFileItemReader.READ_STATISTICS_NAME));
// close input
- inputSource.close();
+ reader.close();
- inputSource.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
+ reader.setResource(getInputResource("testLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6"));
// init for restart
- inputSource.open();
- inputSource.restoreFrom(streamContext);
+ reader.open();
+ reader.restoreFrom(streamContext);
// read remaining records
- assertEquals("[testLine5]", inputSource.read().toString());
- assertEquals("[testLine6]", inputSource.read().toString());
+ assertEquals("[testLine5]", reader.read().toString());
+ assertEquals("[testLine6]", reader.read().toString());
- ExecutionAttributes statistics = inputSource.getExecutionAttributes();
- assertEquals(6, statistics.getLong(DefaultFlatFileItemReader.READ_STATISTICS_NAME));
+ ExecutionAttributes statistics = reader.getExecutionAttributes();
+ assertEquals(6, statistics.getLong(FlatFileItemReader.READ_STATISTICS_NAME));
}
}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
index be01f6e47..b4ba31075 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java
@@ -18,7 +18,7 @@ package org.springframework.batch.repeat.support;
import junit.framework.TestCase;
-import org.springframework.batch.io.file.DefaultFlatFileItemReader;
+import org.springframework.batch.io.file.FlatFileItemReader;
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();
- DefaultFlatFileItemReader inputSource = new DefaultFlatFileItemReader();
+ FlatFileItemReader inputSource = new FlatFileItemReader();
inputSource.setResource(resource);
inputSource.setFieldSetMapper(new TradeMapper());
inputSource.afterPropertiesSet();
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index ed6541f5c..8f00d9cff 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -48,7 +48,7 @@
@@ -57,7 +57,7 @@
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index e5c6b5bad..f468ced21 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -41,7 +41,7 @@
-
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index b38c09e21..b8ffeea32 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -37,7 +37,7 @@
+ class="org.springframework.batch.io.file.FlatFileItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 3a80201cd..51f3d260c 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -66,7 +66,7 @@
-
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index 3bca7f38c..43673e03d 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -92,7 +92,7 @@
+ class="org.springframework.batch.io.file.FlatFileItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index d16ed27f4..3112144ba 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -43,7 +43,7 @@
diff --git a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
index 70d44bbbb..ee68d384e 100644
--- a/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
index 8ca7270e2..0d3655c6d 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml
@@ -36,7 +36,7 @@
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
index 327625eb9..94b9a8614 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
@@ -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);
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
index 47e952ee0..b148bc467 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java
@@ -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;