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)
This commit is contained in:
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user