diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java index aa3bda7ea..8d1fec96a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java @@ -6,7 +6,7 @@ import org.springframework.batch.sample.domain.football.Game; public class GameFieldSetMapper implements FieldSetMapper { - public Game map(FieldSet fs) { + public Game mapFieldSet(FieldSet fs) { if(fs == null){ return null; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java index fffabaf20..efeebc21f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java @@ -6,7 +6,7 @@ import org.springframework.batch.sample.domain.football.Player; public class PlayerFieldSetMapper implements FieldSetMapper { - public Player map(FieldSet fs) { + public Player mapFieldSet(FieldSet fs) { if(fs == null){ return null; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java index fd533c352..fe5d70312 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java @@ -83,7 +83,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper map(FieldSet fieldSet) { + public AggregateItem mapFieldSet(FieldSet fieldSet) { if (fieldSet.readString(0).equals(begin)) { return AggregateItem.getHeader(); @@ -92,7 +92,7 @@ public class AggregateItemFieldSetMapper implements FieldSetMapper(delegate.map(fieldSet)); + return new AggregateItem(delegate.mapFieldSet(fieldSet)); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java index dcf777b24..80a1451c0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java @@ -33,7 +33,7 @@ public class AddressFieldSetMapper implements FieldSetMapper
{ public static final String COUNTRY_COLUMN = "COUNTRY"; - public Address map(FieldSet fieldSet) { + public Address mapFieldSet(FieldSet fieldSet) { Address address = new Address(); address.setAddressee(fieldSet.readString(ADDRESSEE_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java index d4dc288a8..f4baaa08a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java @@ -27,7 +27,7 @@ public class BillingFieldSetMapper implements FieldSetMapper { public static final String PAYMENT_TYPE_ID_COLUMN = "PAYMENT_TYPE_ID"; public static final String PAYMENT_DESC_COLUMN = "PAYMENT_DESC"; - public BillingInfo map(FieldSet fieldSet) { + public BillingInfo mapFieldSet(FieldSet fieldSet) { BillingInfo info = new BillingInfo(); info.setPaymentId(fieldSet.readString(PAYMENT_TYPE_ID_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java index d59c77a62..fd2750891 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java @@ -34,7 +34,7 @@ public class CustomerFieldSetMapper implements FieldSetMapper { public static final String REG_ID_COLUMN = "REG_ID"; public static final String VIP_COLUMN = "VIP"; - public Customer map(FieldSet fieldSet) { + public Customer mapFieldSet(FieldSet fieldSet) { Customer customer = new Customer(); if (Customer.LINE_ID_BUSINESS_CUST.equals(fieldSet.readString(LINE_ID_COLUMN))) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java index 77b9ea3fd..a7edfabac 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java @@ -27,7 +27,7 @@ public class HeaderFieldSetMapper implements FieldSetMapper { public static final String ORDER_ID_COLUMN = "ORDER_ID"; public static final String ORDER_DATE_COLUMN = "ORDER_DATE"; - public Order map(FieldSet fieldSet) { + public Order mapFieldSet(FieldSet fieldSet) { Order order = new Order(); order.setOrderId(fieldSet.readLong(ORDER_ID_COLUMN)); order.setOrderDate(fieldSet.readDate(ORDER_DATE_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java index f2b890ab3..26dc61c71 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java @@ -33,7 +33,7 @@ public class OrderItemFieldSetMapper implements FieldSetMapper { public static final String ITEM_ID_COLUMN = "ITEM_ID"; - public LineItem map(FieldSet fieldSet) { + public LineItem mapFieldSet(FieldSet fieldSet) { LineItem item = new LineItem(); item.setItemId(fieldSet.readLong(ITEM_ID_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java index 98aefd2ef..a923bc8c6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java @@ -89,7 +89,7 @@ public class OrderItemReader implements ItemReader { // start a new Order if (Order.LINE_ID_HEADER.equals(lineId)) { log.debug("STARTING NEW RECORD"); - order = headerMapper.map(fieldSet); + order = headerMapper.mapFieldSet(fieldSet); return; } @@ -114,7 +114,7 @@ public class OrderItemReader implements ItemReader { log.debug("MAPPING CUSTOMER"); if (order.getCustomer() == null) { - order.setCustomer(customerMapper.map(fieldSet)); + order.setCustomer(customerMapper.mapFieldSet(fieldSet)); order.getCustomer().setBusinessCustomer(true); } @@ -125,7 +125,7 @@ public class OrderItemReader implements ItemReader { log.debug("MAPPING CUSTOMER"); if (order.getCustomer() == null) { - order.setCustomer(customerMapper.map(fieldSet)); + order.setCustomer(customerMapper.mapFieldSet(fieldSet)); order.getCustomer().setBusinessCustomer(false); } @@ -134,25 +134,25 @@ public class OrderItemReader implements ItemReader { if (Address.LINE_ID_BILLING_ADDR.equals(lineId)) { log.debug("MAPPING BILLING ADDRESS"); - order.setBillingAddress(addressMapper.map(fieldSet)); + order.setBillingAddress(addressMapper.mapFieldSet(fieldSet)); return; } if (Address.LINE_ID_SHIPPING_ADDR.equals(lineId)) { log.debug("MAPPING SHIPPING ADDRESS"); - order.setShippingAddress(addressMapper.map(fieldSet)); + order.setShippingAddress(addressMapper.mapFieldSet(fieldSet)); return; } if (BillingInfo.LINE_ID_BILLING_INFO.equals(lineId)) { log.debug("MAPPING BILLING INFO"); - order.setBilling(billingMapper.map(fieldSet)); + order.setBilling(billingMapper.mapFieldSet(fieldSet)); return; } if (ShippingInfo.LINE_ID_SHIPPING_INFO.equals(lineId)) { log.debug("MAPPING SHIPPING INFO"); - order.setShipping(shippingMapper.map(fieldSet)); + order.setShipping(shippingMapper.mapFieldSet(fieldSet)); return; } @@ -162,7 +162,7 @@ public class OrderItemReader implements ItemReader { if (order.getLineItems() == null) { order.setLineItems(new ArrayList()); } - order.getLineItems().add(itemMapper.map(fieldSet)); + order.getLineItems().add(itemMapper.mapFieldSet(fieldSet)); return; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java index 1ff81a519..c7f3be22b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java @@ -28,7 +28,7 @@ public class ShippingFieldSetMapper implements FieldSetMapper { public static final String SHIPPING_TYPE_ID_COLUMN = "SHIPPING_TYPE_ID"; public static final String SHIPPER_ID_COLUMN = "SHIPPER_ID"; - public ShippingInfo map(FieldSet fieldSet) { + public ShippingInfo mapFieldSet(FieldSet fieldSet) { ShippingInfo info = new ShippingInfo(); info.setShipperId(fieldSet.readString(SHIPPER_ID_COLUMN)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java index cfe55b710..b4b887368 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java @@ -16,7 +16,7 @@ import org.springframework.batch.item.file.mapping.FieldSetMapper; */ public class CustomerUpdateFieldSetMapper implements FieldSetMapper { - public CustomerUpdate map(FieldSet fs) { + public CustomerUpdate mapFieldSet(FieldSet fs) { CustomerOperation operation = CustomerOperation.fromCode(fs.readChar(0)); String name = fs.readString(1); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java index 93d037794..4377e02e7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java @@ -29,7 +29,7 @@ public class TradeFieldSetMapper implements FieldSetMapper { public static final int PRICE_COLUMN = 2; public static final int CUSTOMER_COLUMN = 3; - public Trade map(FieldSet fieldSet) { + public Trade mapFieldSet(FieldSet fieldSet) { Trade trade = new Trade(); trade.setIsin(fieldSet.readString(ISIN_COLUMN)); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java index db73d8f07..e97b2959a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java @@ -17,26 +17,26 @@ public class AggregateItemFieldSetMapperTests { @Test public void testDefaultBeginRecord() throws Exception { - assertTrue(mapper.map(new DefaultFieldSet(new String[] { "BEGIN" })).isHeader()); - assertFalse(mapper.map(new DefaultFieldSet(new String[] { "BEGIN" })).isFooter()); + assertTrue(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "BEGIN" })).isHeader()); + assertFalse(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "BEGIN" })).isFooter()); } @Test public void testSetBeginRecord() throws Exception { mapper.setBegin("FOO"); - assertTrue(mapper.map(new DefaultFieldSet(new String[] { "FOO" })).isHeader()); + assertTrue(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "FOO" })).isHeader()); } @Test public void testDefaultEndRecord() throws Exception { - assertFalse(mapper.map(new DefaultFieldSet(new String[] { "END" })).isHeader()); - assertTrue(mapper.map(new DefaultFieldSet(new String[] { "END" })).isFooter()); + assertFalse(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "END" })).isHeader()); + assertTrue(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "END" })).isFooter()); } @Test public void testSetEndRecord() throws Exception { mapper.setEnd("FOO"); - assertTrue(mapper.map(new DefaultFieldSet(new String[] { "FOO" })).isFooter()); + assertTrue(mapper.mapFieldSet(new DefaultFieldSet(new String[] { "FOO" })).isFooter()); } @Test @@ -53,11 +53,11 @@ public class AggregateItemFieldSetMapperTests { @Test public void testDelegate() throws Exception { mapper.setDelegate(new FieldSetMapper() { - public String map(FieldSet fs) { + public String mapFieldSet(FieldSet fs) { return "foo"; } }); - assertEquals("foo", mapper.map(new DefaultFieldSet(new String[] { "FOO" })).getItem()); + assertEquals("foo", mapper.mapFieldSet(new DefaultFieldSet(new String[] { "FOO" })).getItem()); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java index 403d10272..f32209533 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java @@ -84,13 +84,13 @@ public class OrderItemReaderTests { // create mock mapper FieldSetMapper mapper = createMock(FieldSetMapper.class); // set how mapper should respond - set return values for mapper - expect(mapper.map(headerFS)).andReturn(order); - expect(mapper.map(customerFS)).andReturn(customer); - expect(mapper.map(billingFS)).andReturn(billing); - expect(mapper.map(shippingFS)).andReturn(shipping); - expect(mapper.map(billingInfoFS)).andReturn(billingInfo); - expect(mapper.map(shippingInfoFS)).andReturn(shippingInfo); - expect(mapper.map(itemFS)).andReturn(item).times(3); + expect(mapper.mapFieldSet(headerFS)).andReturn(order); + expect(mapper.mapFieldSet(customerFS)).andReturn(customer); + expect(mapper.mapFieldSet(billingFS)).andReturn(billing); + expect(mapper.mapFieldSet(shippingFS)).andReturn(shipping); + expect(mapper.mapFieldSet(billingInfoFS)).andReturn(billingInfo); + expect(mapper.mapFieldSet(shippingInfoFS)).andReturn(shippingInfo); + expect(mapper.mapFieldSet(itemFS)).andReturn(item).times(3); replay(mapper); // set-up provider: set mappers diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java index 844a2b1ab..1fe8d2bda 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java @@ -38,7 +38,7 @@ public abstract class AbstractFieldSetMapperTests { */ @Test public void testRegularUse() throws Exception { - assertEquals(expectedDomainObject(), fieldSetMapper().map(fieldSet())); + assertEquals(expectedDomainObject(), fieldSetMapper().mapFieldSet(fieldSet())); } }