You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/08/01 22:57:22 UTC

[commons-dbutils] 01/02: Normalize naming

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git

commit d503d353a4743ade050d3dc0d796e0c077c6ba7e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 1 18:43:34 2023 -0400

    Normalize naming
---
 .../apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java | 4 ++--
 .../apache/commons/dbutils/handlers/columns/ByteColumnHandler.java    | 4 ++--
 .../apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java  | 4 ++--
 .../apache/commons/dbutils/handlers/columns/FloatColumnHandler.java   | 4 ++--
 .../apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java | 4 ++--
 .../apache/commons/dbutils/handlers/columns/LongColumnHandler.java    | 4 ++--
 .../apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java  | 4 ++--
 .../apache/commons/dbutils/handlers/columns/ShortColumnHandler.java   | 4 ++--
 .../apache/commons/dbutils/handlers/columns/StringColumnHandler.java  | 4 ++--
 .../commons/dbutils/handlers/columns/TimestampColumnHandler.java      | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java
index 7060ae3..3b25bf4 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class BooleanColumnHandler implements ColumnHandler<Boolean> {
 
     @Override
-    public Boolean apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Boolean.valueOf(rs.getBoolean(columnIndex));
+    public Boolean apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Boolean.valueOf(resultSet.getBoolean(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java
index 48ec6cc..3d86066 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class ByteColumnHandler implements ColumnHandler<Byte> {
 
     @Override
-    public Byte apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Byte.valueOf(rs.getByte(columnIndex));
+    public Byte apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Byte.valueOf(resultSet.getByte(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java
index bf37bdc..5791af7 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class DoubleColumnHandler implements ColumnHandler<Double> {
 
     @Override
-    public Double apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Double.valueOf(rs.getDouble(columnIndex));
+    public Double apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Double.valueOf(resultSet.getDouble(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java
index ec65667..89d5903 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class FloatColumnHandler implements ColumnHandler<Float> {
 
     @Override
-    public Float apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Float.valueOf(rs.getFloat(columnIndex));
+    public Float apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Float.valueOf(resultSet.getFloat(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java
index d98690b..64635b6 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class IntegerColumnHandler implements ColumnHandler<Integer> {
 
     @Override
-    public Integer apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Integer.valueOf(rs.getInt(columnIndex));
+    public Integer apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Integer.valueOf(resultSet.getInt(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java
index be4d4b0..627980d 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class LongColumnHandler implements ColumnHandler<Long> {
 
     @Override
-    public Long apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Long.valueOf(rs.getLong(columnIndex));
+    public Long apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Long.valueOf(resultSet.getLong(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java
index 8e1b561..01577bf 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java
@@ -25,8 +25,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class SQLXMLColumnHandler implements ColumnHandler<SQLXML> {
 
     @Override
-    public SQLXML apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return rs.getSQLXML(columnIndex);
+    public SQLXML apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return resultSet.getSQLXML(columnIndex);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java
index 729ed4b..4871d3f 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class ShortColumnHandler implements ColumnHandler<Short> {
 
     @Override
-    public Short apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return Short.valueOf(rs.getShort(columnIndex));
+    public Short apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return Short.valueOf(resultSet.getShort(columnIndex));
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java
index d471dcf..ec780d8 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java
@@ -24,8 +24,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class StringColumnHandler implements ColumnHandler<String> {
 
     @Override
-    public String apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return rs.getString(columnIndex);
+    public String apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return resultSet.getString(columnIndex);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java
index ba4fce7..5fc178c 100644
--- a/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java
@@ -25,8 +25,8 @@ import org.apache.commons.dbutils.ColumnHandler;
 public class TimestampColumnHandler implements ColumnHandler<Timestamp> {
 
     @Override
-    public Timestamp apply(final ResultSet rs, final int columnIndex) throws SQLException {
-        return rs.getTimestamp(columnIndex);
+    public Timestamp apply(final ResultSet resultSet, final int columnIndex) throws SQLException {
+        return resultSet.getTimestamp(columnIndex);
     }
 
     @Override