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

OPEN - issue BATCH-404: FactoryBeans for step configuration

Browse Source 
http://jira.springframework.org/browse/BATCH-404

Replace allwaysSkip=true/false with a skipLimit.
This commit is contained in:
dsyer
2008-03-03 17:08:32 +00:00
parent 32214bf20a
commit 72017cf62b
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
View File

@@ -38,7 +38,7 @@ import org.springframework.core.task.TaskExecutor;
*/
public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
private boolean alwaysSkip = false;
private int skipLimit = 0;
private int commitInterval = 0;
@@ -49,7 +49,7 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
private ListenerMulticaster listener = new ListenerMulticaster();
private TaskExecutor taskExecutor;
private ItemProcessor itemProcessor;
/**
@@ -73,15 +73,16 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
}
/**
* Public setter for a flag that determines skip policy. If this flag is
* true then an exception in chunk processing will cause the item to be
* skipped and no exceptions propagated. If it is false then all exceptions
* will be propagated from the chunk and cause the step to abort.
* Public setter for a limit that determines skip policy. If this value is
* positive then an exception in chunk processing will cause the item to be
* skipped and no exception propagated until the limit is reached. If it is
* zero then all exceptions will be propagated from the chunk and cause the
* step to abort.
*
* @param alwaysSkip the value to set. Default is false.
* @param skipLimit the value to set. Default is 0 (never skip).
*/
public void setAlwaysSkip(boolean alwaysSkip) {
this.alwaysSkip = alwaysSkip;
public void setSkipLimit(int skipLimit) {
this.skipLimit = skipLimit;
}
/**
@@ -189,14 +190,14 @@ public class DefaultStepFactoryBean extends AbstractStepFactoryBean {
KitchenSinkItemProcessor itemProcessor = new KitchenSinkItemProcessor(itemReader, itemWriter);
if (alwaysSkip) {
// If we always skip (not the default) then we are prepared
// to
// absorb all exceptions at the step level because the
// failed items
// will never re-appear after a rollback.
itemProcessor.setItemSkipPolicy(new AlwaysSkipItemSkipPolicy());
stepOperations.setExceptionHandler(new SimpleLimitExceptionHandler(Integer.MAX_VALUE));
if (skipLimit > 0) {
/*
* If there is a skip limit (not the default) then we are prepared
* to absorb exceptions at the step level because the failed items
* will never re-appear after a rollback.
*/
itemProcessor.setItemSkipPolicy(new LimitCheckingItemSkipPolicy(skipLimit));
stepOperations.setExceptionHandler(new SimpleLimitExceptionHandler(skipLimit));
step.setStepOperations(stepOperations);
}
else {

7
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java
View File

@@ -74,9 +74,12 @@ public class StatefulRetryStepFactoryBean extends DefaultStepFactoryBean {
*/
protected void applyConfiguration(ItemOrientedStep step) {
// Ensure exception handler always rethrows
// Ensure exception handler always rethrows. N.B. no skips ever actually
// take place.
if (retryPolicy != null) {
super.setAlwaysSkip(true);
// TODO: actually we need to co-ordinate the retry policy with the
// exception handler limit, so this is a hack for now.
super.setSkipLimit(Integer.MAX_VALUE);
}
super.applyConfiguration(step);

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

@@ -16,7 +16,7 @@
<property name="restartable" value="false" />
<property name="steps">
<bean id="step1" parent="simpleStep">
<property name="alwaysSkip" value="true" />
<property name="skipLimit" value="5" />
<property name="itemReader" ref="hibernateItemReader" />
<property name="itemWriter" ref="hibernateOutputSource" />
<property name="commitInterval" value="3" />

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

@@ -15,7 +15,7 @@
<property name="steps">
<list>
<bean id="step1" parent="simpleStep">
<property name="alwaysSkip" value="true" />
<property name="skipLimit" value="5" />
<property name="streams" ref="fileInputTemplate" />
<property name="itemReader">
<bean