From fe54a6f38d2dca721bf0318a74bdaac6accdec1f Mon Sep 17 00:00:00 2001 From: dsyer Date: Mon, 17 Dec 2007 14:12:24 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-212: Merge InputSource with ItemProvider http://opensource.atlassian.com/projects/spring/browse/BATCH-212 Rename class and method names (Provider -> Reader) --- .../execution/tasklet/ItemOrientedTasklet.java | 2 +- .../batch/execution/launch/SimpleJobTests.java | 2 +- .../step/simple/DefaultStepExecutorTests.java | 4 ++-- .../tasklet/ItemOrientedTaskletTests.java | 18 +++++++++--------- .../RestartableItemOrientedTaskletTests.java | 6 +++--- .../src/test/resources/job-configuration.xml | 2 +- .../execution/configuration/test-context.xml | 2 +- .../callback/ItemReaderRetryCallback.java | 2 +- .../retry/policy/ItemReaderRetryPolicy.java | 2 +- .../callback/ItemReaderRetryCallbackTests.java | 2 +- .../jobs/beanWrapperMapperSampleJob.xml | 4 ++-- .../jobs/compositeProcessorSampleJob.xml | 2 +- .../src/main/resources/jobs/delegatingJob.xml | 2 +- .../resources/jobs/fixedLengthImportJob.xml | 2 +- .../src/main/resources/jobs/footballJob.xml | 6 +++--- .../src/main/resources/jobs/hibernateJob.xml | 2 +- .../src/main/resources/jobs/ibatisJob.xml | 2 +- .../src/main/resources/jobs/multilineJob.xml | 2 +- .../main/resources/jobs/multilineOrderJob.xml | 2 +- .../src/main/resources/jobs/parallelJob.xml | 8 ++++---- .../src/main/resources/jobs/restartSample.xml | 2 +- .../src/main/resources/jobs/rollbackJob.xml | 4 ++-- .../src/main/resources/jobs/tradeJob.xml | 6 +++--- .../src/main/resources/jobs/xmlStaxJob.xml | 2 +- .../item/provider/StagingItemReaderTests.java | 4 ++-- .../ExceptionRestartableTaskletTests.java | 2 +- 26 files changed, 47 insertions(+), 47 deletions(-) diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java index a9c4099dd..a9b3738bb 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java @@ -168,7 +168,7 @@ public class ItemOrientedTasklet implements Tasklet, Skippable, /** * @param itemProvider */ - public void setItemProvider(ItemReader itemProvider) { + public void setItemReader(ItemReader itemProvider) { this.itemProvider = itemProvider; } diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java index 164ff67d1..bed5b911f 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java @@ -104,7 +104,7 @@ public class SimpleJobTests extends TestCase { return true; } }); - module.setItemProvider(provider); + module.setItemReader(provider); module.setItemProcessor(processor); module.afterPropertiesSet(); return module; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java index a65ab3f80..daea2d50c 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java @@ -66,7 +66,7 @@ public class DefaultStepExecutorTests extends TestCase { private RepeatTemplate template; - private ItemReader getProvider(String[] args) { + private ItemReader getReader(String[] args) { return new ListItemReader(Arrays.asList(args)); } @@ -78,7 +78,7 @@ public class DefaultStepExecutorTests extends TestCase { private Tasklet getTasklet(String[] strings) throws Exception { ItemOrientedTasklet module = new ItemOrientedTasklet(); module.setItemProcessor(processor); - module.setItemProvider(getProvider(strings)); + module.setItemReader(getReader(strings)); module.afterPropertiesSet(); return module; } diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java index f973a9a41..18ba4ab4c 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java @@ -73,7 +73,7 @@ public class ItemOrientedTaskletTests extends TestCase { module = new ItemOrientedTasklet(); // set up module - module.setItemProvider(itemProvider); + module.setItemReader(itemProvider); module.setItemProcessor(itemProcessor); module.afterPropertiesSet(); @@ -145,14 +145,14 @@ public class ItemOrientedTaskletTests extends TestCase { } public void testSkippableReader() throws Exception { - module.setItemProvider(new SkippableItemReader()); + module.setItemReader(new SkippableItemReader()); module.setItemRecoverer(null); module.skip(); assertEquals(1, list.size()); } public void testSkippablReaderProcessor() throws Exception { - module.setItemProvider(new SkippableItemReader()); + module.setItemReader(new SkippableItemReader()); module.setItemProcessor(new SkippableItemProcessor()); module.setItemRecoverer(null); module.skip(); @@ -160,7 +160,7 @@ public class ItemOrientedTaskletTests extends TestCase { } public void testStatisticsProvider() throws Exception { - module.setItemProvider(new SkippableItemReader()); + module.setItemReader(new SkippableItemReader()); Properties stats = module.getStatistics(); assertEquals(1, stats.size()); assertEquals("bar", stats.getProperty("foo")); @@ -174,7 +174,7 @@ public class ItemOrientedTaskletTests extends TestCase { } public void testStatisticsProviderProcessor() throws Exception { - module.setItemProvider(new SkippableItemReader()); + module.setItemReader(new SkippableItemReader()); module.setItemProcessor(new SkippableItemProcessor()); Properties stats = module.getStatistics(); assertEquals(2, stats.size()); @@ -184,7 +184,7 @@ public class ItemOrientedTaskletTests extends TestCase { public void testStatisticsProviderProcessorMergeDuplicates() throws Exception { - module.setItemProvider(new SkippableItemReader()); + module.setItemReader(new SkippableItemReader()); module.setItemProcessor(new SkippableItemProcessor( "foo=bar\nspam=bucket")); Properties stats = module.getStatistics(); @@ -207,7 +207,7 @@ public class ItemOrientedTaskletTests extends TestCase { } }); - module.setItemProvider(new AbstractItemReader() { + module.setItemReader(new AbstractItemReader() { public Object read() throws Exception { return "bar"; } @@ -245,7 +245,7 @@ public class ItemOrientedTaskletTests extends TestCase { return true; } }); - module.setItemProvider(new AbstractItemReader() { + module.setItemReader(new AbstractItemReader() { public Object read() throws Exception { return "foo"; } @@ -278,7 +278,7 @@ public class ItemOrientedTaskletTests extends TestCase { } public void testInitialisationWithNullProvider() throws Exception { - module.setItemProvider(null); + module.setItemReader(null); try { module.afterPropertiesSet(); } catch (IllegalArgumentException e) { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java index f6dcca269..630cfd0d4 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java @@ -102,7 +102,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase { // create and set up module module = new RestartableItemOrientedTasklet(); - module.setItemProvider(itemProvider); + module.setItemReader(itemProvider); module.setItemProcessor(itemProcessor); // get restart data @@ -120,7 +120,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase { // create and set up module module = new RestartableItemOrientedTasklet(); - module.setItemProvider(itemProvider); + module.setItemReader(itemProvider); module.setItemProcessor(itemProcessor); // get restart data @@ -135,7 +135,7 @@ public class RestartableItemOrientedTaskletTests extends TestCase { // create and set up module module = new RestartableItemOrientedTasklet(); - module.setItemProvider(null); + module.setItemReader(null); module.setItemProcessor(null); // get restart data diff --git a/spring-batch-execution/src/test/resources/job-configuration.xml b/spring-batch-execution/src/test/resources/job-configuration.xml index 5b9db1294..d2f17ff35 100644 --- a/spring-batch-execution/src/test/resources/job-configuration.xml +++ b/spring-batch-execution/src/test/resources/job-configuration.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml index c9a3fef7f..7b0b16bef 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml @@ -19,7 +19,7 @@ - + diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java index 0d7001592..5cbd20ced 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java @@ -127,7 +127,7 @@ public class ItemReaderRetryCallback implements RetryCallback { * * @return the {@link ItemReader} instance. */ - public ItemReader getProvider() { + public ItemReader getReader() { return provider; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java index 4a4d09329..ad3f8cb7c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java @@ -152,7 +152,7 @@ public class ItemReaderRetryPolicy extends AbstractStatefulRetryPolicy { public ItemProviderRetryContext(ItemReaderRetryCallback callback) { super(RetrySynchronizationManager.getContext()); item = callback.next(this); - this.provider = callback.getProvider(); + this.provider = callback.getReader(); this.recoverer = callback.getRecoverer(); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java index 23a1f2325..b121da78c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java @@ -157,7 +157,7 @@ public class ItemReaderRetryCallbackTests extends TestCase { } public void testGetKey() throws Exception { - assertEquals("key0", callback.getProvider().getKey("foo")); + assertEquals("key0", callback.getReader().getKey("foo")); } public void testRecoverWithoutSession() throws Exception { diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index 55f51621f..6e6a6a394 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -17,7 +17,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml index 333f5d837..80333c678 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml index 7631e768a..9add438f6 100644 --- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml @@ -23,7 +23,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml index 339342d35..e28698034 100644 --- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index ba4302609..52cd1760b 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -27,7 +27,7 @@ - + - + - + - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml index 4ed756a3a..c5cbebfbd 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml @@ -16,7 +16,7 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index a3accb12a..9a9060066 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -22,7 +22,7 @@ - + - + @@ -110,7 +110,7 @@ - + - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml index e4a407860..25166fb50 100644 --- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml @@ -44,7 +44,7 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml index 1b76e6d8a..2b85ae36c 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml @@ -20,7 +20,7 @@ - + - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml index 071fd14c0..c28dd8775 100644 --- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml @@ -18,7 +18,7 @@ - + diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java index 066c31c76..8081d4e25 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java @@ -56,7 +56,7 @@ public class StagingItemReaderTests extends getJdbcTemplate().update("DELETE FROM BATCH_STAGING"); } - public void testProviderUpdatesProcessIndicator() throws Exception { + public void testReaderUpdatesProcessIndicator() throws Exception { long id = getJdbcTemplate().queryForLong( "SELECT MIN(ID) from BATCH_STAGING where JOB_ID=?", @@ -77,7 +77,7 @@ public class StagingItemReaderTests extends } public void testUpdateProcessIndicatorAfterCommit() throws Exception { - testProviderUpdatesProcessIndicator(); + testReaderUpdatesProcessIndicator(); setComplete(); endTransaction(); startNewTransaction(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java index 9b99f8c25..5279dc52a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java @@ -38,7 +38,7 @@ public class ExceptionRestartableTaskletTests extends TestCase { module.setItemProcessor(itemProcessor); module.setThrowExceptionOnRecordNumber(ITER_COUNT + 1); - module.setItemProvider(new ListItemReader(new ArrayList() {{ + module.setItemReader(new ListItemReader(new ArrayList() {{ add("a"); add("b"); add("c");