Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 37858 invoked from network); 3 Nov 2006 20:20:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Nov 2006 20:20:35 -0000 Received: (qmail 82037 invoked by uid 500); 3 Nov 2006 20:20:44 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 81963 invoked by uid 500); 3 Nov 2006 20:20:44 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 81952 invoked by uid 500); 3 Nov 2006 20:20:44 -0000 Received: (qmail 81949 invoked by uid 99); 3 Nov 2006 20:20:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:20:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:20:32 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 38C241A9846; Fri, 3 Nov 2006 12:20:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470975 - in /jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers: ArrayListHandler.java BeanListHandler.java ColumnListHandler.java MapListHandler.java Date: Fri, 03 Nov 2006 20:20:07 -0000 To: commons-cvs@jakarta.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061103202007.38C241A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bayard Date: Fri Nov 3 12:20:06 2006 New Revision: 470975 URL: http://svn.apache.org/viewvc?view=rev&rev=470975 Log: Applying the code refactoring in #DBUTILS-16 - the new abstract class is currently not public. In a later release we can decide whether to make it public or not (this is recorded in #DBUTILS-33 Modified: jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java Modified: jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java?view=diff&rev=470975&r1=470974&r2=470975 ============================================================================== --- jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java (original) +++ jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java Fri Nov 3 12:20:06 2006 @@ -17,8 +17,6 @@ import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.dbutils.ResultSetHandler; import org.apache.commons.dbutils.RowProcessor; @@ -30,7 +28,7 @@ * * @see ResultSetHandler */ -public class ArrayListHandler implements ResultSetHandler { +public class ArrayListHandler extends GenericListHandler { /** * The RowProcessor implementation to use when converting rows @@ -57,26 +55,17 @@ this.convert = convert; } + /** - * Convert each row's columns into an Object[] and store them - * in a List in the same order they are returned from the - * ResultSet.next() method. - * - * @return A List of Object[]s, never - * null. - * - * @throws SQLException - * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) - */ - public Object handle(ResultSet rs) throws SQLException { - - List result = new ArrayList(); - - while (rs.next()) { - result.add(this.convert.toArray(rs)); - } - - return result; - } + * Convert row's columns into an Object[]. + * + * @return Object[], never null. + * + * @throws SQLException + * @see org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet) + */ + protected Object handleRow(ResultSet rs) throws SQLException { + return this.convert.toArray(rs); + } } Modified: jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java?view=diff&rev=470975&r1=470974&r2=470975 ============================================================================== --- jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java (original) +++ jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java Fri Nov 3 12:20:06 2006 @@ -28,7 +28,7 @@ * * @see ResultSetHandler */ -public class BeanListHandler implements ResultSetHandler { +public class BeanListHandler extends GenericListHandler { /** * The Class of beans produced by this handler. @@ -65,17 +65,16 @@ } /** - * Convert the ResultSet rows into a List of - * beans with the Class given in the constructor. + * Convert the ResultSet row into a bean with + * the Class given in the constructor. * - * @return A List of beans (one for each row), never - * null. + * @return A bean, never null. * * @throws SQLException - * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) + * @see org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet) */ - public Object handle(ResultSet rs) throws SQLException { - return this.convert.toBeanList(rs, type); + protected Object handleRow(ResultSet rs) throws SQLException { + return this.convert.toBean(rs, type); } } Modified: jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java?view=diff&rev=470975&r1=470974&r2=470975 ============================================================================== --- jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java (original) +++ jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java Fri Nov 3 12:20:06 2006 @@ -18,8 +18,6 @@ import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.dbutils.ResultSetHandler; @@ -31,7 +29,7 @@ * @see ResultSetHandler * @since DbUtils 1.1 */ -public class ColumnListHandler implements ResultSetHandler { +public class ColumnListHandler extends GenericListHandler { /** * The column number to retrieve. @@ -73,28 +71,20 @@ } /** - * Returns one ResultSet column as a List of - * Objects. The elements are added to the List via - * the ResultSet.getObject() method. + * Returns one ResultSet column value as Object. * - * @return A List of Objects, never - * null. + * @return Object, never null. * * @throws SQLException * - * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) + * @see org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet) */ - public Object handle(ResultSet rs) throws SQLException { - - List result = new ArrayList(); - - while (rs.next()) { - if (this.columnName == null) { - result.add(rs.getObject(this.columnIndex)); - } else { - result.add(rs.getObject(this.columnName)); - } + protected Object handleRow(ResultSet rs) throws SQLException { + if (this.columnName == null) { + return rs.getObject(this.columnIndex); + } else { + return rs.getObject(this.columnName); } - return result; - } + } + } Modified: jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java?view=diff&rev=470975&r1=470974&r2=470975 ============================================================================== --- jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java (original) +++ jakarta/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/MapListHandler.java Fri Nov 3 12:20:06 2006 @@ -17,8 +17,6 @@ import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.dbutils.ResultSetHandler; import org.apache.commons.dbutils.RowProcessor; @@ -30,7 +28,7 @@ * * @see ResultSetHandler */ -public class MapListHandler implements ResultSetHandler { +public class MapListHandler extends GenericListHandler { /** * The RowProcessor implementation to use when converting rows @@ -58,24 +56,16 @@ } /** - * Converts the ResultSet rows into a List of - * Map objects. + * Converts the ResultSet row into a Map object. * - * @return A List of Maps, never null. + * @return A Map, never null. * * @throws SQLException * - * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) + * @see org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet) */ - public Object handle(ResultSet rs) throws SQLException { - - List results = new ArrayList(); - - while (rs.next()) { - results.add(this.convert.toMap(rs)); - } - - return results; + protected Object handleRow(ResultSet rs) throws SQLException { + return this.convert.toMap(rs); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org