From 9dfc23f6da8bcf4b512139fc02037395bfa76d69 Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 17 Jul 2008 13:19:06 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../batch/config/MessagingTests.java | 6 +++--- .../AbstractStaxEventReaderItemReaderTests.java | 4 ++-- .../AbstractStaxEventWriterItemWriterTests.java | 4 ++-- .../batch/jms/ExternalRetryInBatchTests.java | 10 +++++----- .../batch/repeat/jms/AsynchronousTests.java | 4 ++-- .../batch/repeat/jms/SynchronousTests.java | 6 +++--- .../batch/retry/jms/ExternalRetryTests.java | 12 ++++++------ .../batch/retry/jms/SynchronousTests.java | 16 ++++++++-------- .../retry/jms/SynchronousTests.java | 16 ++++++++-------- .../datasource/DerbyDataSourceFactoryBean.java | 2 +- .../InitializingDataSourceFactoryBean.java | 9 ++++----- 11 files changed, 44 insertions(+), 45 deletions(-) diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java index f38ecde90..187565402 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/config/MessagingTests.java @@ -46,15 +46,15 @@ public class MessagingTests extends AbstractDependencyInjectionSpringContextTest } public void testMessaging() throws Exception { - List list = getMessages(); + List list = getMessages(); System.err.println(list); assertEquals(2, list.size()); assertTrue(list.contains("foo")); } - private List getMessages() { + private List getMessages() { String next = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (next != null) { next = (String) jmsTemplate.receiveAndConvert("queue"); if (next != null) diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java index 49dba25ad..3987d0461 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java @@ -36,7 +36,7 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase { public void testRead() throws Exception { Object result; - List results = new ArrayList(); + List results = new ArrayList(); while ((result = source.read()) != null) { results.add(result); } @@ -52,7 +52,7 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase { /** * @param results list of domain objects returned by input source */ - protected void checkResults(List results){ + protected void checkResults(List results){ assertEquals(3, results.size()); Trade trade1 = (Trade) results.get(0); diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java index 1c9724fbf..b4bf0f660 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java @@ -31,7 +31,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { protected Resource expected = new ClassPathResource("expected-output.xml", getClass()); - protected List objects = new ArrayList() { + protected List objects = new ArrayList() { { add(new Trade("isin1", 1, new BigDecimal(1.0), "customer1")); add(new Trade("isin2", 2, new BigDecimal(2.0), "customer2")); @@ -43,7 +43,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { * Write list of domain objects and check the output file. */ public void testWrite() throws Exception { - for (Iterator iterator = objects.listIterator(); iterator.hasNext();) { + for (Iterator iterator = objects.listIterator(); iterator.hasNext();) { writer.write(iterator.next()); } writer.close(null); diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java index a01af22ba..b8c439224 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java @@ -108,9 +108,9 @@ public class ExternalRetryInBatchTests extends AbstractDependencyInjectionSpring assertEquals(0, count); } - private List list = new ArrayList(); + private List list = new ArrayList(); - private List recovered = new ArrayList(); + private List recovered = new ArrayList(); public void testExternalRetryRecoveryInBatch() throws Exception { assertInitialState(); @@ -181,7 +181,7 @@ public class ExternalRetryInBatchTests extends AbstractDependencyInjectionSpring } } - List msgs = getMessages(); + List msgs = getMessages(); System.err.println(msgs); @@ -198,9 +198,9 @@ public class ExternalRetryInBatchTests extends AbstractDependencyInjectionSpring } - private List getMessages() { + private List getMessages() { String next = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (next != null) { next = (String) jmsTemplate.receiveAndConvert("queue"); if (next != null) diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java index edb26de01..bd083f274 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java @@ -89,7 +89,7 @@ public class AsynchronousTests extends AbstractDependencyInjectionSpringContextT } } - List list = new ArrayList(); + List list = new ArrayList(); private void assertInitialState() { int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -164,7 +164,7 @@ public class AsynchronousTests extends AbstractDependencyInjectionSpringContextT logger.debug("T_FOOS: "+jdbcTemplate.queryForList("select * from T_FOOS")); String text = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (text != null) { text = (String) jmsTemplate.receiveAndConvert("queue"); msgs.add(text); diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java index be6569f14..2c6bc78c7 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java @@ -77,7 +77,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte assertEquals(0, count); } - List list = new ArrayList(); + List list = new ArrayList(); public void testCommit() throws Exception { @@ -129,7 +129,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); String text = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (text != null) { text = (String) jmsTemplate.receiveAndConvert("queue"); msgs.add(text); @@ -192,7 +192,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); String text = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (text != null) { text = (String) jmsTemplate.receiveAndConvert("queue"); msgs.add(text); diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java index e6c2aed34..4b8e4cb85 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java @@ -94,9 +94,9 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext assertEquals(0, count); } - private List list = new ArrayList(); + private List list = new ArrayList(); - private List recovered = new ArrayList(); + private List recovered = new ArrayList(); /** * Message processing is successful on the second attempt but must receive @@ -168,7 +168,7 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext } }); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -234,7 +234,7 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext // Last attempt should return last item. assertEquals("foo", result); - List msgs = getMessages(); + List msgs = getMessages(); assertEquals(1, recovered.size()); @@ -247,9 +247,9 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext } - private List getMessages() { + private List getMessages() { String next = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (next != null) { next = (String) jmsTemplate.receiveAndConvert("queue"); if (next != null) diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java index 0b61430d9..11e356608 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java @@ -72,7 +72,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte assertEquals(0, count); } - List list = new ArrayList(); + List list = new ArrayList(); /** * Message processing is successful on the second attempt without having to @@ -124,7 +124,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -180,7 +180,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -239,7 +239,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion rolled back... count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -290,7 +290,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -351,7 +351,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion rolled back... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -361,9 +361,9 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte assertTrue(msgs.contains("foo")); } - private List getMessages() { + private List getMessages() { String next = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (next != null) { next = (String) jmsTemplate.receiveAndConvert("queue"); if (next != null) diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java index 96e13ef8a..aedfb4af7 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/retry/jms/SynchronousTests.java @@ -66,7 +66,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte assertEquals(0, count); } - List list = new ArrayList(); + List list = new ArrayList(); /** * Message processing is successful on the second attempt without having to @@ -117,7 +117,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -173,7 +173,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -232,7 +232,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion rolled back... count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -284,7 +284,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion committed once... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -342,7 +342,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte startNewTransaction(); - List msgs = getMessages(); + List msgs = getMessages(); // The database portion rolled back... int count = jdbcTemplate.queryForInt("select count(*) from T_FOOS"); @@ -352,9 +352,9 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte assertTrue(msgs.contains("foo")); } - private List getMessages() { + private List getMessages() { String next = ""; - List msgs = new ArrayList(); + List msgs = new ArrayList(); while (next != null) { next = (String) jmsTemplate.receiveAndConvert("queue"); if (next != null) diff --git a/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index 2aa2ae531..2a16eb389 100644 --- a/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -28,7 +28,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { return ds; } - public Class getObjectType() { + public Class getObjectType() { return DataSource.class; } diff --git a/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java index b5e410af7..c4cf618d7 100644 --- a/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java +++ b/spring-batch-infrastructure-tests/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java @@ -17,7 +17,6 @@ package test.jdbc.datasource; import java.io.IOException; -import java.util.Iterator; import java.util.List; import javax.sql.DataSource; @@ -99,6 +98,7 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean { TransactionTemplate transactionTemplate = new TransactionTemplate(new DataSourceTransactionManager(dataSource)); transactionTemplate.execute(new TransactionCallback() { + @SuppressWarnings("unchecked") public Object doInTransaction(TransactionStatus status) { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); String[] scripts; @@ -122,10 +122,9 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean { } - private String stripComments(List list) { + private String stripComments(List list) { StringBuffer buffer = new StringBuffer(); - for (Iterator iter = list.iterator(); iter.hasNext();) { - String line = (String) iter.next(); + for (String line : list) { if (!line.startsWith("//") && !line.startsWith("--")) { buffer.append(line + "\n"); } @@ -133,7 +132,7 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean { return buffer.toString(); } - public Class getObjectType() { + public Class getObjectType() { return DataSource.class; }