Changed QueryExecutor to be public and ArrayHandler to be generic git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbutils/branches/2_0@1481176 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/9784827b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/9784827b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/9784827b Branch: refs/heads/2_0 Commit: 9784827b6a72701d84cb037ac1cae95c90729292 Parents: 3f4dcc9 Author: Bill Speirs <[email protected]> Authored: Fri May 10 20:17:24 2013 +0000 Committer: Bill Speirs <[email protected]> Committed: Fri May 10 20:17:24 2013 +0000 ---------------------------------------------------------------------- .../java/org/apache/commons/dbutils2/QueryExecutor.java | 2 +- .../apache/commons/dbutils2/handlers/ArrayHandler.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/9784827b/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java b/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java index fe59db1..5fc5c25 100644 --- a/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java +++ b/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java @@ -25,7 +25,7 @@ import java.sql.SQLException; * * @since 2.0 */ -class QueryExecutor extends AbstractExecutor<QueryExecutor> { +public class QueryExecutor extends AbstractExecutor<QueryExecutor> { private final boolean closeConn; http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/9784827b/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java b/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java index 0863894..ddac362 100644 --- a/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java +++ b/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java @@ -25,12 +25,12 @@ import org.apache.commons.dbutils2.RowProcessor; /** * <code>ResultSetHandler</code> implementation that converts a - * <code>ResultSet</code> into an <code>Object[]</code>. This class is + * <code>ResultSet</code> into an <code>T[]</code>. This class is * thread safe. * * @see org.apache.commons.dbutils2.ResultSetHandler */ -public class ArrayHandler implements ResultSetHandler<Object[]> { +public class ArrayHandler<T> implements ResultSetHandler<T[]> { /** * Singleton processor instance that handlers share to save memory. Notice @@ -65,17 +65,17 @@ public class ArrayHandler implements ResultSetHandler<Object[]> { } /** - * Places the column values from the first row in an <code>Object[]</code>. + * Places the column values from the first row in an <code>T[]</code>. * @param rs <code>ResultSet</code> to process. - * @return An Object[] or <code>null</code> if there are no rows in the + * @return An T[] or <code>null</code> if there are no rows in the * <code>ResultSet</code>. * * @throws SQLException if a database access error occurs * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public Object[] handle(ResultSet rs) throws SQLException { - return rs.next() ? this.convert.toArray(rs) : null; + public T[] handle(ResultSet rs) throws SQLException { + return (T[]) (rs.next() ? this.convert.toArray(rs) : null); } }
