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 9ef349cf4f1696514ecbd2afb5e1e7837dbacc35 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Jan 21 14:22:51 2025 -0500 Fix ParenPad --- src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 10 ++-------- .../commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java | 9 +++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java index b65cb56..806288f 100644 --- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java +++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java @@ -389,24 +389,18 @@ public class BeanProcessor { * index after optional type processing or {@code null} if the column * value was SQL NULL. */ - protected Object processColumn(final ResultSet resultSet, final int index, final Class<?> propType) - throws SQLException { - + protected Object processColumn(final ResultSet resultSet, final int index, final Class<?> propType) throws SQLException { Object retval = resultSet.getObject(index); - - if ( !propType.isPrimitive() && retval == null ) { + if (!propType.isPrimitive() && retval == null) { return null; } - for (final ColumnHandler<?> handler : COLUMN_HANDLERS) { if (handler.match(propType)) { retval = handler.apply(resultSet, index); break; } } - return retval; - } /** diff --git a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java index 36cbeed..84cf125 100644 --- a/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java +++ b/src/test/java/org/apache/commons/dbutils/wrappers/SqlNullCheckedResultSetTest.java @@ -236,6 +236,7 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertEquals(expectedItem, actualItem, "Array not equal at index " + i); } } + private SqlNullCheckedResultSet rs2; /** @@ -343,8 +344,8 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertTrue(rs.wasNull()); // Set what gets returned to something other than the default rs2.setNullBoolean(true); - assertTrue( rs.getBoolean(1)); - assertTrue( rs.getBoolean("column")); + assertTrue(rs.getBoolean(1)); + assertTrue(rs.getBoolean("column")); } @@ -736,8 +737,8 @@ public class SqlNullCheckedResultSetTest extends BaseTestCase { assertFalse(rs2.getNullBoolean()); // Set what gets returned to something other than the default rs2.setNullBoolean(true); - assertTrue( rs.getBoolean(1)); - assertTrue( rs.getBoolean("column")); + assertTrue(rs.getBoolean(1)); + assertTrue(rs.getBoolean("column")); }