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 {