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

IN PROGRESS - issue BATCH-412: consistent ItemStream key prefixes

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

all keys made private (not referenced outside tests)
This commit is contained in:
robokaso
2008-03-05 12:22:31 +00:00
parent 2aa867c535
commit 840d30426a
14 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorItemReader.java
View File

@@ -51,9 +51,9 @@ import org.springframework.util.StringUtils;
*/ */
public class HibernateCursorItemReader extends ExecutionContextUserSupport implements ItemReader, ItemStream, Skippable, InitializingBean { 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; private SessionFactory sessionFactory;

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorItemReader.java
View File

@@ -109,11 +109,11 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
public static final int VALUE_NOT_SET = -1; 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; private Connection con;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java
View File

@@ -22,7 +22,7 @@ import com.ibatis.sqlmap.client.SqlMapClient;
*/ */
public class IbatisKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { 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; private SqlMapClientTemplate sqlMapClientTemplate;

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java
View File

@@ -20,7 +20,6 @@ import java.util.List;
import org.springframework.batch.io.driving.DrivingQueryItemReader; import org.springframework.batch.io.driving.DrivingQueryItemReader;
import org.springframework.batch.io.driving.KeyGenerator; import org.springframework.batch.io.driving.KeyGenerator;
import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ExecutionContextUserSupport;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -37,9 +36,7 @@ import org.springframework.util.StringUtils;
* @see DrivingQueryItemReader * @see DrivingQueryItemReader
* @since 1.0 * @since 1.0
*/ */
public class MultipleColumnJdbcKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { public class MultipleColumnJdbcKeyGenerator implements KeyGenerator {
public static final String RESTART_KEY = "key";
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;
@@ -50,7 +47,6 @@ public class MultipleColumnJdbcKeyGenerator extends ExecutionContextUserSupport
private String restartSql; private String restartSql;
public MultipleColumnJdbcKeyGenerator() { public MultipleColumnJdbcKeyGenerator() {
setName(MultipleColumnJdbcKeyGenerator.class.getSimpleName());
} }
/** /**

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java
View File

@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
*/ */
public class SingleColumnJdbcKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator { public class SingleColumnJdbcKeyGenerator extends ExecutionContextUserSupport implements KeyGenerator {
public static final String RESTART_KEY = "key"; private static final String RESTART_KEY = "key";
private JdbcTemplate jdbcTemplate; private JdbcTemplate jdbcTemplate;

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
View File

@@ -68,9 +68,9 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I
private static Log log = LogFactory.getLog(FlatFileItemReader.class); 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 // default encoding for input files
public static final String DEFAULT_CHARSET = "ISO-8859-1"; public static final String DEFAULT_CHARSET = "ISO-8859-1";

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
View File

@@ -71,11 +71,11 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I
private static final String LINE_SEPARATOR = System.getProperty("line.separator"); 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; private Resource resource;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java
View File

@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
public class StaxEventItemReader extends ExecutionContextUserSupport implements ItemReader, Skippable, ItemStream, public class StaxEventItemReader extends ExecutionContextUserSupport implements ItemReader, Skippable, ItemStream,
InitializingBean { InitializingBean {
public static final String READ_COUNT_STATISTICS_NAME = "readCount"; private static final String READ_COUNT_STATISTICS_NAME = "read.count";
private FragmentEventReader fragmentReader; private FragmentEventReader fragmentReader;

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java
View File

@@ -50,10 +50,10 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implements
private static final String DEFAULT_ROOT_TAG_NAME = "root"; private static final String DEFAULT_ROOT_TAG_NAME = "root";
// restart data property name // restart data property name
public static final String RESTART_DATA_NAME = "position"; private static final String RESTART_DATA_NAME = "position";
// restart data property name // 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 // file system resource
private Resource resource; private Resource resource;

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java
View File

@@ -44,7 +44,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa
public void testRestoreKeys(){ public void testRestoreKeys(){
executionContext.putString(SingleColumnJdbcKeyGenerator.RESTART_KEY, "3"); executionContext.putString("key", "3");
List keys = keyStrategy.retrieveKeys(executionContext); List keys = keyStrategy.retrieveKeys(executionContext);
@@ -58,7 +58,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa
keyStrategy.saveState(new Long(3), executionContext); keyStrategy.saveState(new Long(3), executionContext);
assertEquals(1, executionContext.size()); assertEquals(1, executionContext.size());
assertEquals("3", executionContext.getString(SingleColumnJdbcKeyGenerator.RESTART_KEY)); assertEquals("3", executionContext.getString("key"));
} }
public void testGetNullKeyAsStreamContext(){ public void testGetNullKeyAsStreamContext(){

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderAdvancedTests.java
View File

@@ -161,7 +161,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase {
// get restart data // get restart data
reader.update(executionContext); reader.update(executionContext);
assertEquals(4, executionContext.getLong( assertEquals(4, executionContext.getLong(
FlatFileItemReader.class.getSimpleName() + "." + FlatFileItemReader.READ_STATISTICS_NAME)); FlatFileItemReader.class.getSimpleName() + ".lines.read.count"));
// close input // close input
reader.close(executionContext); reader.close(executionContext);
@@ -175,7 +175,7 @@ public class FlatFileItemReaderAdvancedTests extends TestCase {
assertEquals("[testLine6]", reader.read().toString()); assertEquals("[testLine6]", reader.read().toString());
reader.update(executionContext); reader.update(executionContext);
assertEquals(6, executionContext.getLong(FlatFileItemReader.class.getSimpleName() + "." + FlatFileItemReader.READ_STATISTICS_NAME)); assertEquals(6, executionContext.getLong(FlatFileItemReader.class.getSimpleName() + ".lines.read.count"));
} }
} }

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java
View File

@@ -245,7 +245,7 @@ public class FlatFileItemWriterTests extends TestCase {
} }
// 3 lines were written to the file after restart // 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); inputSource.update(executionContext);
assertNotNull(executionContext); assertNotNull(executionContext);
assertEquals(3, executionContext.entrySet().size()); 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 { private void commit() throws Exception {

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java
View File

@@ -119,7 +119,7 @@ public class StaxEventItemReaderTests extends TestCase {
source.read(); source.read();
source.update(executionContext); source.update(executionContext);
System.out.println(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(); List expectedAfterRestart = (List) source.read();
source = createNewInputSouce(); source = createNewInputSouce();
@@ -134,7 +134,7 @@ public class StaxEventItemReaderTests extends TestCase {
*/ */
public void testInvalidRestore() { public void testInvalidRestore() {
ExecutionContext context = new ExecutionContext(); ExecutionContext context = new ExecutionContext();
context.putLong(StaxEventItemReader.class.getSimpleName() + "." + StaxEventItemReader.READ_COUNT_STATISTICS_NAME, 100000); context.putLong(StaxEventItemReader.class.getSimpleName() + ".read.count", 100000);
try { try {
source.open(context); source.open(context);
fail("Expected StreamException"); fail("Expected StreamException");
@@ -214,7 +214,7 @@ public class StaxEventItemReaderTests extends TestCase {
} }
private long extractRecordCount() { 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 { public void testCloseWithoutOpen() throws Exception {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemWriterTests.java
View File

@@ -125,7 +125,7 @@ public class StaxEventItemWriterTests extends TestCase {
for (int i = 1; i <= NUMBER_OF_RECORDS; i++) { for (int i = 1; i <= NUMBER_OF_RECORDS; i++) {
writer.write(record); writer.write(record);
writer.update(executionContext); 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); assertEquals(i, writeStatistics);
} }