remove dead code related to PagingQueryProvider#generateJumpToItemQuery

spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/database/JdbcPagingQueryIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider;
@@ -169,27 +168,6 @@ private Map<String, Object> getStartAfterValues(
 		return startAfterValues;
 	}
 
-	@Test
-	@Ignore
-	public void testJumpToItem() throws Exception {
-
-		PagingQueryProvider queryProvider = getPagingQueryProvider();
-
-		int minId = jdbcTemplate.queryForObject("SELECT MIN(VALUE) FROM T_FOOS", Integer.class);
-
-		String query = queryProvider.generateJumpToItemQuery(pageSize, pageSize);
-		List<Map<String, Object>> list = jdbcTemplate.queryForList(query);
-		logger.debug("Jump to page result: " + list);
-		assertEquals(1, list.size());
-		System.err.println(list);
-		String expected = "[{value=" + (minId + pageSize - 1);
-		assertEquals(expected, list.toString().toLowerCase().substring(0, expected.length()));
-		Object startAfterValue = list.get(0).entrySet().iterator().next().getValue();
-		list = jdbcTemplate.queryForList(queryProvider.generateRemainingPagesQuery(pageSize), startAfterValue);
-		assertEquals(pageSize, list.size());
-		expected = "[{id=" + (minId + pageSize);
-	}
-
 	protected PagingQueryProvider getPagingQueryProvider() throws Exception {
 
 		SqlPagingQueryProviderFactoryBean factory = new SqlPagingQueryProviderFactoryBean();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -262,26 +262,6 @@ public void open(ExecutionContext executionContext) {
 
 	@Override
 	protected void doJumpToPage(int itemIndex) {
-		/*
-		 * Normally this would be false (the startAfterValue is enough
-		 * information to restart from.
-		 */
-		// TODO: this is dead code, startAfterValues is never null - see #open(ExecutionContext)
-		if (startAfterValues == null && getPage() > 0) {
-
-			String jumpToItemSql = queryProvider.generateJumpToItemQuery(itemIndex, getPageSize());
-
-			if (logger.isDebugEnabled()) {
-				logger.debug("SQL used for jumping: [" + jumpToItemSql + "]");
-			}
-
-			if (this.queryProvider.isUsingNamedParameters()) {
-				startAfterValues = namedParameterJdbcTemplate.queryForMap(jumpToItemSql, getParameterMap(parameterValues, null));
-			}
-			else {
-				startAfterValues = getJdbcTemplate().queryForMap(jumpToItemSql, getParameterList(parameterValues, null).toArray());
-			}
-		}
 	}
 
 	private Map<String, Object> getParameterMap(Map<String, Object> values, Map<String, Object> sortKeyValues) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,18 +53,6 @@ public interface PagingQueryProvider {
 	 */
 	String generateRemainingPagesQuery(int pageSize);
 
-	/**
-	 *
-	 * Generate the query that will provide the jump to item query.  The itemIndex provided could be in the middle of
-	 * the page and together with the page size it will be used to calculate the last index of the preceding page
-	 * to be able to retrieve the sort key for this row.
-	 *
-	 * @param itemIndex the index for the next item to be read
-	 * @param pageSize number of rows to read for each page
-	 * @return the generated query
-	 */
-	String generateJumpToItemQuery(int itemIndex, int pageSize);
-
 	/**
 	 * The number of parameters that are declared in the query
 	 * @return number of parameters

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,17 +226,6 @@ public void init(DataSource dataSource) throws Exception {
     @Override
 	public abstract String generateRemainingPagesQuery(int pageSize);
 
-	/**
-	 * Method generating the query string to be used for jumping to a specific
-	 * item position. This method must be implemented in sub classes.
-	 * 
-	 * @param itemIndex the index of the item to jump to
-	 * @param pageSize number of rows to read per page
-	 * @return query string
-	 */
-    @Override
-	public abstract String generateJumpToItemQuery(int itemIndex, int pageSize);
-
 	private String removeKeyWord(String keyWord, String clause) {
 		String temp = clause.trim();
 		String keyWordString = keyWord + " ";

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,14 +38,4 @@ private String buildTopClause(int pageSize) {
 		return new StringBuilder().append("TOP ").append(pageSize).toString();
 	}
 
-	@Override
-	public String generateJumpToItemQuery(int itemIndex, int pageSize) {
-		int page = itemIndex / pageSize;
-		int offset = (page * pageSize) - 1;
-		offset = offset<0 ? 0 : offset;
-
-		String topClause = new StringBuilder().append("LIMIT ").append(offset).append(" 1").toString();
-		return SqlPagingQueryUtils.generateTopJumpToQuery(this, topClause);
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,14 +46,4 @@ private String buildTopClause(int pageSize) {
 		return new StringBuilder().append("TOP ").append(pageSize).toString();
 	}
 
-	@Override
-	public String generateJumpToItemQuery(int itemIndex, int pageSize) {
-		int page = itemIndex / pageSize;
-		int offset = (page * pageSize) - 1;
-		offset = offset<0 ? 0 : offset;
-
-		String topClause = new StringBuilder().append("LIMIT ").append(offset).append(" 1").toString();
-		return SqlPagingQueryUtils.generateTopJumpToQuery(this, topClause);
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,14 +47,4 @@ private String buildLimitClause(int pageSize) {
 		return new StringBuilder().append("LIMIT ").append(pageSize).toString();
 	}
 
-	@Override
-	public String generateJumpToItemQuery(int itemIndex, int pageSize) {
-		int page = itemIndex / pageSize;
-		int offset = (page * pageSize) - 1;
-		offset = offset<0 ? 0 : offset;
-
-		String limitClause = new StringBuilder().append("LIMIT ").append(offset).append(", 1").toString();
-		return SqlPagingQueryUtils.generateLimitJumpToQuery(this, limitClause);
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 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
@@ -41,29 +37,6 @@ public String generateRemainingPagesQuery(int pageSize) {
 		return SqlPagingQueryUtils.generateRowNumSqlQuery(this, true, buildRowNumClause(pageSize));
 	}
 
-	@Override
-	public String generateJumpToItemQuery(int itemIndex, int pageSize) {
-		int page = itemIndex / pageSize;
-		int offset = (page * pageSize);
-		offset = offset == 0 ? 1 : offset;
-		String sortKeySelect = this.getSortKeySelect();
-		return SqlPagingQueryUtils.generateRowNumSqlQueryWithNesting(this, sortKeySelect, sortKeySelect, false, "TMP_ROW_NUM = "
-				+ offset);
-	}
-
-	private String getSortKeySelect() {
-		StringBuilder sql = new StringBuilder();
-		String prefix = "";
-
-		for (Map.Entry<String, Order> sortKey : this.getSortKeys().entrySet()) {
-			sql.append(prefix);
-			prefix = ", ";
-			sql.append(sortKey.getKey());
-		}
-
-		return sql.toString();
-	}
-
 	private String buildRowNumClause(int pageSize) {
 		return new StringBuilder().append("ROWNUM <= ").append(pageSize).toString();
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2012 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,14 +48,5 @@ public String generateRemainingPagesQuery(int pageSize) {
 	private String buildLimitClause(int pageSize) {
 		return new StringBuilder().append("LIMIT ").append(pageSize).toString();
 	}
-
-	@Override
-	public String generateJumpToItemQuery(int itemIndex, int pageSize) {
-		int page = itemIndex / pageSize;
-		int offset = (page * pageSize) - 1;
-		offset = offset<0 ? 0 : offset;
-		String limitClause = new StringBuilder().append("LIMIT 1 OFFSET ").append(offset).toString();
-		return SqlPagingQueryUtils.generateLimitJumpToQuery(this, limitClause);
-	}
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2015 the original author or authors.
+ * Copyright 2006-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -179,66 +179,6 @@ public static String generateRowNumSqlQuery(AbstractSqlPagingQueryProvider provi
 
 	}
 
-	public static String generateRowNumSqlQueryWithNesting(AbstractSqlPagingQueryProvider provider,
-			String selectClause, boolean remainingPageQuery, String rowNumClause) {
-		return generateRowNumSqlQueryWithNesting(provider, selectClause, selectClause, remainingPageQuery, rowNumClause);
-	}
-
-	public static String generateRowNumSqlQueryWithNesting(AbstractSqlPagingQueryProvider provider,
-			String innerSelectClause, String outerSelectClause, boolean remainingPageQuery, String rowNumClause) {
-
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ").append(outerSelectClause).append(" FROM (SELECT ").append(outerSelectClause)
-				.append(", ").append(StringUtils.hasText(provider.getGroupClause()) ? "MIN(ROWNUM) as TMP_ROW_NUM" : "ROWNUM as TMP_ROW_NUM");
-		sql.append(" FROM (SELECT ").append(innerSelectClause).append(" FROM ").append(provider.getFromClause());
-		buildWhereClause(provider, remainingPageQuery, sql);
-		buildGroupByClause(provider, sql);
-		sql.append(" ORDER BY ").append(buildSortClause(provider));
-		sql.append(")) WHERE ").append(rowNumClause);
-
-		return sql.toString();
-
-	}
-
-	/**
-	 * Generate SQL query string using a LIMIT clause
-	 * 
-	 * @param provider {@link AbstractSqlPagingQueryProvider} providing the
-	 * implementation specifics
-	 * @param limitClause the implementation specific top clause to be used
-	 * @return the generated query
-	 */
-	public static String generateLimitJumpToQuery(AbstractSqlPagingQueryProvider provider, String limitClause) {
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ").append(buildSortKeySelect(provider));
-		sql.append(" FROM ").append(provider.getFromClause());
-		sql.append(provider.getWhereClause() == null ? "" : " WHERE " + provider.getWhereClause());
-		buildGroupByClause(provider, sql);
-		sql.append(" ORDER BY ").append(buildSortClause(provider));
-		sql.append(" " + limitClause);
-
-		return sql.toString();
-	}
-
-	/**
-	 * Generate SQL query string using a TOP clause
-	 * 
-	 * @param provider {@link AbstractSqlPagingQueryProvider} providing the
-	 * implementation specifics
-	 * @param topClause the implementation specific top clause to be used
-	 * @return the generated query
-	 */
-	public static String generateTopJumpToQuery(AbstractSqlPagingQueryProvider provider, String topClause) {
-		StringBuilder sql = new StringBuilder();
-		sql.append("SELECT ").append(topClause).append(" ").append(buildSortKeySelect(provider));
-		sql.append(" FROM ").append(provider.getFromClause());
-		sql.append(provider.getWhereClause() == null ? "" : " WHERE " + provider.getWhereClause());
-		buildGroupByClause(provider, sql);
-		sql.append(" ORDER BY ").append(buildSortClause(provider));
-
-		return sql.toString();
-	}
-
 	/**
 	 * Generates ORDER BY attributes based on the sort keys.
 	 *