From 9ec2a67a977fc1618a1a5c2e5aa34b8c85896da1 Mon Sep 17 00:00:00 2001 From: trisberg Date: Tue, 7 Oct 2008 17:58:48 +0000 Subject: [PATCH] BATCH-863: renamed ResourceLineReader to FlatFileItemReader --- ...ineReader.java => FlatFileItemReader.java} | 8 ++--- ...ava => FlatFileItemReaderCommonTests.java} | 8 ++--- ...ests.java => FlatFileItemReaderTests.java} | 32 +++++++++---------- .../MultiResourceItemReaderFlatFileTests.java | 2 +- ...ltiResourceItemReaderIntegrationTests.java | 2 +- .../support/AbstractTradeBatchTests.java | 4 +-- .../sample/support/HeaderCopyCallback.java | 4 +-- .../jobs/beanWrapperMapperSampleJob.xml | 22 ++++++------- .../jobs/compositeItemWriterSampleJob.xml | 2 +- .../main/resources/jobs/customerFilterJob.xml | 16 +++++----- .../resources/jobs/fixedLengthImportJob.xml | 2 +- .../src/main/resources/jobs/footballJob.xml | 4 +-- .../resources/jobs/headerFooterSample.xml | 2 +- .../main/resources/jobs/multiResourceJob.xml | 2 +- .../src/main/resources/jobs/multilineJob.xml | 18 +++++------ .../main/resources/jobs/multilineOrderIo.xml | 24 +++++++------- .../src/main/resources/jobs/parallelJob.xml | 2 +- .../src/main/resources/jobs/restartSample.xml | 2 +- .../src/main/resources/jobs/tradeJobIo.xml | 20 ++++++------ .../FixedLengthImportJobFunctionalTests.java | 6 ++-- 20 files changed, 91 insertions(+), 91 deletions(-) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/{ResourceLineReader.java => FlatFileItemReader.java} (92%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/{ResourceLineReaderCommonTests.java => FlatFileItemReaderCommonTests.java} (81%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/{ResourceLineReaderTests.java => FlatFileItemReaderTests.java} (90%) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourceLineReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java similarity index 92% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourceLineReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java index 58dfd9f3e..7fc4e5ccb 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourceLineReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java @@ -27,10 +27,10 @@ import org.springframework.util.ClassUtils; * * @author Robert Kasanicky */ -public class ResourceLineReader extends AbstractItemCountingItemStreamItemReader implements +public class FlatFileItemReader extends AbstractItemCountingItemStreamItemReader implements ResourceAwareItemReaderItemStream, InitializingBean { - private static final Log logger = LogFactory.getLog(ResourceLineReader.class); + private static final Log logger = LogFactory.getLog(FlatFileItemReader.class); // default encoding for input files public static final String DEFAULT_CHARSET = Charset.defaultCharset().name(); @@ -55,8 +55,8 @@ public class ResourceLineReader extends AbstractItemCountingItemStreamItemRea private LineCallbackHandler skippedLinesCallback; - public ResourceLineReader() { - setName(ClassUtils.getShortName(ResourceLineReader.class)); + public FlatFileItemReader() { + setName(ClassUtils.getShortName(FlatFileItemReader.class)); } /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java similarity index 81% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderCommonTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java index cee877aaf..3c62151ac 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java @@ -9,15 +9,15 @@ import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; /** - * Tests for {@link ResourceLineReader}. + * Tests for {@link FlatFileItemReader}. */ -public class ResourceLineReaderCommonTests extends CommonItemStreamItemReaderTests{ +public class FlatFileItemReaderCommonTests extends CommonItemStreamItemReaderTests{ private static final String FOOS = "1 \n 2 \n 3 \n 4 \n 5 \n"; @Override protected ItemReader getItemReader() throws Exception { - ResourceLineReader tested = new ResourceLineReader(); + FlatFileItemReader tested = new FlatFileItemReader(); Resource resource = new ByteArrayResource(FOOS.getBytes()); tested.setResource(resource); tested.setLineMapper(new LineMapper() { @@ -35,7 +35,7 @@ public class ResourceLineReaderCommonTests extends CommonItemStreamItemReaderTes @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { - ResourceLineReader reader = (ResourceLineReader) tested; + FlatFileItemReader reader = (FlatFileItemReader) tested; reader.close(new ExecutionContext()); reader.setResource(new ByteArrayResource("".getBytes())); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java similarity index 90% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java index 6fef8d2e1..6d7e24079 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/ResourceLineReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java @@ -16,14 +16,14 @@ import org.springframework.core.io.Resource; import org.springframework.util.ClassUtils; /** - * Tests for {@link ResourceLineReader}. + * Tests for {@link FlatFileItemReader}. */ -public class ResourceLineReaderTests { +public class FlatFileItemReaderTests { - // common value used for writing to a file + // common value used for writing to a file private String TEST_STRING = "FlatFileInputTemplate-TestData"; - private ResourceLineReader reader = new ResourceLineReader(); + private FlatFileItemReader reader = new FlatFileItemReader(); private ExecutionContext executionContext = new ExecutionContext(); @@ -38,7 +38,7 @@ public class ResourceLineReaderTests { public void testRestartWithCustomRecordSeparatorPolicy() throws Exception { reader.setRecordSeparatorPolicy(new RecordSeparatorPolicy() { - // 1 record = 2 lines + // 1 record = 2 lines boolean pair = true; public boolean isEndOfRecord(String line) { @@ -75,31 +75,31 @@ public class ResourceLineReaderTests { reader.setLinesToSkip(2); reader.open(executionContext); - // read some records + // read some records reader.read(); reader.read(); - // get restart data + // get restart data reader.update(executionContext); - // read next two records + // read next two records reader.read(); reader.read(); - assertEquals(2, executionContext.getLong(ClassUtils.getShortName(ResourceLineReader.class) + ".read.count")); - // close input + assertEquals(2, executionContext.getLong(ClassUtils.getShortName(FlatFileItemReader.class) + ".read.count")); + // close input reader.close(executionContext); reader .setResource(getInputResource("header\nignoreme\ntestLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6")); - // init for restart + // init for restart reader.open(executionContext); - // read remaining records + // read remaining records assertEquals("testLine3", reader.read().toString()); assertEquals("testLine4", reader.read().toString()); reader.update(executionContext); - assertEquals(4, executionContext.getLong(ClassUtils.getShortName(ResourceLineReader.class) + ".read.count")); + assertEquals(4, executionContext.getLong(ClassUtils.getShortName(FlatFileItemReader.class) + ".read.count")); } @Test @@ -110,7 +110,7 @@ public class ResourceLineReaderTests { reader.setResource(resource); // afterPropertiesSet should only throw an exception if the Resource is - // null + // null reader.afterPropertiesSet(); reader.open(executionContext); @@ -126,10 +126,10 @@ public class ResourceLineReaderTests { reader.setResource(resource); // afterPropertiesSet should only throw an exception if the Resource is - // null + // null reader.afterPropertiesSet(); - // replace the resource to simulate runtime resource creation + // replace the resource to simulate runtime resource creation reader.setResource(getInputResource(TEST_STRING)); reader.open(executionContext); assertEquals(TEST_STRING, reader.read()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java index 227a05a8f..9d1aeb631 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java @@ -19,7 +19,7 @@ public class MultiResourceItemReaderFlatFileTests extends protected ItemReader getItemReader() throws Exception { MultiResourceItemReader multiReader = new MultiResourceItemReader(); - ResourceLineReader fileReader = new ResourceLineReader(); + FlatFileItemReader fileReader = new FlatFileItemReader(); fileReader.setLineMapper(new LineMapper() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java index 06826ba31..c7ff93b94 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java @@ -16,7 +16,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { private MultiResourceItemReader tested = new MultiResourceItemReader(); - private ResourceLineReader itemReader = new ResourceLineReader(); + private FlatFileItemReader itemReader = new FlatFileItemReader(); private ExecutionContext ctx = new ExecutionContext(); 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 a313aae9e..be298372b 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 @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemWriter; -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.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; @@ -52,7 +52,7 @@ public abstract class AbstractTradeBatchTests extends TestCase { provider.open(new ExecutionContext()); } - protected static class TradeItemReader extends ResourceLineReader { + protected static class TradeItemReader extends FlatFileItemReader { protected TradeItemReader(Resource resource) throws Exception { super(); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java index ec0f4c4d9..266e77b16 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/HeaderCopyCallback.java @@ -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. */ diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index caab7f61c..b42437e02 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -83,15 +83,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml index 680d90d7c..b13ebd412 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml @@ -45,7 +45,7 @@ + class="org.springframework.batch.item.file.FlatFileItemReader"> diff --git a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml index 3d29adda1..08a85d052 100644 --- a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml @@ -1,9 +1,9 @@ - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -67,5 +67,5 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml index 321ed9328..dafc08e28 100644 --- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml @@ -28,7 +28,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index 146111860..d665d7894 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -59,7 +59,7 @@ + class="org.springframework.batch.item.file.FlatFileItemReader"> @@ -80,7 +80,7 @@ + class="org.springframework.batch.item.file.FlatFileItemReader"> diff --git a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml index c4e5acef7..2caf4b51b 100644 --- a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml @@ -28,7 +28,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml index 4233ea0ad..f769394c0 100644 --- a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml @@ -42,7 +42,7 @@ autowire-candidate="false" /> + class="org.springframework.batch.item.file.FlatFileItemReader"> diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml index 0141ddf4f..c86aea556 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml @@ -2,16 +2,16 @@ + 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"> - - + + - - + + + class="org.springframework.batch.item.file.FlatFileItemReader"> diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml index 4c9f1a9e2..1e4240fac 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml @@ -1,20 +1,20 @@ - - + - - - - - - - - - + + + + + + + + + diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index 25e43fb85..b5dcb7422 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -66,7 +66,7 @@ + class="org.springframework.batch.item.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 e1a64395b..96e92ccc8 100644 --- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml @@ -38,7 +38,7 @@ + class="org.springframework.batch.item.file.FlatFileItemReader"> diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml index 962be6b84..4e2018180 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml @@ -9,15 +9,15 @@ http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - - - - - - - - + + + + + + + + @@ -38,7 +38,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 7140fcddf..3e91a0682 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 @@ -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 inputSource; + private FlatFileItemReader 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(); + inputSource = new FlatFileItemReader(); FieldSetMapper mapper = new TradeFieldSetMapper(); DefaultLineMapper lineMapper = new DefaultLineMapper();