RESOLVED - BATCH-822: New WRITE_COUNT should count items instead of chunks

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

@@ -69,8 +69,8 @@ public class StepContribution {
 	/**
 	 * Increment the counter for the number of items written.
 	 */
-	public void incrementWriteCount() {
-		writeCount++;
+	public void incrementWriteCount(int count) {
+		writeCount += count;
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java

@@ -253,7 +253,7 @@ public class ChunkOrientedTasklet<T, S> implements Tasklet {
 		try {
 			listener.beforeWrite(items);
 			itemWriter.write(items);
-			contribution.incrementWriteCount();
+			contribution.incrementWriteCount(items.size());
 			listener.afterWrite(items);
 		}
 		catch (Exception e) {

spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java

@@ -124,13 +124,13 @@ public class StepExecutionTests extends TestCase {
 		contribution.incrementReadSkipCount();
 		contribution.incrementWriteSkipCount();
 		contribution.incrementReadCount();
-		contribution.incrementWriteCount();
+		contribution.incrementWriteCount(7);
 		contribution.incrementFilterCount(1);
 		execution.apply(contribution);
 		assertEquals(1, execution.getReadSkipCount());
 		assertEquals(1, execution.getWriteSkipCount());
 		assertEquals(1, execution.getReadCount());
-		assertEquals(1, execution.getWriteCount());
+		assertEquals(7, execution.getWriteCount());
 		assertEquals(1, execution.getFilterCount());
 	}
 

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkOrientedTaskletTests.java

@@ -68,6 +68,9 @@ public class ChunkOrientedTaskletTests {
 		handler.execute(contribution, context);
 		assertEquals(2, itemReader.count);
 		assertEquals("12", itemWriter.values);
+		assertEquals(2, contribution.getReadCount());
+		assertEquals(2, contribution.getWriteCount());
+		assertEquals(0, contribution.getFilterCount());
 	}
 
 	@Test