From fc72c3a24fda227b6017c10246e71380b51dfa3d Mon Sep 17 00:00:00 2001 From: robokaso Date: Fri, 18 Jul 2008 13:18:16 +0000 Subject: [PATCH] IN PROGRESS - BATCH-712: Upgrade ItemReaders to use Parameterized types --- .../HibernateCursorItemReaderIntegrationTests.java | 3 ++- .../batch/item/database/IbatisItemReaderCommonTests.java | 9 +++++---- .../item/database/IbatisItemReaderIntegrationTests.java | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java index a9d5a5bcd..2236d6673 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java @@ -4,6 +4,7 @@ import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; +import org.springframework.batch.item.sample.Foo; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.orm.hibernate3.LocalSessionFactoryBean; @@ -15,7 +16,7 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean; */ public class HibernateCursorItemReaderIntegrationTests extends AbstractDataSourceItemReaderIntegrationTests { - protected ItemReader createItemReader() throws Exception { + protected ItemReader createItemReader() throws Exception { LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean(); factoryBean.setDataSource(super.getJdbcTemplate().getDataSource()); factoryBean.setMappingLocations(new Resource[] { new ClassPathResource("Foo.hbm.xml", getClass()) }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java index 114cae843..7af90aaa5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java @@ -3,6 +3,7 @@ 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.IbatisKeyCollector; +import org.springframework.batch.item.sample.Foo; import org.springframework.core.io.ClassPathResource; import org.springframework.orm.ibatis.SqlMapClientFactoryBean; @@ -10,7 +11,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; public class IbatisItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests { - protected ItemReader getItemReader() throws Exception { + protected ItemReader getItemReader() throws Exception { SqlMapClientFactoryBean factory = new SqlMapClientFactoryBean(); factory.setConfigLocation(new ClassPathResource("ibatis-config.xml", getClass())); factory.setDataSource(getDataSource()); @@ -18,7 +19,7 @@ public class IbatisItemReaderCommonTests extends CommonDatabaseItemStreamItemRea SqlMapClient sqlMapClient = createSqlMapClient(); IbatisDrivingQueryItemReader reader = new IbatisDrivingQueryItemReader(); - IbatisKeyCollector keyGenerator = new IbatisKeyCollector(); + IbatisKeyCollector keyGenerator = new IbatisKeyCollector(); keyGenerator.setDrivingQueryId("getAllFooIds"); reader.setDetailsQueryId("getFooById"); keyGenerator.setRestartQueryId("getAllFooIdsRestart"); @@ -38,11 +39,11 @@ public class IbatisItemReaderCommonTests extends CommonDatabaseItemStreamItemRea return (SqlMapClient) factory.getObject(); } - protected void pointToEmptyInput(ItemReader tested) throws Exception { + protected void pointToEmptyInput(ItemReader tested) throws Exception { IbatisDrivingQueryItemReader reader = (IbatisDrivingQueryItemReader) tested; reader.close(new ExecutionContext()); - IbatisKeyCollector keyCollector = new IbatisKeyCollector(); + IbatisKeyCollector keyCollector = new IbatisKeyCollector(); keyCollector.setDrivingQueryId("getNoFoos"); keyCollector.setSqlMapClient(createSqlMapClient()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java index e76564d53..8df0d0ca5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderIntegrationTests.java @@ -2,6 +2,7 @@ package org.springframework.batch.item.database; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.database.support.IbatisKeyCollector; +import org.springframework.batch.item.sample.Foo; import org.springframework.core.io.ClassPathResource; import org.springframework.orm.ibatis.SqlMapClientFactoryBean; @@ -14,7 +15,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; */ public class IbatisItemReaderIntegrationTests extends AbstractDataSourceItemReaderIntegrationTests { - protected ItemReader createItemReader() throws Exception { + protected ItemReader createItemReader() throws Exception { SqlMapClientFactoryBean factory = new SqlMapClientFactoryBean(); factory.setConfigLocation(new ClassPathResource("ibatis-config.xml", getClass())); @@ -23,7 +24,7 @@ public class IbatisItemReaderIntegrationTests extends AbstractDataSourceItemRead SqlMapClient sqlMapClient = (SqlMapClient) factory.getObject(); IbatisDrivingQueryItemReader inputSource = new IbatisDrivingQueryItemReader(); - IbatisKeyCollector keyGenerator = new IbatisKeyCollector(); + IbatisKeyCollector keyGenerator = new IbatisKeyCollector(); keyGenerator.setDrivingQueryId("getAllFooIds"); inputSource.setDetailsQueryId("getFooById"); keyGenerator.setRestartQueryId("getAllFooIdsRestart");