From 1640e7173f49e776cc802e6ab50fb2bddf7197d2 Mon Sep 17 00:00:00 2001 From: lucasward Date: Wed, 16 Jan 2008 21:56:31 +0000 Subject: [PATCH] Fixes for build errors --- .../sample/FieldSetResultSetExtractor.java | 3 ++- .../item/reader/OrderItemReaderTests.java | 17 +++++++++-------- .../mapping/AddressFieldSetMapperTests.java | 3 ++- .../mapping/BillingFieldSetMapperTests.java | 4 ++-- .../mapping/CustomerFieldSetMapperTests.java | 3 ++- .../mapping/HeaderFieldSetMapperTests.java | 4 ++-- .../mapping/OrderItemFieldSetMapperTests.java | 4 ++-- .../mapping/ShippingFieldSetMapperTests.java | 3 ++- .../mapping/TradeFieldSetMapperTests.java | 7 ++++--- 9 files changed, 27 insertions(+), 21 deletions(-) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java index f3c5c0aed..004c754e9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java @@ -22,6 +22,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; /** @@ -56,7 +57,7 @@ public final class FieldSetResultSetExtractor { names.add(metaData.getColumnName(i)); } - fs = new FieldSet((String[])tokens.toArray(new String[0]), (String[])names.toArray(new String[0])); + fs = new DefaultFieldSet((String[])tokens.toArray(new String[0]), (String[])names.toArray(new String[0])); return fs; } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java index c91ca3caf..e8699d775 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java @@ -5,6 +5,7 @@ import java.util.Iterator; import junit.framework.TestCase; import org.easymock.MockControl; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.item.ItemReader; @@ -50,14 +51,14 @@ public class OrderItemReaderTests extends TestCase { public void testNext() throws Exception { //create fieldsets and set return values for input source - FieldSet headerFS = new FieldSet(new String[] {Order.LINE_ID_HEADER}); - FieldSet customerFS = new FieldSet(new String[] {Customer.LINE_ID_NON_BUSINESS_CUST}); - FieldSet billingFS = new FieldSet(new String[] {Address.LINE_ID_BILLING_ADDR}); - FieldSet shippingFS = new FieldSet(new String[] {Address.LINE_ID_SHIPPING_ADDR}); - FieldSet billingInfoFS = new FieldSet(new String[] {BillingInfo.LINE_ID_BILLING_INFO}); - FieldSet shippingInfoFS = new FieldSet(new String[] {ShippingInfo.LINE_ID_SHIPPING_INFO}); - FieldSet itemFS = new FieldSet(new String[] {LineItem.LINE_ID_ITEM}); - FieldSet footerFS = new FieldSet(new String[] {Order.LINE_ID_FOOTER, "100","3","3"}, + FieldSet headerFS = new DefaultFieldSet(new String[] {Order.LINE_ID_HEADER}); + FieldSet customerFS = new DefaultFieldSet(new String[] {Customer.LINE_ID_NON_BUSINESS_CUST}); + FieldSet billingFS = new DefaultFieldSet(new String[] {Address.LINE_ID_BILLING_ADDR}); + FieldSet shippingFS = new DefaultFieldSet(new String[] {Address.LINE_ID_SHIPPING_ADDR}); + FieldSet billingInfoFS = new DefaultFieldSet(new String[] {BillingInfo.LINE_ID_BILLING_INFO}); + FieldSet shippingInfoFS = new DefaultFieldSet(new String[] {ShippingInfo.LINE_ID_SHIPPING_INFO}); + FieldSet itemFS = new DefaultFieldSet(new String[] {LineItem.LINE_ID_ITEM}); + FieldSet footerFS = new DefaultFieldSet(new String[] {Order.LINE_ID_FOOTER, "100","3","3"}, new String[] {"ID","TOTAL_PRICE","TOTAL_LINE_ITEMS","TOTAL_ITEMS"}); input.read(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java index 907649e9c..644475b1b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java @@ -1,5 +1,6 @@ package org.springframework.batch.sample.mapping; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.Address; @@ -43,7 +44,7 @@ public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests { AddressFieldSetMapper.COUNTRY_COLUMN, AddressFieldSetMapper.ZIP_CODE_COLUMN }; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java index e4370dc8d..030d137be 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java @@ -1,9 +1,9 @@ package org.springframework.batch.sample.mapping; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.BillingInfo; -import org.springframework.batch.sample.mapping.BillingFieldSetMapper; public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{ @@ -24,7 +24,7 @@ public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{ String[] columnNames = new String[]{ BillingFieldSetMapper.PAYMENT_TYPE_ID_COLUMN, BillingFieldSetMapper.PAYMENT_DESC_COLUMN}; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java index 708c2113e..6c6138ee1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java @@ -1,5 +1,6 @@ package org.springframework.batch.sample.mapping; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.Customer; @@ -46,7 +47,7 @@ public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests { CustomerFieldSetMapper.REG_ID_COLUMN, CustomerFieldSetMapper.VIP_COLUMN}; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java index 4895e938c..7d3f8769f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java @@ -2,10 +2,10 @@ package org.springframework.batch.sample.mapping; import java.util.Calendar; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.Order; -import org.springframework.batch.sample.mapping.HeaderFieldSetMapper; public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { @@ -31,7 +31,7 @@ public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { HeaderFieldSetMapper.ORDER_ID_COLUMN, HeaderFieldSetMapper.ORDER_DATE_COLUMN }; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java index e9512e011..7a513e754 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java @@ -2,10 +2,10 @@ package org.springframework.batch.sample.mapping; import java.math.BigDecimal; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.LineItem; -import org.springframework.batch.sample.mapping.OrderItemFieldSetMapper; public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{ @@ -52,7 +52,7 @@ public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{ OrderItemFieldSetMapper.SHIPPING_PRICE_COLUMN, OrderItemFieldSetMapper.TOTAL_PRICE_COLUMN }; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java index d7b3af4e5..62475f8e7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java @@ -1,5 +1,6 @@ package org.springframework.batch.sample.mapping; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.sample.domain.ShippingInfo; @@ -26,7 +27,7 @@ public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{ ShippingFieldSetMapper.ADDITIONAL_SHIPPING_INFO_COLUMN, ShippingFieldSetMapper.SHIPPING_TYPE_ID_COLUMN }; - return new FieldSet(tokens, columnNames); + return new DefaultFieldSet(tokens, columnNames); } protected FieldSetMapper fieldSetMapper() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java index ea06d7b85..2d377c039 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java @@ -2,6 +2,7 @@ package org.springframework.batch.sample.mapping; import java.math.BigDecimal; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.item.reader.AggregateItemReader; @@ -31,7 +32,7 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests{ tokens[TradeFieldSetMapper.PRICE_COLUMN] = String.valueOf(PRICE); tokens[TradeFieldSetMapper.CUSTOMER_COLUMN] = CUSTOMER; - return new FieldSet(tokens); + return new DefaultFieldSet(tokens); } protected FieldSetMapper fieldSetMapper() { @@ -39,11 +40,11 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests{ } public void testBeginRecord() throws Exception { - assertEquals(AggregateItemReader.BEGIN_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"BEGIN"}))); + assertEquals(AggregateItemReader.BEGIN_RECORD, fieldSetMapper().mapLine(new DefaultFieldSet(new String[] {"BEGIN"}))); } public void testEndRecord() throws Exception { - assertEquals(AggregateItemReader.END_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"END"}))); + assertEquals(AggregateItemReader.END_RECORD, fieldSetMapper().mapLine(new DefaultFieldSet(new String[] {"END"}))); } }