From 918ce36e43ff4e5319bab94f23697ac8e17a710c Mon Sep 17 00:00:00 2001 From: robokaso Date: Fri, 18 Jul 2008 13:10:21 +0000 Subject: [PATCH] IN PROGRESS - BATCH-712: Upgrade ItemReaders to use Parameterized types --- .../batch/item/database/FooInputSource.java | 6 +++--- ...JdbcDrivingQueryItemReaderIntegrationTests.java | 11 +++++++---- ...olumnJdbcDrivingQueryItemReaderCommonTests.java | 13 +++++++------ ...JdbcDrivingQueryItemReaderIntegrationTests.java | 9 +++++---- ...ipleColumnJdbcKeyGeneratorIntegrationTests.java | 14 +++++++------- ...ngleColumnJdbcKeyGeneratorIntegrationTests.java | 8 ++++---- .../item/support/AggregateItemReaderTests.java | 1 + 7 files changed, 34 insertions(+), 28 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java index b5550a089..5c21a1be4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java @@ -10,15 +10,15 @@ import org.springframework.jdbc.core.JdbcTemplate; class FooItemReader implements ItemStream, ItemReader, DisposableBean, InitializingBean { - DrivingQueryItemReader itemReader; + DrivingQueryItemReader itemReader; - public void setItemReader(DrivingQueryItemReader itemReader) { + public void setItemReader(DrivingQueryItemReader itemReader) { this.itemReader = itemReader; } FooDao fooDao = new SingleKeyFooDao(); - public FooItemReader(DrivingQueryItemReader inputSource, JdbcTemplate jdbcTemplate) { + public FooItemReader(DrivingQueryItemReader inputSource, JdbcTemplate jdbcTemplate) { this.itemReader = inputSource; fooDao.setJdbcTemplate(jdbcTemplate); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/MultipleColumnJdbcDrivingQueryItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/MultipleColumnJdbcDrivingQueryItemReaderIntegrationTests.java index 9c930c89d..d2549b2c9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/MultipleColumnJdbcDrivingQueryItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/MultipleColumnJdbcDrivingQueryItemReaderIntegrationTests.java @@ -15,8 +15,11 @@ */ package org.springframework.batch.item.database; +import java.util.Map; + import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.database.support.MultipleColumnJdbcKeyCollector; +import org.springframework.batch.item.sample.Foo; /** * @author Lucas Ward @@ -25,14 +28,14 @@ import org.springframework.batch.item.database.support.MultipleColumnJdbcKeyColl public class MultipleColumnJdbcDrivingQueryItemReaderIntegrationTests extends AbstractJdbcItemReaderIntegrationTests { - protected ItemReader createItemReader() throws Exception { + protected ItemReader createItemReader() throws Exception { - MultipleColumnJdbcKeyCollector keyGenerator = - new MultipleColumnJdbcKeyCollector(getJdbcTemplate(), + MultipleColumnJdbcKeyCollector> keyGenerator = + new MultipleColumnJdbcKeyCollector>(getJdbcTemplate(), "SELECT ID, VALUE from T_FOOS order by ID, VALUE"); keyGenerator.setRestartSql("SELECT ID, VALUE from T_FOOS where ID > ? and VALUE > ? order by ID"); - DrivingQueryItemReader inputSource = new DrivingQueryItemReader(); + DrivingQueryItemReader> inputSource = new DrivingQueryItemReader>(); inputSource.setSaveState(true); inputSource.setKeyCollector(keyGenerator); FooItemReader fooItemReader = new FooItemReader(inputSource, getJdbcTemplate()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java index a7ce3352c..1366c4ffe 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java @@ -3,30 +3,31 @@ package org.springframework.batch.item.database; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.database.support.SingleColumnJdbcKeyCollector; +import org.springframework.batch.item.sample.Foo; import org.springframework.jdbc.core.JdbcTemplate; public class SingleColumnJdbcDrivingQueryItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests { - protected ItemReader getItemReader() throws Exception { + protected ItemReader getItemReader() throws Exception { JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSource()); - SingleColumnJdbcKeyCollector keyCollector = new SingleColumnJdbcKeyCollector(jdbcTemplate, + SingleColumnJdbcKeyCollector keyCollector = new SingleColumnJdbcKeyCollector(jdbcTemplate, "SELECT ID from T_FOOS order by ID"); keyCollector.setRestartSql("SELECT ID from T_FOOS where ID > ? order by ID"); - DrivingQueryItemReader reader = new DrivingQueryItemReader(); + DrivingQueryItemReader reader = new DrivingQueryItemReader(); reader.setKeyCollector(keyCollector); reader.setSaveState(true); return new FooItemReader(reader, jdbcTemplate); } - protected void pointToEmptyInput(ItemReader tested) throws Exception { + protected void pointToEmptyInput(ItemReader tested) throws Exception { FooItemReader fooReader = (FooItemReader) tested; fooReader.close(new ExecutionContext()); - DrivingQueryItemReader reader = new DrivingQueryItemReader(); + DrivingQueryItemReader reader = new DrivingQueryItemReader(); reader.close(new ExecutionContext()); JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSource()); - SingleColumnJdbcKeyCollector keyCollector = new SingleColumnJdbcKeyCollector(jdbcTemplate, + SingleColumnJdbcKeyCollector keyCollector = new SingleColumnJdbcKeyCollector(jdbcTemplate, "SELECT ID from T_FOOS where ID < 0"); reader.setKeyCollector(keyCollector); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderIntegrationTests.java index 58f4ac5bc..79135ae9d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderIntegrationTests.java @@ -2,21 +2,22 @@ package org.springframework.batch.item.database; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.database.support.SingleColumnJdbcKeyCollector; +import org.springframework.batch.item.sample.Foo; public class SingleColumnJdbcDrivingQueryItemReaderIntegrationTests extends AbstractJdbcItemReaderIntegrationTests { - protected ItemReader source; + protected ItemReader source; /** * @return input source with all necessary dependencies set */ - protected ItemReader createItemReader() throws Exception { + protected ItemReader createItemReader() throws Exception { - SingleColumnJdbcKeyCollector keyStrategy = new SingleColumnJdbcKeyCollector(getJdbcTemplate(), + SingleColumnJdbcKeyCollector keyStrategy = new SingleColumnJdbcKeyCollector(getJdbcTemplate(), "SELECT ID from T_FOOS order by ID"); keyStrategy.setRestartSql("SELECT ID from T_FOOS where ID > ? order by ID"); - DrivingQueryItemReader inputSource = new DrivingQueryItemReader(); + DrivingQueryItemReader inputSource = new DrivingQueryItemReader(); inputSource.setKeyCollector(keyStrategy); inputSource.setSaveState(true); return new FooItemReader(inputSource, getJdbcTemplate()); 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 17a9689b6..7884b2f6e 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 @@ -17,7 +17,7 @@ import org.springframework.util.ClassUtils; */ public class MultipleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests { - MultipleColumnJdbcKeyCollector keyStrategy; + MultipleColumnJdbcKeyCollector> keyStrategy; ExecutionContext executionContext; @@ -28,7 +28,7 @@ public class MultipleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTran protected void onSetUpBeforeTransaction() throws Exception { super.onSetUpBeforeTransaction(); - keyStrategy = new MultipleColumnJdbcKeyCollector(getJdbcTemplate(), + keyStrategy = new MultipleColumnJdbcKeyCollector>(getJdbcTemplate(), "SELECT ID, VALUE from T_FOOS order by ID"); keyStrategy.setRestartSql("SELECT ID, VALUE from T_FOOS where ID > ? and VALUE > ? order by ID"); @@ -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 = keys.get(i); assertEquals(id.get("ID"), new Long(i + 1)); assertEquals(id.get("VALUE"), new Integer(i + 1)); } @@ -54,13 +54,13 @@ public class MultipleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTran 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 = keys.get(0); assertEquals(new Long(4), key.get("ID")); assertEquals(new Integer(4), key.get("VALUE")); - key = (Map)keys.get(1); + key = keys.get(1); assertEquals(new Long(5), key.get("ID")); assertEquals(new Integer(5), key.get("VALUE")); } 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 2c3337024..dd99c9cb8 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 @@ -13,7 +13,7 @@ import org.springframework.util.ClassUtils; */ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests { - SingleColumnJdbcKeyCollector keyStrategy; + SingleColumnJdbcKeyCollector keyStrategy; ExecutionContext executionContext; @@ -25,7 +25,7 @@ public class SingleColumnJdbcKeyGeneratorIntegrationTests extends AbstractTransa protected void onSetUpBeforeTransaction() throws Exception { super.onSetUpBeforeTransaction(); - keyStrategy = new SingleColumnJdbcKeyCollector(getJdbcTemplate(), + keyStrategy = new SingleColumnJdbcKeyCollector(getJdbcTemplate(), "SELECT ID from T_FOOS order by ID"); keyStrategy.setRestartSql("SELECT ID from T_FOOS where ID > ? order by ID"); @@ -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/support/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java index fb1140d4f..fa04c7996 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java @@ -15,6 +15,7 @@ public class AggregateItemReaderTests extends TestCase { private ItemReader input; private AggregateItemReader provider; + @SuppressWarnings("unchecked") public void setUp() { //create mock for input