From 209d24abdaf55d00afc2dac199ddff8ea1167979 Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 17 Jul 2008 14:28:54 +0000 Subject: [PATCH] IN PROGRESS - BATCH-709: Change all collections to use generics --- .../valang/custom/TotalOrderItemsFunctionTests.java | 4 ++-- .../valang/custom/ValidateDiscountsFunctionTests.java | 10 +++++----- .../custom/ValidateHandlingPricesFunctionTests.java | 4 ++-- .../valang/custom/ValidateIdsFunctionTests.java | 4 ++-- .../valang/custom/ValidatePricesFunctionTests.java | 4 ++-- .../valang/custom/ValidateQuantitiesFunctionTests.java | 4 ++-- .../custom/ValidateShippingPricesFunctionTests.java | 4 ++-- .../custom/ValidateTotalPricesFunctionTests.java | 6 +++--- .../jdbc/datasource/DerbyDataSourceFactoryBean.java | 2 +- .../datasource/InitializingDataSourceFactoryBean.java | 9 ++++----- 10 files changed, 25 insertions(+), 26 deletions(-) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java index e296d1917..7e2720e31 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java @@ -52,7 +52,7 @@ public class TotalOrderItemsFunctionTests extends TestCase { //create list with correct item count LineItem item = new LineItem(); item.setQuantity(3); - List list = new ArrayList(); + List list = new ArrayList(); list.add(item); argument2.getResult(null); @@ -68,7 +68,7 @@ public class TotalOrderItemsFunctionTests extends TestCase { //create list with incorrect item count LineItem item = new LineItem(); item.setQuantity(99); - List list = new ArrayList(); + List list = new ArrayList(); list.add(item); argument2.getResult(null); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java index 1cd912561..b047c5374 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java @@ -32,7 +32,7 @@ public class ValidateDiscountsFunctionTests extends TestCase { item.setDiscountAmount(new BigDecimal(0.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -61,7 +61,7 @@ public class ValidateDiscountsFunctionTests extends TestCase { item.setDiscountAmount(new BigDecimal(0.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -91,7 +91,7 @@ public class ValidateDiscountsFunctionTests extends TestCase { item.setPrice(new BigDecimal(100.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -122,7 +122,7 @@ public class ValidateDiscountsFunctionTests extends TestCase { item.setPrice(new BigDecimal(100.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -152,7 +152,7 @@ public class ValidateDiscountsFunctionTests extends TestCase { item.setDiscountAmount(new BigDecimal(99.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java index 5329f414b..bdb823c43 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java @@ -32,7 +32,7 @@ public class ValidateHandlingPricesFunctionTests extends TestCase { item.setHandlingPrice(new BigDecimal(1.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -59,7 +59,7 @@ public class ValidateHandlingPricesFunctionTests extends TestCase { item.setHandlingPrice(new BigDecimal(99999999.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java index 24857a79c..903594e9d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java @@ -31,7 +31,7 @@ public class ValidateIdsFunctionTests extends TestCase { item.setItemId(1); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -58,7 +58,7 @@ public class ValidateIdsFunctionTests extends TestCase { item.setItemId(9999999999L); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java index 634031441..86f3a9afe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java @@ -32,7 +32,7 @@ public class ValidatePricesFunctionTests extends TestCase { item.setPrice(new BigDecimal(1.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -59,7 +59,7 @@ public class ValidatePricesFunctionTests extends TestCase { item.setPrice(new BigDecimal(99999999.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java index 40a8cd45e..c2984b8c3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java @@ -31,7 +31,7 @@ public class ValidateQuantitiesFunctionTests extends TestCase { item.setQuantity(1); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -58,7 +58,7 @@ public class ValidateQuantitiesFunctionTests extends TestCase { item.setQuantity(9999); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java index dec88491e..b8d5e85ee 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java @@ -32,7 +32,7 @@ public class ValidateShippingPricesFunctionTests extends TestCase { item.setShippingPrice(new BigDecimal(1.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -59,7 +59,7 @@ public class ValidateShippingPricesFunctionTests extends TestCase { item.setShippingPrice(new BigDecimal(99999999.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java index 1d4b8ca6e..72b617843 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java @@ -38,7 +38,7 @@ public class ValidateTotalPricesFunctionTests extends TestCase { item.setTotalPrice(new BigDecimal(1.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -71,7 +71,7 @@ public class ValidateTotalPricesFunctionTests extends TestCase { item.setTotalPrice(new BigDecimal(99999999.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument @@ -104,7 +104,7 @@ public class ValidateTotalPricesFunctionTests extends TestCase { item.setTotalPrice(new BigDecimal(248.0)); //add it to line items list - List items = new ArrayList(); + List items = new ArrayList(); items.add(item); //set return value for mock argument diff --git a/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index cda9e3acc..edcc3c9da 100644 --- a/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-samples/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -30,7 +30,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { return ds; } - public Class getObjectType() { + public Class getObjectType() { return DataSource.class; } diff --git a/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java index 7eb5d6fc5..6ce4df49b 100644 --- a/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java +++ b/spring-batch-samples/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; @@ -102,6 +101,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; @@ -133,10 +133,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"); } @@ -144,7 +143,7 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean { return buffer.toString(); } - public Class getObjectType() { + public Class getObjectType() { return DataSource.class; }