IN PROGRESS - BATCH-712: Upgrade ItemReaders to use Parameterized types

This commit is contained in:
robokaso
2008-07-18 13:18:16 +00:00
parent 918ce36e43
commit fc72c3a24f
3 changed files with 10 additions and 7 deletions

View File

@@ -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<Foo> createItemReader() throws Exception {
LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean();
factoryBean.setDataSource(super.getJdbcTemplate().getDataSource());
factoryBean.setMappingLocations(new Resource[] { new ClassPathResource("Foo.hbm.xml", getClass()) });

View File

@@ -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<Foo> 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<Long> keyGenerator = new IbatisKeyCollector<Long>();
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<Foo> tested) throws Exception {
IbatisDrivingQueryItemReader reader = (IbatisDrivingQueryItemReader) tested;
reader.close(new ExecutionContext());
IbatisKeyCollector keyCollector = new IbatisKeyCollector();
IbatisKeyCollector<Long> keyCollector = new IbatisKeyCollector<Long>();
keyCollector.setDrivingQueryId("getNoFoos");
keyCollector.setSqlMapClient(createSqlMapClient());

View File

@@ -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<Foo> 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<Long> keyGenerator = new IbatisKeyCollector<Long>();
keyGenerator.setDrivingQueryId("getAllFooIds");
inputSource.setDetailsQueryId("getFooById");
keyGenerator.setRestartQueryId("getAllFooIdsRestart");