Remove cycles in fieldset references and paging queries

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java

@@ -16,7 +16,6 @@
 
 package org.springframework.batch.item.database;
 
-import org.springframework.batch.item.database.support.PagingQueryProvider;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.Assert;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/PagingQueryProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.database.support;
+package org.springframework.batch.item.database;
 
 import javax.sql.DataSource;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java

@@ -20,6 +20,7 @@ import javax.sql.DataSource;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.batch.item.database.PagingQueryProvider;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
 import java.util.List;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/Db2PagingQueryProvider.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.item.database.support;
 
+import org.springframework.batch.item.database.PagingQueryProvider;
+
 /**
  * DB2 implementation of a {@link PagingQueryProvider} using
  * database specific features.

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java

@@ -17,6 +17,7 @@
 package org.springframework.batch.item.database.support;
 
 import org.springframework.jdbc.support.JdbcUtils;
+import org.springframework.batch.item.database.PagingQueryProvider;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
 import javax.sql.DataSource;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/HsqlPagingQueryProvider.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.item.database.support;
 
 /**
- * HSQLDB implementation of a {@link org.springframework.batch.item.database.support.PagingQueryProvider} using database specific features.
+ * HSQLDB implementation of a {@link org.springframework.batch.item.database.PagingQueryProvider} using database specific features.
  *
  * @author Thomas Risberg
  * @since 2.0

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MySqlPagingQueryProvider.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.item.database.support;
 
+import org.springframework.batch.item.database.PagingQueryProvider;
+
 /**
  * MySQL implementation of a {@link PagingQueryProvider} using database specific features.
  *

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/OraclePagingQueryProvider.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.item.database.support;
 
 /**
- * Oracle implementation of a {@link org.springframework.batch.item.database.support.PagingQueryProvider} using
+ * Oracle implementation of a {@link org.springframework.batch.item.database.PagingQueryProvider} using
  * database specific features.
  *
  * @author Thomas Risberg

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/PostgresPagingQueryProvider.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.item.database.support;
 
 /**
- * Postgres implementation of a  {@link org.springframework.batch.item.database.support.PagingQueryProvider} using database specific features.
+ * Postgres implementation of a  {@link org.springframework.batch.item.database.PagingQueryProvider} using database specific features.
  *
  * @author Thomas Risberg
  * @since 2.0

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlServerPagingQueryProvider.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.item.database.support;
 
 /**
- * Sql Server implementation of a {@link org.springframework.batch.item.database.support.PagingQueryProvider} using
+ * Sql Server implementation of a {@link org.springframework.batch.item.database.PagingQueryProvider} using
  * database specific features.
  *
  * @author Thomas Risberg

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SybasePagingQueryProvider.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.item.database.support;
 
+import org.springframework.batch.item.database.PagingQueryProvider;
+
 /**
  * Sybase implementation of a {@link PagingQueryProvider} using
  * database specific features.

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java

@@ -24,6 +24,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.support.DefaultPropertyEditorRegistrar;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.MutablePropertyValues;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java

@@ -1,5 +1,6 @@
 package org.springframework.batch.item.file.mapping;
 
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/FieldSetMapper.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.item.file.mapping;
 
+import org.springframework.batch.item.file.transform.FieldSet;
+
 
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/LineMapper.java

@@ -1,12 +1,10 @@
 package org.springframework.batch.item.file.mapping;
 
-import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
 
 /**
- * Interface for mapping lines (strings) to domain objects typically used by
- * {@link FlatFileItemReader} to map lines read from a file to domain objects
+ * Interface for mapping lines (strings) to domain objects typically used to map lines read from a file to domain objects
  * on a per line basis.  Implementations of this interface perform the actual
  * work of parsing a line without having to deal with how the line was
  * obtained.  

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.batch.item.file.mapping;
 
+import org.springframework.batch.item.file.transform.FieldSet;
+
 /**
  * Pass through {@link FieldSetMapper} useful for passing a {@link FieldSet}
  * back directly rather than a mapped object.

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java

@@ -19,8 +19,6 @@ package org.springframework.batch.item.file.transform;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.file.mapping;
+package org.springframework.batch.item.file.transform;
 
 import java.math.BigDecimal;
 import java.text.ParseException;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FieldSet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.file.mapping;
+package org.springframework.batch.item.file.transform;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/LineTokenizer.java

@@ -16,7 +16,6 @@
 
 package org.springframework.batch.item.file.transform;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 /**
  * Interface that is used by framework to split string obtained typically from a

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizer.java

@@ -20,8 +20,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 public class PrefixMatchingCompositeLineTokenizer implements LineTokenizer {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java

@@ -24,6 +24,8 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java

@@ -4,6 +4,8 @@ import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
 /**

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapperTests.java

@@ -15,6 +15,9 @@
  */
 package org.springframework.batch.item.file.mapping;
 
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
+
 import junit.framework.TestCase;
 
 /**
@@ -27,7 +30,7 @@ public class PassThroughFieldSetMapperTests extends TestCase {
 
 	/**
 	 * Test method for
-	 * {@link org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper#mapFieldSet(org.springframework.batch.item.file.mapping.FieldSet)}.
+	 * {@link org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper#mapFieldSet(org.springframework.batch.item.file.transform.FieldSet)}.
 	 */
 	public void testMapLine() {
 		FieldSet fieldSet = new DefaultFieldSet(new String[] { "foo", "bar" });

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizerTests.java

@@ -18,7 +18,6 @@ package org.springframework.batch.item.file.transform;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 public class DelimitedLineTokenizerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FieldSetTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.file;
+package org.springframework.batch.item.file.transform;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 public class FieldSetTests extends TestCase {
 	FieldSet fieldSet;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FixedLengthTokenizerTests.java

@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 public class FixedLengthTokenizerTests {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PrefixMatchingCompositeLineTokenizerTests.java

@@ -23,8 +23,6 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 
 public class PrefixMatchingCompositeLineTokenizerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java

@@ -23,9 +23,9 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.DefaultLineMapper;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java

@@ -18,7 +18,7 @@ package org.springframework.batch.repeat.support;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 /**
  * @author Rob Harrop

spring-batch-samples/src/main/java/org/springframework/batch/sample/common/FieldSetResultSetExtractor.java

@@ -22,8 +22,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 /**
  * ResultSetExtractor implementation that returns list of FieldSets

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.domain.football.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.football.Game;
 
 public class GameFieldSetMapper implements FieldSetMapper<Game> {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.sample.domain.football.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.football.Player;
 
 public class PlayerFieldSetMapper implements FieldSetMapper<Player> {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapper.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.sample.domain.multiline;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/AddressFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.Address;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/BillingFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.BillingInfo;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/CustomerFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.Customer;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/HeaderFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.Order;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.LineItem;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/OrderItemReader.java

@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.Address;
 import org.springframework.batch.sample.domain.order.BillingInfo;
 import org.springframework.batch.sample.domain.order.Customer;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/ShippingFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.order.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.ShippingInfo;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizer.java

@@ -5,7 +5,7 @@ package org.springframework.batch.sample.domain.trade;
 
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.listener.StepExecutionListenerSupport;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateFieldSetMapper.java

@@ -5,8 +5,8 @@ package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 /**
  * {@link FieldSetMapper} for mapping the 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.trade.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.sample.domain.trade.internal;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.Trade;
 
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java

@@ -6,9 +6,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.multiline.AggregateItemFieldSetMapper;
 
 public class AggregateItemFieldSetMapperTests {

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

@@ -1,8 +1,8 @@
 package org.springframework.batch.sample.domain.order;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.AddressFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

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

@@ -1,8 +1,8 @@
 package org.springframework.batch.sample.domain.order;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.BillingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

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

@@ -1,8 +1,8 @@
 package org.springframework.batch.sample.domain.order;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.CustomerFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

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

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.domain.order;
 
 import java.util.Calendar;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.HeaderFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

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

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.domain.order;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.OrderItemFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java

@@ -11,9 +11,9 @@ import java.util.Iterator;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.OrderItemReader;
 
 public class OrderItemReaderTests {

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

@@ -1,8 +1,8 @@
 package org.springframework.batch.sample.domain.order;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.order.internal.ShippingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java

@@ -7,8 +7,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.item.file.transform.LineTokenizer;
 
 /**

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReader.java

@@ -21,7 +21,7 @@ import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.file.FlatFileItemReader;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.util.Assert;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReaderTests.java

@@ -23,8 +23,8 @@ import java.math.BigDecimal;
 
 import org.junit.Test;
 import org.springframework.batch.item.file.FlatFileItemReader;
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.Trade;
 
 /**

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/PrefixMatchingCompositeFieldSetMapper.java

@@ -19,8 +19,8 @@ package org.springframework.batch.sample.iosample.internal;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 /**
  * This class is used to delegate to a {@link FieldSetMapper} based on one field

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/PrefixMatchingCompositeFieldSetMapperTests.java

@@ -23,9 +23,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.batch.item.file.mapping.DefaultFieldSet;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.DefaultFieldSet;
+import org.springframework.batch.item.file.transform.FieldSet;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.domain.trade.internal.CustomerCreditFieldSetMapper;

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

@@ -3,8 +3,8 @@ package org.springframework.batch.sample.support;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.file.transform.FieldSet;
 
 /**
  * Encapsulates basic logic for testing custom {@link FieldSetMapper} implementations.