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

IN PROGRESS - BATCH-830: DelegatingItemReader should be removed

Browse Source 
replaced ValidatingItemReader with ValidatingItemProcessor
This commit is contained in:
robokaso
2008-09-25 13:56:34 +00:00
parent 55651077e4
commit 963e924bc6
15 changed files with 145 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,13 +11,12 @@
<property name="steps">
<list>
<bean id="step1" parent="simpleStep">
<property name="streams" ref="tradeFileItemReader" />
<property name="itemReader">
<bean class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader" ref="tradeFileItemReader" />
<property name="validator" ref="fixedValidator" />
<property name="itemReader" ref="tradeFileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
</property>
<property name="itemWriter">
<bean class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
<property name="dao" ref="tradeDao" />

12
spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
View File

@@ -18,14 +18,12 @@
<ref bean="fileItemWriter" />
</list>
</property>
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileItemReader" />
<property name="validator" ref="fixedValidator" />
<property name="itemReader" ref="fileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
</property>
<property name="itemWriter" ref="compositeWriter" />
</bean>
</property>

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

@@ -10,11 +10,10 @@
<bean id="fixedLengthImportJob" parent="simpleJob">
<property name="steps">
<bean id="step1" parent="simpleStep" p:commitInterval="3">
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader" ref="fileItemReader" />
<property name="validator" ref="fixedValidator" />
<property name="itemReader" ref="fileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
<property name="itemWriter">

11
spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml
View File

@@ -12,13 +12,10 @@
<bean id="multiResourceJob" parent="simpleJob">
<property name="steps">
<bean id="step1" parent="simpleStep" p:commitInterval="3">
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileItemReader" />
<property name="validator" ref="fixedValidator" />
<property name="itemReader" ref="fileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
<property name="itemWriter">

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

@@ -20,25 +20,29 @@
</list>
</property>
<property name="itemReader">
<bean class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader">
<bean class="org.springframework.batch.sample.domain.order.internal.OrderItemReader">
<property name="fieldSetReader" ref="fileItemReader" />
<property name="headerMapper" ref="headerFieldSetMapper" />
<property name="customerMapper" ref="customerFieldSetMapper" />
<property name="addressMapper" ref="addressFieldSetMapper" />
<property name="billingMapper" ref="billingFieldSetMapper" />
<property name="itemMapper" ref="orderItemFieldSetMapper" />
<property name="shippingMapper" ref="shippingFieldSetMapper" />
</bean>
</property>
<property name="validator" ref="validator" />
<bean class="org.springframework.batch.sample.domain.order.internal.OrderItemReader">
<property name="fieldSetReader" ref="fileItemReader" />
<property name="headerMapper" ref="headerFieldSetMapper" />
<property name="customerMapper" ref="customerFieldSetMapper" />
<property name="addressMapper" ref="addressFieldSetMapper" />
<property name="billingMapper" ref="billingFieldSetMapper" />
<property name="itemMapper" ref="orderItemFieldSetMapper" />
<property name="shippingMapper" ref="shippingFieldSetMapper" />
</bean>
</property>
<property name="itemWriter" ref="fileItemWriter" />
<property name="itemProcessor">
<bean class="org.springframework.batch.sample.domain.order.internal.OrderProcessor">
<property name="aggregators" ref="outputAggregators" />
<bean class="org.springframework.batch.item.support.CompositeItemProcessor">
<property name="itemProcessors">
<list>
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="validator" />
</bean>
<bean class="org.springframework.batch.sample.domain.order.internal.OrderProcessor">
<property name="aggregators" ref="outputAggregators" />
</bean>
</list>
</property>
</bean>
</property>
</bean>
@@ -134,7 +138,8 @@
</bean>
</property>
</bean>
<!-- "{" <key> : <rule> : <message> : [ <error_code> [ : <error_parameters> ] ] "}" -->
<!-- "{" <key> : <rule> : <message> : [ <error_code> [ : <error_parameters> ] ] "}"
-->
<bean id="fileInputLocator" class="org.springframework.core.io.ClassPathResource">
<constructor-arg type="java.lang.String"

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

@@ -15,16 +15,12 @@
<bean id="staging" parent="simpleStep">
<property name="commitInterval" value="2" />
<property name="startLimit" value="100" />
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileItemReader" />
<property name="validator"
ref="fixedValidator" />
<property name="itemReader" ref="fileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
</property>
<property name="itemWriter">
<bean
class="org.springframework.batch.sample.common.StagingItemWriter">

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

@@ -13,13 +13,12 @@
<property name="steps">
<bean id="step1" parent="simpleStep">
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader" ref="itemReader" />
<property name="validator" ref="fixedValidator" />
</bean>
</property>
<property name="itemReader" ref="itemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="fixedValidator" />
</bean>
</property>
<property name="itemWriter">
<bean
class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">

11
spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
View File

@@ -15,16 +15,7 @@
<list>
<bean id="step1" parent="skipLimitStep">
<property name="skipLimit" value="1" />
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileItemReader" />
<property name="validator"
ref="tradeValidator" />
</bean>
</property>
<property name="itemReader" ref="fileItemReader" />
<property name="itemWriter">
<bean
class="org.springframework.batch.sample.domain.trade.internal.TradeWriter"

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

@@ -16,13 +16,10 @@
<bean id="step1" parent="simpleStep">
<property name="transactionAttribute" value="PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED"/>
<property name="streams" ref="fileItemReader" />
<property name="itemReader">
<bean
class="org.springframework.batch.item.validator.ValidatingItemReader">
<property name="itemReader"
ref="fileItemReader" />
<property name="validator"
ref="tradeValidator" />
<property name="itemReader" ref="fileItemReader" />
<property name="itemProcessor">
<bean class="org.springframework.batch.item.validator.ValidatingItemProcessor">
<constructor-arg ref="tradeValidator" />
</bean>
</property>
<property name="itemWriter">