commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r1481740 - in /commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2: ./ handlers/ wrappers/
Date Mon, 13 May 2013 09:10:17 GMT
Author: ebourg
Date: Mon May 13 09:10:16 2013
New Revision: 1481740

URL: http://svn.apache.org/r1481740
Log:
Added a blank line before the lists of javadoc parameters
Removed the unnecessary @inheritDoc tags

Modified:
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
Mon May 13 09:10:16 2013
@@ -84,6 +84,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Gets the SQL statement that was passed into the constructor.
+     * 
      * @return the SQL statement passed into the constructor.
      */
     protected String getSql() {
@@ -92,6 +93,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Returns the underlying prepared statement.
+     * 
      * @return the underlying prepared statement.
      */
     protected PreparedStatement getStatement() {
@@ -100,6 +102,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Returns the underlying connection.
+     * 
      * @return the underlying connection.
      */
     protected Connection getConnection() {
@@ -108,6 +111,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Throws an exception if there are unmapped params.
+     * 
      * @throws SQLException if there are unmapped params.
      */
     protected void throwIfUnmappedParams() throws SQLException {
@@ -144,6 +148,7 @@ abstract class AbstractExecutor<T extend
      * Binds null to a parameter.
      * Types.VARCHAR is used as the type's parameter.
      * This usually works, but fails with some Oracle and MS SQL drivers.
+     * 
      * @param name the name of the parameter.
      * @return this execution object to provide the fluent style.
      * @throws SQLException throw if the parameter is not found, already bound, or there
is an issue binding null.
@@ -154,6 +159,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Binds null to a parameter, specifying the parameter's type.
+     * 
      * @param name the name of the parameter.
      * @param sqlType the type of the parameter.
      * @return this execution object to provide the fluent style.
@@ -165,6 +171,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Given a param name and sqlType, binds a null to that parameter.
+     * 
      * @param name the name of the parameter.
      * @param sqlType the type of the parameter.
      * @param removeFromPosMap if the param should be removed from the pos map.
@@ -197,6 +204,7 @@ abstract class AbstractExecutor<T extend
 
     /**
      * Binds value to name, but does not do the bookkeeping.
+     * 
      * @param name the parameter name.
      * @param value the value.
      * @param removeFromPosMap if the param should be removed from the pos map.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java
Mon May 13 09:10:16 2013
@@ -41,6 +41,7 @@ public class AsyncExecutor {
 
     /**
      * Execute a {@link org.apache.commons.dbutils2.BatchExecutor}.
+     * 
      * @param executor The executor for this SQL statement.
      * @return A <code>Future</code> which returns the result of the batch call.
      * @throws SQLException if a database access error occurs
@@ -58,6 +59,7 @@ public class AsyncExecutor {
 
     /**
      * Execute a {@link org.apache.commons.dbutils2.QueryExecutor} given a handler.
+     * 
      * @param <T> The type of object that the handler returns
      * @param executor The executor for this SQL statement.
      * @param handler The handler that converts the results into an object.
@@ -77,6 +79,7 @@ public class AsyncExecutor {
 
     /**
      * Execute a {@link org.apache.commons.dbutils2.UpdateExecutor}.
+     * 
      * @param executor The executor for this SQL statement.
      * @return A <code>Future</code> which returns the result of the query call.
      * @throws SQLException if a database access error occurs
@@ -94,6 +97,7 @@ public class AsyncExecutor {
 
     /**
      * Execute a {@link org.apache.commons.dbutils2.InsertExecutor} given a handler.
+     * 
      * @param <T> The type of object that the handler returns
      * @param executor The executor for this SQL statement.
      * @param handler The handler that converts the results into an object.
@@ -113,6 +117,7 @@ public class AsyncExecutor {
 
     /**
      * Execute a {@link org.apache.commons.dbutils2.InsertExecutor} given a handler.
+     * 
      * @param executor The executor for this SQL statement.
      * @return A <code>Future</code> which returns the number of rows inserted.
      * @throws SQLException if a database access error occurs

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
Mon May 13 09:10:16 2013
@@ -58,9 +58,6 @@ public abstract class BaseResultSetHandl
      */
     private ResultSet rs;
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final T handle(ResultSet rs) throws SQLException {
         if (this.rs != null) {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
Mon May 13 09:10:16 2013
@@ -56,8 +56,8 @@ public class BasicRowProcessor implement
 
     /**
      * BasicRowProcessor constructor.
-     * @param convert The BeanProcessor to use when converting columns to
-     * bean properties.
+     * 
+     * @param convert The BeanProcessor to use when converting columns to bean properties.
      * @since 1.1
      */
     public BasicRowProcessor(BeanProcessor convert) {
@@ -92,6 +92,7 @@ public class BasicRowProcessor implement
     /**
      * Convert a <code>ResultSet</code> row into a JavaBean.  This
      * implementation delegates to a BeanProcessor instance.
+     * 
      * @see org.apache.commons.dbutils2.RowProcessor#toBean(java.sql.ResultSet, java.lang.Class)
      * @see org.apache.commons.dbutils2.BeanProcessor#toBean(java.sql.ResultSet, java.lang.Class)
      * @param <T> The type of bean to create
@@ -108,6 +109,7 @@ public class BasicRowProcessor implement
     /**
      * Convert a <code>ResultSet</code> into a <code>List</code>
of JavaBeans.
      * This implementation delegates to a BeanProcessor instance.
+     * 
      * @see org.apache.commons.dbutils2.RowProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
      * @see org.apache.commons.dbutils2.BeanProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
      * @param <T> The type of bean to create
@@ -127,6 +129,7 @@ public class BasicRowProcessor implement
      * implementation returns a <code>Map</code> with case insensitive column
      * names as keys.  Calls to <code>map.get("COL")</code> and
      * <code>map.get("col")</code> return the same value.
+     * 
      * @see org.apache.commons.dbutils2.RowProcessor#toMap(java.sql.ResultSet)
      * @param rs ResultSet that supplies the map data
      * @throws SQLException if a database access error occurs
@@ -184,7 +187,6 @@ public class BasicRowProcessor implement
          */
         private static final long serialVersionUID = -2848100435296897392L;
 
-        /** {@inheritDoc} */
         @Override
         public boolean containsKey(Object key) {
             Object realKey = lowerCaseMap.get(key.toString().toLowerCase(Locale.ENGLISH));
@@ -195,14 +197,12 @@ public class BasicRowProcessor implement
             // return lowerCaseMap.containsKey(key.toString().toLowerCase());
         }
 
-        /** {@inheritDoc} */
         @Override
         public Object get(Object key) {
             Object realKey = lowerCaseMap.get(key.toString().toLowerCase(Locale.ENGLISH));
             return super.get(realKey);
         }
 
-        /** {@inheritDoc} */
         @Override
         public Object put(String key, Object value) {
             /*
@@ -218,7 +218,6 @@ public class BasicRowProcessor implement
             return oldValue;
         }
 
-        /** {@inheritDoc} */
         @Override
         public void putAll(Map<? extends String, ?> m) {
             for (Map.Entry<? extends String, ?> entry : m.entrySet()) {
@@ -228,7 +227,6 @@ public class BasicRowProcessor implement
             }
         }
 
-        /** {@inheritDoc} */
         @Override
         public Object remove(Object key) {
             Object realKey = lowerCaseMap.remove(key.toString().toLowerCase(Locale.ENGLISH));

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java
Mon May 13 09:10:16 2013
@@ -33,6 +33,7 @@ public class BatchExecutor extends Abstr
 
     /**
      * Constructs a BatchExecutor given a connection and SQL statement.
+     * 
      * @param conn The connection to use during execution.
      * @param sql The SQL statement.
      * @param closeConnection If the connection should be closed or not.
@@ -45,6 +46,7 @@ public class BatchExecutor extends Abstr
 
     /**
      * Binds a parameter name to a value for a given statement.
+     * 
      * @param name the name of the parameter.
      * @param value the value to bind to the parameter.
      * @return this object.
@@ -60,6 +62,7 @@ public class BatchExecutor extends Abstr
      * Binds null to a parameter.
      * Types.VARCHAR is used as the type's parameter.
      * This usually works, but fails with some Oracle and MS SQL drivers.
+     * 
      * @param name the name of the parameter.
      * @return this execution object to provide the fluent style.
      * @throws SQLException throw if the parameter is not found, already bound, or there
is an issue binding null.
@@ -71,6 +74,7 @@ public class BatchExecutor extends Abstr
 
     /**
      * Binds null to a parameter, specifying the parameter's type.
+     * 
      * @param name the name of the parameter.
      * @param sqlType the type of the parameter.
      * @return this execution object to provide the fluent style.
@@ -83,6 +87,7 @@ public class BatchExecutor extends Abstr
 
     /**
      * Adds the statement to the batch after binding all of the parameters.
+     * 
      * @return this object.
      * @throws SQLException if a SQLException is thrown during the addBatch() call.
      * @see java.sql.PreparedStatement#addBatch()
@@ -100,6 +105,7 @@ public class BatchExecutor extends Abstr
 
     /**
      * Calls batch after checking the parameters to ensure nothing is null.
+     * 
      * @return an array containing the number of rows updated for each statement.
      * @throws SQLException If there are database or parameter errors.
      * @see org.apache.commons.dbutils2.UpdateExecutor#execute()

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
Mon May 13 09:10:16 2013
@@ -129,6 +129,7 @@ public class BeanProcessor {
      * <code>null</code> when SQL NULL is returned.  This is the same behavior
      * as the <code>ResultSet</code> get* methods.
      * </p>
+     * 
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance
@@ -172,6 +173,7 @@ public class BeanProcessor {
      * <code>null</code> when SQL NULL is returned.  This is the same behavior
      * as the <code>ResultSet</code> get* methods.
      * </p>
+     * 
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance
@@ -198,6 +200,7 @@ public class BeanProcessor {
 
     /**
      * Creates a new object and initializes its fields from the ResultSet.
+     * 
      * @param <T> The type of bean to create
      * @param rs The result set.
      * @param type The bean type (the return type of the object).
@@ -236,6 +239,7 @@ public class BeanProcessor {
     /**
      * Calls the setter method on the target object for the given property.
      * If no setter method exists for the property, this method does nothing.
+     * 
      * @param target The object to set the property on.
      * @param prop The property to set.
      * @param value The value to pass into the setter.
@@ -340,6 +344,7 @@ public class BeanProcessor {
      * is called at the start of the bean creation process and may be
      * overridden to provide custom behavior like returning a cached bean
      * instance.
+     * 
      * @param <T> The type of object to create
      * @param c The Class to create an object from.
      * @return A newly created object of the Class.
@@ -388,9 +393,7 @@ public class BeanProcessor {
      * the column name.  If no bean property was found for a column, the
      * position is set to <code>PROPERTY_NOT_FOUND</code>.
      *
-     * @param rsmd The <code>ResultSetMetaData</code> containing column
-     * information.
-     *
+     * @param rsmd The <code>ResultSetMetaData</code> containing column information.
      * @param props The bean property descriptors.
      *
      * @throws SQLException if a database access error occurs

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
Mon May 13 09:10:16 2013
@@ -297,6 +297,7 @@ public final class DbUtils {
 
     /**
      * Rollback any changes made on the given connection.
+     * 
      * @param conn Connection to rollback.  A null value is legal.
      * @throws SQLException if a database access error occurs
      */
@@ -360,49 +361,31 @@ public final class DbUtils {
             this.adapted = adapted;
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public boolean acceptsURL(String url) throws SQLException {
             return adapted.acceptsURL(url);
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public Connection connect(String url, Properties info) throws SQLException {
             return adapted.connect(url, info);
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public int getMajorVersion() {
             return adapted.getMajorVersion();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public int getMinorVersion() {
             return adapted.getMinorVersion();
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException
{
             return adapted.getPropertyInfo(url, info);
         }
 
-        /**
-         * {@inheritDoc}
-         */
         @Override
         public boolean jdbcCompliant() {
             return adapted.jdbcCompliant();

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java
Mon May 13 09:10:16 2013
@@ -32,6 +32,7 @@ public class InsertExecutor extends Abst
 
     /**
      * Constructs an InsertExecutor given a connection and SQL statement.
+     * 
      * @param conn The connection to use during execution.
      * @param sql The SQL statement.
      * @param closeConnection If the connection should be closed or not.
@@ -88,6 +89,7 @@ public class InsertExecutor extends Abst
 
     /**
      * Executes the given INSERT SQL statement.
+     * 
      * @return the number of rows updated.
      * @throws SQLException If there are database or parameter errors.
      */

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
Mon May 13 09:10:16 2013
@@ -71,6 +71,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>CallableStatement</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied CallableStatement
      */
@@ -80,6 +81,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>Connection</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied Connection
      */
@@ -89,6 +91,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>Driver</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied Driver
      */
@@ -98,6 +101,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>PreparedStatement</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied PreparedStatement
      */
@@ -107,6 +111,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>ResultSet</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied ResultSet
      */
@@ -116,6 +121,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>ResultSetMetaData</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied ResultSetMetaData
      */
@@ -125,6 +131,7 @@ public class ProxyFactory {
 
     /**
      * Creates a new proxy <code>Statement</code> object.
+     * 
      * @param handler The handler that intercepts/overrides method calls.
      * @return proxied Statement
      */

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java
Mon May 13 09:10:16 2013
@@ -31,6 +31,7 @@ public class QueryExecutor extends Abstr
 
     /**
      * Constructs a QueryExecutor given a connection and SQL statement.
+     * 
      * @param conn The connection to use during execution.
      * @param sql The SQL statement.
      * @param closeConnection If the connection should be closed or not.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
Mon May 13 09:10:16 2013
@@ -37,6 +37,7 @@ public class QueryLoader {
 
     /**
      * Return an instance of this class.
+     * 
      * @return The Singleton instance.
      */
     public static QueryLoader instance() {
@@ -84,6 +85,7 @@ public class QueryLoader {
     /**
      * Loads a set of named queries into a Map object.  This implementation
      * reads a properties file at the given path.
+     * 
      * @param path The path that the ClassLoader will use to find the file.
      * @throws IOException if a file access error occurs
      * @throws IllegalArgumentException if the ClassLoader can't find a file at
@@ -115,6 +117,7 @@ public class QueryLoader {
 
     /**
      * Removes the queries for the given path from the cache.
+     * 
      * @param path The path that the queries were loaded from.
      */
     public synchronized void unload(String path) {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
Mon May 13 09:10:16 2013
@@ -46,6 +46,7 @@ public class ResultSetIterator implement
 
     /**
      * Constructor for ResultSetIterator.
+     * 
      * @param rs Wrap this <code>ResultSet</code> in an <code>Iterator</code>.
      */
     public ResultSetIterator(ResultSet rs) {
@@ -54,6 +55,7 @@ public class ResultSetIterator implement
 
     /**
      * Constructor for ResultSetIterator.
+     * 
      * @param rs Wrap this <code>ResultSet</code> in an <code>Iterator</code>.
      * @param convert The processor to use when converting a row into an
      * <code>Object[]</code>.  Defaults to a
@@ -66,6 +68,7 @@ public class ResultSetIterator implement
 
     /**
      * Returns true if there are more rows in the ResultSet.
+     * 
      * @return boolean <code>true</code> if there are more rows
      * @throws RuntimeException if an SQLException occurs.
      */
@@ -81,6 +84,7 @@ public class ResultSetIterator implement
 
     /**
      * Returns the next row as an <code>Object[]</code>.
+     * 
      * @return An <code>Object[]</code> with the same number of elements as
      * columns in the <code>ResultSet</code>.
      * @see java.util.Iterator#next()
@@ -99,6 +103,7 @@ public class ResultSetIterator implement
 
     /**
      * Deletes the current row from the <code>ResultSet</code>.
+     * 
      * @see java.util.Iterator#remove()
      * @throws RuntimeException if an SQLException occurs.
      */
@@ -114,6 +119,7 @@ public class ResultSetIterator implement
     /**
      * Rethrow the SQLException as a RuntimeException.  This implementation
      * creates a new RuntimeException with the SQLException's error message.
+     * 
      * @param e SQLException to rethrow
      * @since 1.1
      */

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
Mon May 13 09:10:16 2013
@@ -49,6 +49,7 @@ public interface RowProcessor {
      * row.  The <code>ResultSet</code> should be positioned on a valid row before
      * passing it to this method.  Implementations of this method must not
      * alter the row position of the <code>ResultSet</code>.
+     * 
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance
@@ -61,6 +62,7 @@ public interface RowProcessor {
      * Create a <code>List</code> of JavaBeans from the column values in all
      * <code>ResultSet</code> rows.  <code>ResultSet.next()</code>
should
      * <strong>not</strong> be called before passing it to this method.
+     * 
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java
Mon May 13 09:10:16 2013
@@ -30,6 +30,7 @@ public class UpdateExecutor extends Abst
 
     /**
      * Constructs an UpdateExecutor given a connection and SQL statement.
+     * 
      * @param conn The connection to use during execution.
      * @param sql The SQL statement.
      * @param closeConnection If the connection should be closed or not.
@@ -42,6 +43,7 @@ public class UpdateExecutor extends Abst
 
     /**
      * Calls update after checking the parameters to ensure nothing is null.
+     * 
      * @return The number of rows updated.
      * @throws SQLException If there are database or parameter errors.
      */

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
Mon May 13 09:10:16 2013
@@ -41,6 +41,7 @@ public abstract class AbstractKeyedHandl
     /**
      * Convert each row's columns into a Map and store then
      * in a <code>Map</code> under <code>ResultSet.getObject(key)</code>
key.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return A <code>Map</code>, never <code>null</code>.
      * @throws SQLException if a database access error occurs
@@ -69,6 +70,7 @@ public abstract class AbstractKeyedHandl
     /**
      * This factory method is called by <code>handle()</code> to retrieve the
      * key value from the current <code>ResultSet</code> row.
+     * 
      * @param rs ResultSet to create a key from
      * @return K from the configured key column name/index
      * @throws SQLException if a database access error occurs
@@ -78,6 +80,7 @@ public abstract class AbstractKeyedHandl
     /**
      * This factory method is called by <code>handle()</code> to store the
      * current <code>ResultSet</code> row in some object.
+     * 
      * @param rs ResultSet to create a row from
      * @return V object created from the current row
      * @throws SQLException if a database access error occurs

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
Mon May 13 09:10:16 2013
@@ -66,6 +66,7 @@ public class ArrayHandler<T> implements 
 
     /**
      * Places the column values from the first row in an <code>T[]</code>.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return An T[] or <code>null</code> if there are no rows in the
      * <code>ResultSet</code>.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
Mon May 13 09:10:16 2013
@@ -58,6 +58,7 @@ public class ArrayListHandler extends Ab
 
     /**
      * Convert row's columns into an <code>Object[]</code>.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return <code>Object[]</code>, never <code>null</code>.
      *

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
Mon May 13 09:10:16 2013
@@ -68,6 +68,7 @@ public class BeanHandler<T> implements R
     /**
      * Convert the first row of the <code>ResultSet</code> into a bean with the
      * <code>Class</code> given in the constructor.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return An initialized JavaBean or <code>null</code> if there were no
      * rows in the <code>ResultSet</code>.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
Mon May 13 09:10:16 2013
@@ -158,6 +158,7 @@ public class BeanMapHandler<K, V> extend
     /**
      * This factory method is called by <code>handle()</code> to retrieve the
      * key value from the current <code>ResultSet</code> row.
+     * 
      * @param rs ResultSet to create a key from
      *
      * @return K from the configured key column name/index

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
Mon May 13 09:10:16 2013
@@ -69,7 +69,9 @@ public class ColumnListHandler<T> extend
         this(1, columnName);
     }
 
-    /** Private Helper
+    /**
+     * Private Helper
+     * 
      * @param columnIndex The index of the column to retrieve from the
      * <code>ResultSet</code>.
      * @param columnName The name of the column to retrieve from the
@@ -83,6 +85,7 @@ public class ColumnListHandler<T> extend
 
     /**
      * Returns one <code>ResultSet</code> column value as <code>Object</code>.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return <code>Object</code>, never <code>null</code>.
      *

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
Mon May 13 09:10:16 2013
@@ -107,7 +107,9 @@ public class KeyedHandler<K> extends Abs
         this(ArrayHandler.ROW_PROCESSOR, 1, columnName);
     }
 
-    /** Private Helper
+    /**
+     * Private Helper
+     * 
      * @param convert The <code>RowProcessor</code> implementation
      * to use when converting rows into Maps
      * @param columnIndex The values to use as keys in the Map are
@@ -127,6 +129,7 @@ public class KeyedHandler<K> extends Abs
      * key value from the current <code>ResultSet</code> row.  This
      * implementation returns <code>ResultSet.getObject()</code> for the
      * configured key column name or index.
+     * 
      * @param rs ResultSet to create a key from
      * @return Object from the configured key column name/index
      *
@@ -149,6 +152,7 @@ public class KeyedHandler<K> extends Abs
      * implementation returns a <code>Map</code> with case insensitive column
      * names as keys.  Calls to <code>map.get("COL")</code> and
      * <code>map.get("col")</code> return the same value.
+     * 
      * @param rs ResultSet to create a row from
      * @return Object typed Map containing column names to values
      * @throws SQLException if a database access error occurs

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
Mon May 13 09:10:16 2013
@@ -60,6 +60,7 @@ public class MapHandler implements Resul
     /**
      * Converts the first row in the <code>ResultSet</code> into a
      * <code>Map</code>.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return A <code>Map</code> with the values from the first row or
      * <code>null</code> if there are no rows in the <code>ResultSet</code>.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
Mon May 13 09:10:16 2013
@@ -58,6 +58,7 @@ public class MapListHandler extends Abst
 
     /**
      * Converts the <code>ResultSet</code> row into a <code>Map</code>
object.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return A <code>Map</code>, never null.
      *

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
Mon May 13 09:10:16 2013
@@ -69,7 +69,9 @@ public class ScalarHandler<T> implements
         this(1, columnName);
     }
 
-    /** Helper constructor
+    /**
+     * Helper constructor
+     * 
      * @param columnIndex The index of the column to retrieve from the
      * <code>ResultSet</code>.
      * @param columnName The name of the column to retrieve from the
@@ -84,6 +86,7 @@ public class ScalarHandler<T> implements
      * Returns one <code>ResultSet</code> column as an object via the
      * <code>ResultSet.getObject()</code> method that performs type
      * conversions.
+     * 
      * @param rs <code>ResultSet</code> to process.
      * @return The column or <code>null</code> if there are no rows in
      * the <code>ResultSet</code>.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java?rev=1481740&r1=1481739&r2=1481740&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java
(original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java
Mon May 13 09:10:16 2013
@@ -72,6 +72,7 @@ public class StringTrimmedResultSet impl
     /**
      * Constructs a new instance of <code>StringTrimmedResultSet</code>
      * to wrap the specified <code>ResultSet</code>.
+     * 
      * @param rs ResultSet to wrap
      */
     public StringTrimmedResultSet(ResultSet rs) {



Mime
View raw message