Moved Order to remove package circular dependency

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

@@ -31,7 +31,6 @@ import javax.sql.DataSource;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStreamException;
-import org.springframework.batch.item.database.support.Order;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.database.support;
+package org.springframework.batch.item.database;
 
 /**
  * The direction of the sort in an ORDER BY clause.

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

@@ -20,7 +20,6 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.item.database.support.Order;
 
 /**
  * Interface defining the functionality to be provided for generating paging queries for use with Paging

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

@@ -24,6 +24,7 @@ import java.util.Map;
 import javax.sql.DataSource;
 
 import org.springframework.batch.item.database.JdbcParameterUtils;
+import org.springframework.batch.item.database.Order;
 import org.springframework.batch.item.database.PagingQueryProvider;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.util.Assert;

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

@@ -18,6 +18,8 @@ package org.springframework.batch.item.database.support;
 
 import java.util.Map;
 
+import org.springframework.batch.item.database.Order;
+
 /**
  * Oracle implementation of a
  * {@link org.springframework.batch.item.database.PagingQueryProvider} using

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

@@ -32,6 +32,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
+import org.springframework.batch.item.database.Order;
 import org.springframework.batch.item.database.PagingQueryProvider;
 import org.springframework.batch.support.DatabaseType;
 import org.springframework.beans.factory.FactoryBean;

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

@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.springframework.batch.item.database.Order;
 import org.springframework.util.StringUtils;
 
 /**

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

@@ -18,6 +18,7 @@ package org.springframework.batch.item.database.support;
 
 import java.util.Map;
 
+import org.springframework.batch.item.database.Order;
 import org.springframework.util.StringUtils;
 
 /**