From 609c7005e9b1f661974ba048df4cde43c28d8dc8 Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 17 Jul 2008 11:59:48 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../item/adapter/ItemReaderAdapterTests.java | 5 ++- .../item/adapter/ItemWriterAdapterTests.java | 4 +- ...egatingItemProccessorIntegrationTests.java | 4 +- .../BatchSqlUpdateItemWriterTests.java | 4 +- .../item/database/CompositeKeyFooDao.java | 2 +- .../database/DrivingQueryItemReaderTests.java | 15 +++---- .../HibernateAwareItemWriterTests.java | 2 +- ...lumnMapExecutionContextRowMapperTests.java | 5 ++- ...olumnJdbcKeyGeneratorIntegrationTests.java | 43 +++---------------- ...olumnJdbcKeyGeneratorIntegrationTests.java | 4 +- .../batch/item/sample/FooService.java | 12 +++--- 11 files changed, 35 insertions(+), 65 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java index aaeab5328..757cc944e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java @@ -3,6 +3,7 @@ package org.springframework.batch.item.adapter; import java.util.ArrayList; import java.util.List; +import org.springframework.batch.item.sample.Foo; import org.springframework.batch.item.sample.FooService; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; @@ -25,13 +26,13 @@ public class ItemReaderAdapterTests extends AbstractDependencyInjectionSpringCon * Regular usage scenario - items are retrieved from the service injected invoker points to. */ public void testNext() throws Exception { - List returnedItems = new ArrayList(); + List returnedItems = new ArrayList(); Object item; while ((item = provider.read()) != null) { returnedItems.add(item); } - List input = fooService.getGeneratedFoos(); + List input = fooService.getGeneratedFoos(); assertEquals(input.size(), returnedItems.size()); assertFalse(returnedItems.isEmpty()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java index b4649506e..32f6420ca 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java @@ -31,8 +31,8 @@ public class ItemWriterAdapterTests extends AbstractDependencyInjectionSpringCon processor.write(foo); } - List input = fooService.getGeneratedFoos(); - List processed = fooService.getProcessedFoos(); + List input = fooService.getGeneratedFoos(); + List processed = fooService.getProcessedFoos(); assertEquals(input.size(), processed.size()); assertFalse(fooService.getProcessedFoos().isEmpty()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java index f3508a2b8..ad68fcfd6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java @@ -31,8 +31,8 @@ public class PropertyExtractingDelegatingItemProccessorIntegrationTests extends processor.write(foo); } - List input = fooService.getGeneratedFoos(); - List processed = fooService.getProcessedFooNameValuePairs(); + List input = fooService.getGeneratedFoos(); + List processed = fooService.getProcessedFooNameValuePairs(); assertEquals(input.size(), processed.size()); assertFalse(fooService.getProcessedFooNameValuePairs().isEmpty()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java index 9c6346b95..fb65ea486 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java @@ -45,7 +45,7 @@ public class BatchSqlUpdateItemWriterTests extends TestCase { private JdbcTemplate jdbcTemplate; - protected List list = new ArrayList(); + protected List list = new ArrayList(); private RepeatContext context = new RepeatContextSupport(null); @@ -77,7 +77,7 @@ public class BatchSqlUpdateItemWriterTests extends TestCase { list.add(item); } }); - TransactionSynchronizationManager.bindResource(writer.getResourceKey(), new HashSet( + TransactionSynchronizationManager.bindResource(writer.getResourceKey(), new HashSet( Collections.singleton("spam"))); RepeatSynchronizationManager.register(context); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java index ec136e734..d35cff1ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java @@ -38,7 +38,7 @@ public class CompositeKeyFooDao extends JdbcDaoSupport implements FooDao { */ public Foo getFoo(Object key) { - Map keys = (Map)key; + Map keys = (Map)key; Object[] args = keys.values().toArray(); RowMapper fooMapper = new RowMapper(){ diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java index effe26d1d..7545bfd10 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/DrivingQueryItemReaderTests.java @@ -2,7 +2,6 @@ package org.springframework.batch.item.database; import java.util.ArrayList; import java.util.List; -import java.util.Properties; import junit.framework.TestCase; @@ -162,8 +161,8 @@ public class DrivingQueryItemReaderTests extends TestCase { itemReader.setKeyCollector(new KeyCollector() { - public List retrieveKeys(ExecutionContext executionContext) { - return new ArrayList(); + public List retrieveKeys(ExecutionContext executionContext) { + return new ArrayList(); } public void updateContext(Object key, @@ -196,8 +195,8 @@ public class DrivingQueryItemReaderTests extends TestCase { private static class MockKeyGenerator implements KeyCollector { static ExecutionContext streamContext; - List keys; - List restartKeys; + List keys; + List restartKeys; static final String RESTART_KEY = "restart.keys"; static { @@ -208,14 +207,14 @@ public class DrivingQueryItemReaderTests extends TestCase { public MockKeyGenerator() { - keys = new ArrayList(); + keys = new ArrayList(); keys.add(new Foo(1, "1", 1)); keys.add(new Foo(2, "2", 2)); keys.add(new Foo(3, "3", 3)); keys.add(new Foo(4, "4", 4)); keys.add(new Foo(5, "5", 5)); - restartKeys = new ArrayList(); + restartKeys = new ArrayList(); restartKeys.add(new Foo(3, "3", 3)); restartKeys.add(new Foo(4, "4", 4)); restartKeys.add(new Foo(5, "5", 5)); @@ -225,7 +224,7 @@ public class DrivingQueryItemReaderTests extends TestCase { return streamContext; } - public List retrieveKeys(ExecutionContext executionContext) { + public List retrieveKeys(ExecutionContext executionContext) { if (executionContext.containsKey(RESTART_KEY)) { return restartKeys; } else { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java index 01cc186b3..8b3241a15 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java @@ -60,7 +60,7 @@ public class HibernateAwareItemWriterTests extends TestCase { HibernateAwareItemWriter writer = new HibernateAwareItemWriter(); - final List list = new ArrayList(); + final List list = new ArrayList(); private RepeatContextSupport context; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java index 72ad0f1f6..5f2239dc3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java @@ -19,11 +19,12 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase { private ColumnMapItemPreparedStatementSetter mapper; - private Map key; + private Map key; private MockControl psControl = MockControl.createControl(PreparedStatement.class); private PreparedStatement ps; + @SuppressWarnings("unchecked") protected void setUp() throws Exception { super.setUp(); @@ -58,7 +59,7 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase { public void testCreateExecutionContextFromEmptyKeys() throws Exception { psControl.replay(); - mapper.setValues(new HashMap(), ps); + mapper.setValues(new HashMap(), ps); psControl.verify(); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java index 68869ffd1..17a9689b6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java @@ -38,10 +38,10 @@ public class MultipleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTran public void testRetrieveKeys(){ - List keys = keyStrategy.retrieveKeys(executionContext); + List keys = keyStrategy.retrieveKeys(executionContext); for (int i = 0; i < keys.size(); i++) { - Map id = (Map)keys.get(i); + Map id = (Map)keys.get(i); assertEquals(id.get("ID"), new Long(i + 1)); assertEquals(id.get("VALUE"), new Integer(i + 1)); } @@ -49,53 +49,22 @@ public class MultipleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTran public void testRestoreKeys(){ - Map keyMap = new LinkedHashMap(); + Map keyMap = new LinkedHashMap(); keyMap.put("ID", "3"); keyMap.put("VALUE", "3"); executionContext.put(ClassUtils.getShortName(MultipleColumnJdbcKeyCollector.class)+ ".current.key", keyMap); - List keys = keyStrategy.retrieveKeys(executionContext); + List keys = keyStrategy.retrieveKeys(executionContext); assertEquals(2, keys.size()); - Map key = (Map)keys.get(0); + Map key = (Map)keys.get(0); assertEquals(new Long(4), key.get("ID")); assertEquals(new Integer(4), key.get("VALUE")); - key = (Map)keys.get(1); + key = (Map)keys.get(1); assertEquals(new Long(5), key.get("ID")); assertEquals(new Integer(5), key.get("VALUE")); } -// public void testGetKeyAsExecutionContext(){ -// -// Map key = CollectionFactory.createLinkedCaseInsensitiveMapIfPossible(1); -// key.put("ID", new Long(3)); -// key.put("VALUE", new Integer(4)); -// -// keyStrategy.setKeyMapper(new KeyMappingPreparedStatementSetter() { -// public PreparedStatementSetter createSetter(ExecutionContext executionContext) { -// return null; -// } -// public void mapKeys(Object key, ExecutionContext executionContext) { -// // Just slap the key as a map into the context -// Map keys = (Map) key; -// for (Iterator it = keys.entrySet().iterator(); it.hasNext();) { -// Entry entry = (Entry)it.next(); -// executionContext.put(entry.getKey().toString(), entry.getValue()); -// } -// } -// public Object mapRow(ResultSet rs, int rowNum) throws SQLException { -// return null; -// } -// }); -// keyStrategy.updateContext(key, executionContext); -// Properties props = executionContext.getProperties(); -// -// assertEquals(2, props.size()); -// System.err.println(props); -// assertEquals("3", props.get("ID")); -// assertEquals("4", props.get("VALUE")); -// } - public void testGetNullKeyAsStreamContext(){ try{ diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java index 061e420a5..2c3337024 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java @@ -35,7 +35,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa public void testRetrieveKeys(){ - List keys = keyStrategy.retrieveKeys(new ExecutionContext()); + List keys = keyStrategy.retrieveKeys(new ExecutionContext()); for (int i = 0; i < keys.size(); i++) { Long id = (Long)keys.get(i); @@ -51,7 +51,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa keyStrategy.updateContext(new Long(3), executionContext); - List keys = keyStrategy.retrieveKeys(executionContext); + List keys = keyStrategy.retrieveKeys(executionContext); assertEquals(2, keys.size()); assertEquals(new Long(4), keys.get(0)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java index 8f8265670..2b616a788 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java @@ -16,9 +16,9 @@ public class FooService { public static final int GENERATION_LIMIT = 10; private int counter = 0; - private List generatedFoos = new ArrayList(GENERATION_LIMIT); - private List processedFoos = new ArrayList(GENERATION_LIMIT); - private List processedFooNameValuePairs = new ArrayList(GENERATION_LIMIT); + private List generatedFoos = new ArrayList(GENERATION_LIMIT); + private List processedFoos = new ArrayList(GENERATION_LIMIT); + private List processedFooNameValuePairs = new ArrayList(GENERATION_LIMIT); public Foo generateFoo() { if (counter++ >= GENERATION_LIMIT) return null; @@ -37,15 +37,15 @@ public class FooService { processedFooNameValuePairs.add(new Foo(0, name, value)); } - public List getGeneratedFoos() { + public List getGeneratedFoos() { return generatedFoos; } - public List getProcessedFoos() { + public List getProcessedFoos() { return processedFoos; } - public List getProcessedFooNameValuePairs() { + public List getProcessedFooNameValuePairs() { return processedFooNameValuePairs; }