diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/AbstractBufferedItemReaderItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/AbstractBufferedItemReaderItemStream.java index b86e4f379..309c54848 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/AbstractBufferedItemReaderItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/AbstractBufferedItemReaderItemStream.java @@ -16,7 +16,7 @@ import org.springframework.util.Assert; */ public abstract class AbstractBufferedItemReaderItemStream implements ItemReader, ItemStream { - private static final String PIECE_COUNT = "piece.count"; + private static final String READ_COUNT = "read.count"; private int currentItemCount = 0; @@ -145,8 +145,8 @@ public abstract class AbstractBufferedItemReaderItemStream implements ItemReader throw new ItemStreamException("Failed to initialize the reader", e); } - if (executionContext.containsKey(ecSupport.getKey(PIECE_COUNT))) { - int itemCount = new Long(executionContext.getLong(ecSupport.getKey(PIECE_COUNT))).intValue(); + if (executionContext.containsKey(ecSupport.getKey(READ_COUNT))) { + int itemCount = new Long(executionContext.getLong(ecSupport.getKey(READ_COUNT))).intValue(); try { jumpToItem(itemCount); @@ -163,7 +163,7 @@ public abstract class AbstractBufferedItemReaderItemStream implements ItemReader public void update(ExecutionContext executionContext) throws ItemStreamException { if (saveState) { Assert.notNull(executionContext, "ExecutionContext must not be null"); - executionContext.putLong(ecSupport.getKey(PIECE_COUNT), currentItemCount); + executionContext.putLong(ecSupport.getKey(READ_COUNT), currentItemCount); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java index 16ba26c3d..a93b951c4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderAdvancedTests.java @@ -152,7 +152,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase { // get restart data reader.update(executionContext); assertEquals(4, executionContext.getLong(ClassUtils.getShortName(FlatFileItemReader.class) - + ".piece.count")); + + ".read.count")); // close input reader.close(executionContext); @@ -167,7 +167,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase { reader.update(executionContext); assertEquals(6, executionContext.getLong(ClassUtils.getShortName(FlatFileItemReader.class) - + ".piece.count")); + + ".read.count")); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index cce5402cb..5664da8bf 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -116,7 +116,7 @@ public class StaxEventItemReaderTests extends TestCase { source.read(); source.update(executionContext); System.out.println(executionContext); - assertEquals(1, executionContext.getLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".piece.count")); + assertEquals(1, executionContext.getLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".read.count")); List expectedAfterRestart = (List) source.read(); source = createNewInputSouce(); @@ -183,7 +183,7 @@ public class StaxEventItemReaderTests extends TestCase { } private long extractRecordCount() { - return executionContext.getLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".piece.count"); + return executionContext.getLong(ClassUtils.getShortName(StaxEventItemReader.class) + ".read.count"); } public void testCloseWithoutOpen() throws Exception { diff --git a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml index e81b3b978..8ed8ede38 100644 --- a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml @@ -34,7 +34,7 @@ - +