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

IN PROGRESS - issue BATCH-212: Merge InputSource with ItemProvider

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/BATCH-212

Rename class and method names (Provider -> Reader)
This commit is contained in:
dsyer
2007-12-17 14:12:24 +00:00
parent 67a7a2de5b
commit fe54a6f38d
26 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemOrientedTasklet.java
View File

@@ -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;
}

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java
View File

@@ -104,7 +104,7 @@ public class SimpleJobTests extends TestCase {
return true;
}
});
module.setItemProvider(provider);
module.setItemReader(provider);
module.setItemProcessor(processor);
module.afterPropertiesSet();
return module;

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java
View File

@@ -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;
}

18
spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemOrientedTaskletTests.java
View File

@@ -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) {

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTaskletTests.java
View File

@@ -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

2
spring-batch-execution/src/test/resources/job-configuration.xml
View File

@@ -17,7 +17,7 @@
<constructor-arg>
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ListItemReader">
<constructor-arg value="foo,bar,spam"/>

2
spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml
View File

@@ -19,7 +19,7 @@
<constructor-arg>
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ListItemReader">
<constructor-arg value="foo,bar,spam"/>

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java
View File

@@ -127,7 +127,7 @@ public class ItemReaderRetryCallback implements RetryCallback {
*
* @return the {@link ItemReader} instance.
*/
public ItemReader getProvider() {
public ItemReader getReader() {
return provider;
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java
View File

@@ -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();
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java
View File

@@ -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 {

4
spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
View File

@@ -17,7 +17,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader" ref="fileInputTemplate" />
@@ -36,7 +36,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader" ref="fileInputTemplate2" />

2
spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
View File

@@ -16,7 +16,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader" ref="fileInputTemplate" />

2
spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
View File

@@ -23,7 +23,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean class="org.springframework.batch.item.provider.ItemReaderAdapter">
<property name="targetObject" ref="delegatingObject" />
<property name="targetMethod" value="getData" />

2
spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
View File

@@ -16,7 +16,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader" ref="fileInputTemplate" />

6
spring-batch-samples/src/main/resources/jobs/footballJob.xml
View File

@@ -27,7 +27,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"
@@ -57,7 +57,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"
@@ -87,7 +87,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"

2
spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
View File

@@ -21,7 +21,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"

2
spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
View File

@@ -20,7 +20,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader" ref="ibatisItemReader" />
</bean>

2
spring-batch-samples/src/main/resources/jobs/multilineJob.xml
View File

@@ -16,7 +16,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.AggregateItemReader">
<property name="itemReader"

2
spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
View File

@@ -19,7 +19,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean class="org.springframework.batch.sample.item.provider.OrderItemReader">
<property name="itemReader" ref="fileInputTemplate" />
<property name="headerMapper" ref="headerFieldSetMapper" />

8
spring-batch-samples/src/main/resources/jobs/parallelJob.xml
View File

@@ -22,7 +22,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"
@@ -57,7 +57,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.sample.item.provider.StagingItemReader"
scope="step">
@@ -110,7 +110,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"
@@ -140,7 +140,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"

2
spring-batch-samples/src/main/resources/jobs/restartSample.xml
View File

@@ -16,7 +16,7 @@
<bean id="step1" parent="simpleStep">
<property name="tasklet">
<bean class="org.springframework.batch.sample.tasklet.ExceptionRestartableTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader" ref="fileItemReader" />

4
spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
View File

@@ -44,7 +44,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader"
@@ -65,7 +65,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader"
p:item-reader-ref="tradeSqlItemReader" />

6
spring-batch-samples/src/main/resources/jobs/tradeJob.xml
View File

@@ -20,7 +20,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.ValidatingItemReader">
<property name="itemReader"
@@ -41,7 +41,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader"
@@ -60,7 +60,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean
class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader" ref="customerSqlItemReader" />

2
spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
View File

@@ -18,7 +18,7 @@
<property name="tasklet">
<bean
class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
<property name="itemProvider">
<property name="itemReader">
<bean class="org.springframework.batch.item.provider.DelegatingItemReader">
<property name="itemReader">
<bean class="org.springframework.batch.io.file.support.StaxEventReaderItemReader" scope="step">

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/StagingItemReaderTests.java
View File

@@ -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();

2
spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java
View File

@@ -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");