From e504a887afa6b3d3ab6a4da36aa5a9477da84d83 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 26 Aug 2008 06:27:04 +0000 Subject: [PATCH] Fix Javadocs --- .../support/AbstractSqlPagingQueryProvider.java | 17 +++++++---------- .../support/OraclePagingQueryProvider.java | 5 ----- .../support/DerbyPagingQueryProviderTests.java | 1 - .../SqlWindowingPagingQueryProviderTests.java | 1 - 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java index 0cf3fe07a..f2b729cf8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java @@ -15,22 +15,19 @@ */ package org.springframework.batch.item.database.support; -import org.springframework.util.Assert; -import org.springframework.jdbc.support.MetaDataAccessException; -import org.springframework.jdbc.support.JdbcUtils; -import org.springframework.dao.InvalidDataAccessResourceUsageException; - import javax.sql.DataSource; +import org.springframework.util.Assert; + /** * Abstract SQL Paging Query Provider to serve as a base class for all provided SQL paging query providers. * * Any implementation must provide a way to specify the select clause, from clause and optionally a where clause. * In addition a way to specify a single column sort key must also be provided. This sort key will be used to - * provide the paging functinality. It is recommended that there should be an index for the sort key to provide + * provide the paging functionality. It is recommended that there should be an index for the sort key to provide * better performance. * - * Provides properties and preperation for the mandatory "selectClause" and "fromClause" as well as for the + * Provides properties and preparation for the mandatory "selectClause" and "fromClause" as well as for the * optional "whereClause". Also provides property for the mandatory "sortKey". * * @author Thomas Risberg @@ -84,7 +81,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi /** * - * @return + * @return SQL "from" clause */ protected String getFromClause() { return fromClause; @@ -106,7 +103,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi /** * - * @return + * @return WHERE clause part of SQL query string */ protected String getWhereClause() { return whereClause; @@ -121,7 +118,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi /** * - * @return + * @return sortKey key to use to sort and limit page content */ protected String getSortKey() { return sortKey; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/OraclePagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/OraclePagingQueryProvider.java index a7ddcc3fe..1b278ab1f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/OraclePagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/OraclePagingQueryProvider.java @@ -1,10 +1,5 @@ package org.springframework.batch.item.database.support; -import org.springframework.jdbc.support.JdbcUtils; -import org.springframework.dao.InvalidDataAccessResourceUsageException; - -import javax.sql.DataSource; - /** * Oracle implementation of a {@link org.springframework.batch.item.database.support.PagingQueryProvider} using * database specific features. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DerbyPagingQueryProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DerbyPagingQueryProviderTests.java index d80327ce6..f641ec196 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DerbyPagingQueryProviderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DerbyPagingQueryProviderTests.java @@ -27,7 +27,6 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException; import javax.sql.DataSource; import java.sql.DatabaseMetaData; -import java.sql.SQLException; import java.sql.Connection; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java index e8d99156c..2496f8fcc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java @@ -18,7 +18,6 @@ package org.springframework.batch.item.database.support; import static org.junit.Assert.*; import org.junit.Test; -import org.junit.Before; /** * @author Thomas Risberg