OPEN - issue BATCH-404: FactoryBeans for step configuration
http://jira.springframework.org/browse/BATCH-404 Introduce DefaultStepFactory and reduce reliance on KitchenSink.
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<bean id="beanWrapperMapperJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<bean id="compositeProcessorJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<bean id="fixedLengthImportJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -15,11 +15,20 @@
|
||||
<!-- set restartable=false so that this job can be used by more than one test -->
|
||||
<property name="restartable" value="false" />
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep"
|
||||
class="org.springframework.batch.execution.step.support.KitchenSinkStepFactoryBean">
|
||||
<property name="itemReader" ref="hibernateItemReader" />
|
||||
<property name="itemWriter" ref="hibernateOutputSource" />
|
||||
<property name="commitInterval" value="3" />
|
||||
|
||||
<property name="exceptionHandler">
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler">
|
||||
<property name="limit" value="5" />
|
||||
<property name="useParent" value="true" />
|
||||
</bean>
|
||||
</property>
|
||||
|
||||
<property name="itemSkipPolicy">
|
||||
<bean
|
||||
class="org.springframework.batch.execution.step.support.AlwaysSkipItemSkipPolicy" />
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
<bean id="multilineJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileItemReader"/>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
<bean id="multilineOrderJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners">
|
||||
<list>
|
||||
<ref bean="orderWriter" />
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
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
|
||||
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
|
||||
|
||||
|
||||
<bean id="parallelJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="staging" parent="simpleStep">
|
||||
<property name="commitInterval" value="2" />
|
||||
<property name="startLimit" value="100" />
|
||||
<property name="listeners" ref="fileInputTemplate"/>
|
||||
<bean id="staging" parent="defaultStep">
|
||||
<property name="commitInterval" value="2" />
|
||||
<property name="startLimit" value="100" />
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
class="org.springframework.batch.item.reader.ValidatingItemReader">
|
||||
@@ -41,15 +41,10 @@
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
<bean id="loading" parent="simpleStep">
|
||||
<property name="stepOperations">
|
||||
<bean id="loading" parent="simpleStep" class="org.springframework.batch.execution.step.support.KitchenSinkStepFactoryBean">
|
||||
<property name="taskExecutor">
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate">
|
||||
<property name="taskExecutor">
|
||||
<bean
|
||||
class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
|
||||
</property>
|
||||
</bean>
|
||||
class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
|
||||
</property>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<bean id="restartSampleJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileItemReader"/>
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
@@ -28,11 +28,6 @@
|
||||
</bean>
|
||||
</property>
|
||||
<property name="commitInterval" value="2" />
|
||||
<property name="exceptionHandler">
|
||||
<bean class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler">
|
||||
<property name="limit" value="0"/>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
@@ -8,19 +8,26 @@
|
||||
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
|
||||
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
|
||||
|
||||
|
||||
<bean id="retrySample" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="itemReader" ref="itemGenerator" />
|
||||
<property name="itemWriter" ref="itemWriter" />
|
||||
<property name="retryPolicy">
|
||||
<bean id="step1" parent="simpleStep"
|
||||
class="org.springframework.batch.execution.step.support.KitchenSinkStepFactoryBean">
|
||||
<property name="itemReader" ref="itemGenerator" />
|
||||
<property name="itemWriter" ref="itemWriter" />
|
||||
<property name="retryPolicy">
|
||||
<bean
|
||||
class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
|
||||
<property name="maxAttempts" value="3" />
|
||||
<property name="retryableExceptionClasses" value="java.lang.Exception" />
|
||||
<property name="retryableExceptionClasses"
|
||||
value="java.lang.Exception" />
|
||||
</bean>
|
||||
</property>
|
||||
<property name="exceptionHandler">
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler"
|
||||
p:limit="5" />
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -30,7 +37,8 @@
|
||||
<property name="limit" value="10" />
|
||||
</bean>
|
||||
|
||||
<bean id="itemGenerator" parent="testGenerator" autowire-candidate="false"/>
|
||||
<bean id="itemGenerator" parent="testGenerator"
|
||||
autowire-candidate="false" />
|
||||
|
||||
<bean id="itemWriter"
|
||||
class="org.springframework.batch.sample.item.writer.RetrySampleItemWriter" />
|
||||
|
||||
@@ -7,21 +7,19 @@
|
||||
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">
|
||||
|
||||
|
||||
<import resource="tradeJobIo.xml" />
|
||||
<!--import resource="tradeJobAop.xml" /-->
|
||||
|
||||
<bean id="tradeJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<property name="retryPolicy">
|
||||
<bean
|
||||
class="org.springframework.batch.retry.policy.SimpleRetryPolicy" />
|
||||
</property>
|
||||
<bean id="step1" parent="simpleStep"
|
||||
class="org.springframework.batch.execution.step.support.KitchenSinkStepFactoryBean">
|
||||
<property name="exceptionHandler">
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler" p:limit="5"/>
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler"
|
||||
p:limit="5" />
|
||||
</property>
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<bean id="tradeJob" parent="simpleJob">
|
||||
<property name="steps">
|
||||
<list>
|
||||
<bean id="step1" parent="simpleStep">
|
||||
<bean id="step1" parent="defaultStep">
|
||||
<property name="listeners" ref="fileInputTemplate" />
|
||||
<property name="itemReader">
|
||||
<bean
|
||||
|
||||
@@ -67,9 +67,9 @@
|
||||
</bean>
|
||||
|
||||
<bean id="mapJobInstanceDao" lazy-init="true"
|
||||
class="org.springframework.batch.execution.repository.dao.MapJobInstanceDao" />
|
||||
|
||||
<bean id="mapJobExecutionDao" lazy-init="true"
|
||||
class="org.springframework.batch.execution.repository.dao.MapJobInstanceDao" />
|
||||
|
||||
<bean id="mapJobExecutionDao" lazy-init="true"
|
||||
class="org.springframework.batch.execution.repository.dao.MapJobExecutionDao" />
|
||||
|
||||
<bean id="mapStepExecutionDao" lazy-init="true"
|
||||
@@ -95,25 +95,18 @@
|
||||
</bean>
|
||||
|
||||
<bean id="simpleStep"
|
||||
class="org.springframework.batch.execution.step.support.KitchenSinkStepFactoryBean"
|
||||
class="org.springframework.batch.execution.step.support.SimpleStepFactoryBean"
|
||||
abstract="true">
|
||||
|
||||
<property name="transactionManager" ref="transactionManager" />
|
||||
<property name="jobRepository" ref="jobRepository" />
|
||||
<property name="startLimit" value="100"/>
|
||||
|
||||
<property name="exceptionHandler">
|
||||
<bean
|
||||
class="org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler">
|
||||
<property name="limit" value="5" />
|
||||
<property name="useParent" value="true" />
|
||||
</bean>
|
||||
</property>
|
||||
|
||||
<property name="startLimit" value="100" />
|
||||
<property name="commitInterval" value="1" />
|
||||
|
||||
</bean>
|
||||
|
||||
<bean id="defaultStep" parent="simpleStep"
|
||||
class="org.springframework.batch.execution.step.support.DefaultStepFactoryBean"
|
||||
abstract="true" />
|
||||
|
||||
<bean id="customEditorConfigurer"
|
||||
class="org.springframework.beans.factory.config.CustomEditorConfigurer">
|
||||
<property name="customEditors">
|
||||
@@ -161,7 +154,7 @@
|
||||
<aop:after
|
||||
pointcut="execution( * org.springframework.batch..Step+.execute(..))"
|
||||
method="after" />
|
||||
<aop:after-throwing throwing="t"
|
||||
<aop:after-throwing throwing="t"
|
||||
pointcut="execution( * org.springframework.batch..Step+.execute(..))"
|
||||
method="onError" />
|
||||
</aop:aspect>
|
||||
|
||||
Reference in New Issue
Block a user