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

IN PROGRESS - issue BATCH-461: skip counting

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

StepContribution#getSkipCount renamed to StepContribution#getStepSkipCount and added StepContribution#getContributionSkipCount (used by StepExecution to increment its skipCount).
This commit is contained in:
robokaso
2008-03-14 15:35:11 +00:00
parent 0a1c4f49db
commit db2344d2fa
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
View File

@@ -33,7 +33,7 @@ public class StepContribution {
private ExecutionContext executionContext;
private int commitCount;
private int skipCount;
/**
@@ -98,12 +98,25 @@ public class StepContribution {
public boolean isTerminateOnly() {
return execution.isTerminateOnly();
}
public int getSkipCount() {
/**
* @return the sum of skips accumulated in the parent {@link StepExecution}
* and this <code>StepContribution</code>.
*/
public int getStepSkipCount() {
return skipCount + execution.getSkipCount();
}
public void incrementSkipCount(){
/**
* @return the number of skips collected in this
* <code>StepContribution</code> (not including skips accumulated in the
* parent {@link StepExecution}.
*/
public int getContributionSkipCount() {
return skipCount;
}
public void incrementSkipCount() {
skipCount++;
}

2
spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java
View File

@@ -307,7 +307,7 @@ public class StepExecution extends Entity {
// TODO: this should not be necessary - the step decides
// executionContext = contribution.getExecutionContext();
commitCount += contribution.getCommitCount();
skipCount += contribution.getSkipCount();
skipCount += contribution.getContributionSkipCount();
}
/**

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandler.java
View File

@@ -64,7 +64,7 @@ public class ItemSkipPolicyItemHandler extends SimpleItemHandler {
return getItemReader().read();
}
catch (Exception e) {
if (itemSkipPolicy.shouldSkip(e, contribution.getSkipCount())) {
if (itemSkipPolicy.shouldSkip(e, contribution.getStepSkipCount())) {
contribution.incrementSkipCount();
if (getItemReader() instanceof Skippable) {
((Skippable) getItemReader()).skip();
@@ -87,7 +87,7 @@ public class ItemSkipPolicyItemHandler extends SimpleItemHandler {
getItemWriter().write(item);
}
catch (Exception e) {
if (itemSkipPolicy.shouldSkip(e, contribution.getSkipCount())) {
if (itemSkipPolicy.shouldSkip(e, contribution.getStepSkipCount())) {
contribution.incrementSkipCount();
if (getItemReader() instanceof Skippable) {
((Skippable) getItemReader()).skip();