IN PROGRESS - issue BATCH-267: Re-organise I/O (io) packages

http://jira.springframework.org/browse/BATCH-267

Remove package cycles

spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java

@@ -48,15 +48,22 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
 
 	/**
 	 * check that records have been correctly written to database
+	 * @throws Exception 
 	 */
-	protected void validatePostConditions() {
+	protected void validatePostConditions() throws Exception {
 
 		inputSource.open();
 
 		jdbcTemplate.query("SELECT ID, ISIN, QUANTITY, PRICE, CUSTOMER FROM trade ORDER BY id", new RowCallbackHandler() {
 
 			public void processRow(ResultSet rs) throws SQLException {
-				Trade trade = (Trade)inputSource.read();
+				Trade trade;
+				try {
+					trade = (Trade)inputSource.read();
+				}
+				catch (Exception e) {
+					throw new IllegalStateException(e);
+				}
 				assertEquals(trade.getIsin(), rs.getString(2));
 				assertEquals(trade.getQuantity(),rs.getLong(3));
 				assertEquals(trade.getPrice(), rs.getBigDecimal(4));

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemReaderTests.java

@@ -5,8 +5,8 @@ import java.util.Iterator;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.validator.Validator;
 import org.springframework.batch.sample.domain.Address;

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.mapping;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
 
 import junit.framework.TestCase;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.mapping;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.mapping.AddressFieldSetMapper;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.mapping;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+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;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.mapping;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.sample.domain.Customer;
 import org.springframework.batch.sample.mapping.CustomerFieldSetMapper;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java

@@ -2,8 +2,8 @@ package org.springframework.batch.sample.mapping;
 
 import java.util.Calendar;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+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;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java

@@ -2,8 +2,8 @@ package org.springframework.batch.sample.mapping;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+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;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.mapping;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.sample.domain.ShippingInfo;
 import org.springframework.batch.sample.mapping.ShippingFieldSetMapper;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java

@@ -2,8 +2,9 @@ package org.springframework.batch.sample.mapping;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.io.file.FieldSet;
-import org.springframework.batch.io.file.FieldSetMapper;
+import org.springframework.batch.io.file.mapping.FieldSet;
+import org.springframework.batch.io.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.provider.AggregateItemReader;
 import org.springframework.batch.sample.domain.Trade;
 import org.springframework.batch.sample.mapping.TradeFieldSetMapper;
 
@@ -38,11 +39,11 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests{
 	}
 	
 	public void testBeginRecord() throws Exception {
-		assertEquals(FieldSetMapper.BEGIN_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"BEGIN"})));
+		assertEquals(AggregateItemReader.BEGIN_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"BEGIN"})));
 	}
 
 	public void testEndRecord() throws Exception {
-		assertEquals(FieldSetMapper.END_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"END"})));
+		assertEquals(AggregateItemReader.END_RECORD, fieldSetMapper().mapLine(new FieldSet(new String[] {"END"})));
 	}
 
 }