diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java index 688284d13..893dea574 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java @@ -51,9 +51,9 @@ import org.springframework.util.StringUtils; */ public class HibernateCursorItemReader extends ExecutionContextUserSupport implements ItemReader, ItemStream, Skippable, InitializingBean { - private static final String RESTART_DATA_ROW_NUMBER_KEY = "rowNumber"; + private static final String RESTART_DATA_ROW_NUMBER_KEY = "row.number"; - private static final String SKIPPED_ROWS = "skippedRows"; + private static final String SKIPPED_ROWS = "skipped.rows"; private SessionFactory sessionFactory; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorItemReader.java index c5a5184d8..644e3b5ee 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorItemReader.java @@ -109,11 +109,11 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements public static final int VALUE_NOT_SET = -1; - private static final String CURRENT_PROCESSED_ROW = "lastProcessedRowNum"; + private static final String CURRENT_PROCESSED_ROW = "last.processed.row.number"; - private static final String SKIPPED_ROWS = "skippedRows"; + private static final String SKIPPED_ROWS = "skipped.rows"; - private static final String SKIP_COUNT = "skippedRrecordCount"; + private static final String SKIP_COUNT = "skipped.record.count"; private Connection con; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java index 0e7f0a889..ac975fd17 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java @@ -22,7 +22,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; */ public class IbatisKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { - public static final String RESTART_KEY = "keyIndex"; + private static final String RESTART_KEY = "key.index"; private SqlMapClientTemplate sqlMapClientTemplate; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java index 5db569a30..6ee179627 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java @@ -20,7 +20,6 @@ import java.util.List; import org.springframework.batch.io.driving.DrivingQueryItemReader; import org.springframework.batch.io.driving.KeyGenerator; import org.springframework.batch.item.ExecutionContext; -import org.springframework.batch.item.ExecutionContextUserSupport; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -37,9 +36,7 @@ import org.springframework.util.StringUtils; * @see DrivingQueryItemReader * @since 1.0 */ -public class MultipleColumnJdbcKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { - - public static final String RESTART_KEY = "key"; +public class MultipleColumnJdbcKeyGenerator implements KeyGenerator { private JdbcTemplate jdbcTemplate; @@ -50,7 +47,6 @@ public class MultipleColumnJdbcKeyGenerator extends ExecutionContextUserSupport private String restartSql; public MultipleColumnJdbcKeyGenerator() { - setName(MultipleColumnJdbcKeyGenerator.class.getSimpleName()); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java index 55d7259ac..40dbef291 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java @@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; */ public class SingleColumnJdbcKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { - public static final String RESTART_KEY = "key"; + private static final String RESTART_KEY = "key"; private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java index e0a0decb6..a0ed3f52a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java @@ -68,9 +68,9 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I private static Log log = LogFactory.getLog(FlatFileItemReader.class); - public static final String READ_STATISTICS_NAME = "lines.read.count"; + private static final String READ_STATISTICS_NAME = "lines.read.count"; - public static final String SKIPPED_STATISTICS_NAME = "skipped.lines.count"; + private static final String SKIPPED_STATISTICS_NAME = "skipped.lines.count"; // default encoding for input files public static final String DEFAULT_CHARSET = "ISO-8859-1"; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java index 70f0352b0..e6faebf09 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java @@ -71,11 +71,11 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I private static final String LINE_SEPARATOR = System.getProperty("line.separator"); - public static final String WRITTEN_STATISTICS_NAME = "written"; + private static final String WRITTEN_STATISTICS_NAME = "written"; - public static final String RESTART_COUNT_STATISTICS_NAME = "restart.count"; + private static final String RESTART_COUNT_STATISTICS_NAME = "restart.count"; - public static final String RESTART_DATA_NAME = "current.count"; + private static final String RESTART_DATA_NAME = "current.count"; private Resource resource; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java index aa79d4606..2f1d1586f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; public class StaxEventItemReader extends ExecutionContextUserSupport implements ItemReader, Skippable, ItemStream, InitializingBean { - public static final String READ_COUNT_STATISTICS_NAME = "readCount"; + private static final String READ_COUNT_STATISTICS_NAME = "read.count"; private FragmentEventReader fragmentReader; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java index aa95b7a76..1f2183ccf 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java @@ -50,10 +50,10 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implements private static final String DEFAULT_ROOT_TAG_NAME = "root"; // restart data property name - public static final String RESTART_DATA_NAME = "position"; + private static final String RESTART_DATA_NAME = "position"; // restart data property name - public static final String WRITE_STATISTICS_NAME = "record.count"; + private static final String WRITE_STATISTICS_NAME = "record.count"; // file system resource private Resource resource; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java index 1fca690c1..625841da7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java @@ -44,7 +44,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa public void testRestoreKeys(){ - executionContext.putString(SingleColumnJdbcKeyGenerator.RESTART_KEY, "3"); + executionContext.putString("key", "3"); List keys = keyStrategy.retrieveKeys(executionContext); @@ -58,7 +58,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa keyStrategy.saveState(new Long(3), executionContext); assertEquals(1, executionContext.size()); - assertEquals("3", executionContext.getString(SingleColumnJdbcKeyGenerator.RESTART_KEY)); + assertEquals("3", executionContext.getString("key")); } public void testGetNullKeyAsStreamContext(){ diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderAdvancedTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderAdvancedTests.java index 14b8acb82..c6189fbe4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderAdvancedTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderAdvancedTests.java @@ -161,7 +161,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase { // get restart data reader.update(executionContext); assertEquals(4, executionContext.getLong( - FlatFileItemReader.class.getSimpleName() + "." + FlatFileItemReader.READ_STATISTICS_NAME)); + FlatFileItemReader.class.getSimpleName() + ".lines.read.count")); // close input reader.close(executionContext); @@ -175,7 +175,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase { assertEquals("[testLine6]", reader.read().toString()); reader.update(executionContext); - assertEquals(6, executionContext.getLong(FlatFileItemReader.class.getSimpleName() + "." + FlatFileItemReader.READ_STATISTICS_NAME)); + assertEquals(6, executionContext.getLong(FlatFileItemReader.class.getSimpleName() + ".lines.read.count")); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java index be2545d31..63fc95ec8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java @@ -245,7 +245,7 @@ public class FlatFileItemWriterTests extends TestCase { } // 3 lines were written to the file after restart - assertEquals(3, executionContext.getLong(FlatFileItemWriter.class.getSimpleName() + "." + FlatFileItemWriter.WRITTEN_STATISTICS_NAME)); + assertEquals(3, executionContext.getLong(FlatFileItemWriter.class.getSimpleName() + ".written")); } @@ -269,7 +269,7 @@ public class FlatFileItemWriterTests extends TestCase { inputSource.update(executionContext); assertNotNull(executionContext); assertEquals(3, executionContext.entrySet().size()); - assertEquals(0, executionContext.getLong(FlatFileItemWriter.class.getSimpleName() + "." + FlatFileItemWriter.RESTART_DATA_NAME)); + assertEquals(0, executionContext.getLong(FlatFileItemWriter.class.getSimpleName() + ".current.count")); } private void commit() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java index 2962bce61..1a0e5bdb4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java @@ -119,7 +119,7 @@ public class StaxEventItemReaderTests extends TestCase { source.read(); source.update(executionContext); System.out.println(executionContext); - assertEquals(1, executionContext.getLong(StaxEventItemReader.class.getSimpleName() + "." + StaxEventItemReader.READ_COUNT_STATISTICS_NAME)); + assertEquals(1, executionContext.getLong(StaxEventItemReader.class.getSimpleName() + ".read.count")); List expectedAfterRestart = (List) source.read(); source = createNewInputSouce(); @@ -134,7 +134,7 @@ public class StaxEventItemReaderTests extends TestCase { */ public void testInvalidRestore() { ExecutionContext context = new ExecutionContext(); - context.putLong(StaxEventItemReader.class.getSimpleName() + "." + StaxEventItemReader.READ_COUNT_STATISTICS_NAME, 100000); + context.putLong(StaxEventItemReader.class.getSimpleName() + ".read.count", 100000); try { source.open(context); fail("Expected StreamException"); @@ -214,7 +214,7 @@ public class StaxEventItemReaderTests extends TestCase { } private long extractRecordCount() { - return executionContext.getLong(StaxEventItemReader.class.getSimpleName() + "." + StaxEventItemReader.READ_COUNT_STATISTICS_NAME); + return executionContext.getLong(StaxEventItemReader.class.getSimpleName() + ".read.count"); } public void testCloseWithoutOpen() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemWriterTests.java index 23af84c75..d38490f81 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemWriterTests.java @@ -125,7 +125,7 @@ public class StaxEventItemWriterTests extends TestCase { for (int i = 1; i <= NUMBER_OF_RECORDS; i++) { writer.write(record); writer.update(executionContext); - long writeStatistics = executionContext.getLong(StaxEventItemWriter.class.getSimpleName() + "." + StaxEventItemWriter.WRITE_STATISTICS_NAME); + long writeStatistics = executionContext.getLong(StaxEventItemWriter.class.getSimpleName() + ".record.count"); assertEquals(i, writeStatistics); }