diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java index f375cc8e5..595cda954 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java @@ -28,8 +28,6 @@ public class StepContribution { private final int parentSkipCount; - private volatile int commitCount; - private volatile int readSkipCount; private volatile int writeSkipCount; @@ -57,21 +55,6 @@ public class StepContribution { return itemCount; } - /** - * Increment the commit counter. - */ - public void incrementCommitCount() { - commitCount++; - } - - /** - * Public getter for the commit counter. - * @return the commitCount - */ - public int getCommitCount() { - return commitCount; - } - /** * @return the sum of skips accumulated in the parent {@link StepExecution} * and this StepContribution. @@ -130,7 +113,7 @@ public class StepContribution { * @see java.lang.Object#toString() */ public String toString() { - return "[StepContribution: items=" + itemCount + ", commits=" + commitCount + ", readSkips=" + readSkipCount + return "[StepContribution: items=" + itemCount + ", readSkips=" + readSkipCount + ", writeSkips=" + writeSkipCount + "]"; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java index 436e6aaf4..d762d9f80 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java @@ -308,7 +308,6 @@ public class StepExecution extends Entity { */ public synchronized void apply(StepContribution contribution) { itemCount += contribution.getItemCount(); - commitCount += contribution.getCommitCount(); readSkipCount += contribution.getReadSkipCount(); writeSkipCount += contribution.getWriteSkipCount(); } @@ -342,6 +341,13 @@ public class StepExecution extends Entity { return readSkipCount + writeSkipCount; } + /** + * Increment the number of commits + */ + public void incrementCommitCount() { + commitCount++; + } + /** * Increment the number of items skipped on read * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepHandlerStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepHandlerStep.java index 11a4c7a3b..e69fb97e5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepHandlerStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepHandlerStep.java @@ -264,7 +264,7 @@ public class StepHandlerStep extends AbstractStep { } - contribution.incrementCommitCount(); + stepExecution.incrementCommitCount(); // If the step operations are asynchronous then we need // to synchronize changes to the step execution (at a diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java index 0b41bd7f8..668f2d217 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java @@ -37,14 +37,4 @@ public class StepContributionTests extends TestCase { assertEquals(1, contribution.getItemCount()); } - /** - * Test method for - * {@link org.springframework.batch.core.StepContribution#incrementCommitCount()}. - */ - public void testIncrementCommitCount() { - assertEquals(0, contribution.getCommitCount()); - contribution.incrementCommitCount(); - assertEquals(1, contribution.getCommitCount()); - } - } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java index 0652b11d5..833c2c31e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java @@ -125,9 +125,13 @@ public class StepExecutionTests extends TestCase { public void testApplyContribution() throws Exception { StepContribution contribution = execution.createStepContribution(); - contribution.incrementCommitCount(); + contribution.incrementReadSkipCount(); + contribution.incrementWriteSkipCount(); + contribution.incrementItemCount(); execution.apply(contribution); - assertEquals(1, execution.getCommitCount()); + assertEquals(1, execution.getReadSkipCount()); + assertEquals(1, execution.getWriteSkipCount()); + assertEquals(1, execution.getItemCount()); } public void testTerminateOnly() throws Exception { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepHandlerStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepHandlerStepTests.java index d456562e8..af7d29ab1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepHandlerStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepHandlerStepTests.java @@ -127,6 +127,7 @@ public class StepHandlerStepTests extends TestCase { step.execute(stepExecution); assertEquals(1, processed.size()); assertEquals(1, stepExecution.getItemCount()); + assertEquals(1, stepExecution.getCommitCount()); } /**