You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/06/04 12:58:15 UTC
svn commit: r951360 - in
/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils:
BasicRowProcessor.java QueryRunner.java handlers/ColumnListHandler.java
Author: sebb
Date: Fri Jun 4 10:58:15 2010
New Revision: 951360
URL: http://svn.apache.org/viewvc?rev=951360&view=rev
Log:
Add missing annotations
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java
Modified: commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=951360&r1=951359&r2=951360&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java (original)
+++ commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java Fri Jun 4 10:58:15 2010
@@ -52,6 +52,7 @@ public class BasicRowProcessor implement
* @deprecated Create instances with the constructors instead. This will
* be removed after DbUtils 1.1.
*/
+ @Deprecated
public static BasicRowProcessor instance() {
return instance;
}
Modified: commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java?rev=951360&r1=951359&r2=951360&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java (original)
+++ commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryRunner.java Fri Jun 4 10:58:15 2010
@@ -349,6 +349,7 @@ public class QueryRunner {
* @throws SQLException if a database access error occurs
* @deprecated Use {@link #query(Connection, String, ResultSetHandler, Object...)}
*/
+ @Deprecated
public <T> T query(Connection conn, String sql, Object param,
ResultSetHandler<T> rsh) throws SQLException {
@@ -367,6 +368,7 @@ public class QueryRunner {
* @throws SQLException if a database access error occurs
* @deprecated Use {@link #query(Connection,String,ResultSetHandler,Object...)} instead
*/
+ @Deprecated
public <T> T query(Connection conn, String sql, Object[] params,
ResultSetHandler<T> rsh) throws SQLException {
return query(conn, sql, rsh, params);
@@ -439,6 +441,7 @@ public class QueryRunner {
* @throws SQLException if a database access error occurs
* @deprecated Use {@link #query(String, ResultSetHandler, Object...)}
*/
+ @Deprecated
public <T> T query(String sql, Object param, ResultSetHandler<T> rsh)
throws SQLException {
@@ -461,6 +464,7 @@ public class QueryRunner {
* @throws SQLException if a database access error occurs
* @deprecated Use {@link #query(String, ResultSetHandler, Object...)}
*/
+ @Deprecated
public <T> T query(String sql, Object[] params, ResultSetHandler<T> rsh)
throws SQLException {
return query(sql, rsh, params);
Modified: commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java?rev=951360&r1=951359&r2=951360&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java (original)
+++ commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java Fri Jun 4 10:58:15 2010
@@ -89,7 +89,8 @@ public class ColumnListHandler extends A
*
* @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet)
*/
- protected Object handleRow(ResultSet rs) throws SQLException {
+ @Override
+ protected Object handleRow(ResultSet rs) throws SQLException {
if (this.columnName == null) {
return rs.getObject(this.columnIndex);
} else {