Better names

apache · Aug 1, 2023 · 8ce8b38 · 8ce8b38
1 parent e623bc9
commit 8ce8b38
Show file tree

Hide file tree

Showing 22 changed files with 317 additions and 318 deletions.
diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
@@ -178,14 +178,14 @@ protected void close(final Connection conn) throws SQLException {
      * null and does <strong>not</strong> suppress any exceptions. Subclasses
      * can override to provide special handling like logging.
      *
-     * @param rs
+     * @param resultSet
      *            ResultSet to close
      * @throws SQLException
      *             if a database access error occurs
      * @since 1.1
      */
-    protected void close(final ResultSet rs) throws SQLException {
-        DbUtils.close(rs);
+    protected void close(final ResultSet resultSet) throws SQLException {
+        DbUtils.close(resultSet);
     }
 
     /**
@@ -216,11 +216,11 @@ protected void closeQuietly(final Connection conn) {
     /**
      * Calls {@link DbUtils#closeQuietly(ResultSet)}.
      *
-     * @param rs ResultSet to close.
+     * @param resultSet ResultSet to close.
      * @since 1.8.0
      */
-    protected void closeQuietly(final ResultSet rs) {
-        DbUtils.closeQuietly(rs);
+    protected void closeQuietly(final ResultSet resultSet) {
+        DbUtils.closeQuietly(resultSet);
     }
 
     /**

diff --git a/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java b/src/main/java/org/apache/commons/dbutils/AsyncQueryRunner.java
@@ -132,17 +132,17 @@ public QueryCallableStatement(final Connection conn, final boolean closeConn, fi
          */
         @Override
         public T call() throws SQLException {
-            ResultSet rs = null;
+            ResultSet resultSet = null;
             T ret = null;
 
             try {
-                rs = wrap(ps.executeQuery());
-                ret = rsh.handle(rs);
+                resultSet = wrap(ps.executeQuery());
+                ret = rsh.handle(resultSet);
             } catch (final SQLException e) {
                 rethrow(e, sql, params);
             } finally {
                 try {
-                    close(rs);
+                    close(resultSet);
                 } finally {
                     close(ps);
                     if (closeConn) {