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 f119ca5b8909935a2831e588127a0f24d53d2c7e
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jul 31 19:25:40 2023 -0400
Use generics
---
src/main/java/org/apache/commons/dbutils/BeanProcessor.java | 6 +++---
src/main/java/org/apache/commons/dbutils/ColumnHandler.java | 6 ++++--
.../commons/dbutils/handlers/columns/BooleanColumnHandler.java | 5 +++--
.../apache/commons/dbutils/handlers/columns/ByteColumnHandler.java | 5 +++--
.../commons/dbutils/handlers/columns/DoubleColumnHandler.java | 5 +++--
.../apache/commons/dbutils/handlers/columns/FloatColumnHandler.java | 5 +++--
.../commons/dbutils/handlers/columns/IntegerColumnHandler.java | 5 +++--
.../apache/commons/dbutils/handlers/columns/LongColumnHandler.java | 5 +++--
.../commons/dbutils/handlers/columns/SQLXMLColumnHandler.java | 5 +++--
.../apache/commons/dbutils/handlers/columns/ShortColumnHandler.java | 5 +++--
.../commons/dbutils/handlers/columns/StringColumnHandler.java | 5 +++--
.../commons/dbutils/handlers/columns/TimestampColumnHandler.java | 5 +++--
src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java | 4 ++--
.../{ColumnHandlerTestBase.java => AbstractTestColumnHandler.java} | 6 +++---
.../commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/ByteColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/FloatColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/IntegerColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/LongColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/SQLXMLColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/ShortColumnHandlerTest.java | 3 ++-
.../commons/dbutils/handlers/columns/StringColumnHandlerTest.java | 3 ++-
.../apache/commons/dbutils/handlers/columns/TestColumnHandler.java | 2 +-
.../dbutils/handlers/columns/TimestampColumnHandlerTest.java | 3 ++-
25 files changed, 63 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index d30dcfc..39f64a4 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -67,7 +67,7 @@ public class BeanProcessor {
*/
private static final Map<Class<?>, Object> primitiveDefaults = new
HashMap<>();
- private static final List<ColumnHandler> columnHandlers = new
ArrayList<>();
+ private static final List<ColumnHandler<?>> columnHandlers = new
ArrayList<>();
private static final List<PropertyHandler> propertyHandlers = new
ArrayList<>();
@@ -82,7 +82,7 @@ public class BeanProcessor {
primitiveDefaults.put(Character.TYPE, Character.valueOf((char) 0));
// Use a ServiceLoader to find implementations
- for (final ColumnHandler handler :
ServiceLoader.load(ColumnHandler.class)) {
+ for (final ColumnHandler<?> handler :
ServiceLoader.load(ColumnHandler.class)) {
columnHandlers.add(handler);
}
@@ -414,7 +414,7 @@ public class BeanProcessor {
return null;
}
- for (final ColumnHandler handler : columnHandlers) {
+ for (final ColumnHandler<?> handler : columnHandlers) {
if (handler.match(propType)) {
retval = handler.apply(rs, index);
break;
diff --git a/src/main/java/org/apache/commons/dbutils/ColumnHandler.java
b/src/main/java/org/apache/commons/dbutils/ColumnHandler.java
index b834475..6f79a76 100644
--- a/src/main/java/org/apache/commons/dbutils/ColumnHandler.java
+++ b/src/main/java/org/apache/commons/dbutils/ColumnHandler.java
@@ -22,8 +22,10 @@ import java.sql.SQLException;
/**
* Interface to define how implementations can interact with column handling
when constructing a bean from a
* {@link java.sql.ResultSet}. ColumnHandlers do the work of retrieving data
correctly from the {@code ResultSet}.
+ *
+ * @param <T> The return type.
*/
-public interface ColumnHandler {
+public interface ColumnHandler<T> {
/**
* Do the work required to retrieve and store a column from {@code
ResultSet} into something of type
* {@code propType}. This method is called only if this handler responded
{@code true} after a call to
@@ -35,7 +37,7 @@ public interface ColumnHandler {
* @throws SQLException if the columnIndex is not valid; if a database
access error occurs or this method is
* called on a closed result set
*/
- Object apply(ResultSet rs, int columnIndex) throws SQLException;
+ T apply(ResultSet rs, int columnIndex) throws SQLException;
/**
* Test whether this {@code ColumnHandler} wants to handle a column
targeted for a value type matching
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 afbdcdb..7060ae3 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class BooleanColumnHandler implements ColumnHandler {
+public class BooleanColumnHandler implements ColumnHandler<Boolean> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Boolean apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Boolean.valueOf(rs.getBoolean(columnIndex));
}
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 c2c76bd..48ec6cc 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class ByteColumnHandler implements ColumnHandler {
+public class ByteColumnHandler implements ColumnHandler<Byte> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Byte apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Byte.valueOf(rs.getByte(columnIndex));
}
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 c62512b..bf37bdc 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class DoubleColumnHandler implements ColumnHandler {
+public class DoubleColumnHandler implements ColumnHandler<Double> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Double apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Double.valueOf(rs.getDouble(columnIndex));
}
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 6b37d9d..ec65667 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class FloatColumnHandler implements ColumnHandler {
+public class FloatColumnHandler implements ColumnHandler<Float> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Float apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Float.valueOf(rs.getFloat(columnIndex));
}
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 edc88a4..d98690b 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class IntegerColumnHandler implements ColumnHandler {
+public class IntegerColumnHandler implements ColumnHandler<Integer> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Integer apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Integer.valueOf(rs.getInt(columnIndex));
}
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 ea0cc9c..be4d4b0 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class LongColumnHandler implements ColumnHandler {
+public class LongColumnHandler implements ColumnHandler<Long> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Long apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Long.valueOf(rs.getLong(columnIndex));
}
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 2ed2291..8e1b561 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
@@ -22,9 +22,10 @@ import java.sql.SQLXML;
import org.apache.commons.dbutils.ColumnHandler;
-public class SQLXMLColumnHandler implements ColumnHandler {
+public class SQLXMLColumnHandler implements ColumnHandler<SQLXML> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public SQLXML apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return rs.getSQLXML(columnIndex);
}
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 d7fb3df..729ed4b 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class ShortColumnHandler implements ColumnHandler {
+public class ShortColumnHandler implements ColumnHandler<Short> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Short apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return Short.valueOf(rs.getShort(columnIndex));
}
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 85fc5c4..d471dcf 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
@@ -21,9 +21,10 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class StringColumnHandler implements ColumnHandler {
+public class StringColumnHandler implements ColumnHandler<String> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public String apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return rs.getString(columnIndex);
}
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 d82517f..ba4fce7 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
@@ -22,9 +22,10 @@ import java.sql.Timestamp;
import org.apache.commons.dbutils.ColumnHandler;
-public class TimestampColumnHandler implements ColumnHandler {
+public class TimestampColumnHandler implements ColumnHandler<Timestamp> {
+
@Override
- public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
+ public Timestamp apply(final ResultSet rs, final int columnIndex) throws
SQLException {
return rs.getTimestamp(columnIndex);
}
diff --git a/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java
b/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java
index ea06276..c817779 100644
--- a/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java
+++ b/src/test/java/org/apache/commons/dbutils/ServiceLoaderTest.java
@@ -42,7 +42,7 @@ public class ServiceLoaderTest {
@Test
public void testFindMoreThanLocalColumns() {
int count = 0;
- for (final ColumnHandler handler : columns) {
+ for (final ColumnHandler<?> handler : columns) {
count++;
}
@@ -66,7 +66,7 @@ public class ServiceLoaderTest {
@Test
public void testFindsLocalColumnHandler() {
boolean found = false;
- for (final ColumnHandler handler : columns) {
+ for (final ColumnHandler<?> handler : columns) {
// this class is defined outside of the main classes in dbutils
if (handler instanceof TestColumnHandler) {
found = true;
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ColumnHandlerTestBase.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
similarity index 88%
rename from
src/test/java/org/apache/commons/dbutils/handlers/columns/ColumnHandlerTestBase.java
rename to
src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
index b8ed0ed..1b0878d 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ColumnHandlerTestBase.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/AbstractTestColumnHandler.java
@@ -25,14 +25,14 @@ import org.apache.commons.dbutils.ColumnHandler;
import org.junit.Test;
import org.mockito.Mock;
-public abstract class ColumnHandlerTestBase {
+public abstract class AbstractTestColumnHandler<T> {
@Mock
protected ResultSet rs;
- protected final ColumnHandler handler;
+ protected final ColumnHandler<T> handler;
protected final Class<?> matchingType;
- public ColumnHandlerTestBase(final ColumnHandler handler, final Class<?>
matchingType) {
+ public AbstractTestColumnHandler(final ColumnHandler<T> handler, final
Class<?> matchingType) {
this.handler = handler;
this.matchingType = matchingType;
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
index c36af1d..35820ee 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class BooleanColumnHandlerTest extends ColumnHandlerTestBase {
+public class BooleanColumnHandlerTest extends
AbstractTestColumnHandler<Boolean> {
+
public BooleanColumnHandlerTest() {
super(new BooleanColumnHandler(), Boolean.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
index 6813c64..3dd36c4 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class ByteColumnHandlerTest extends ColumnHandlerTestBase {
+public class ByteColumnHandlerTest extends AbstractTestColumnHandler<Byte> {
+
public ByteColumnHandlerTest() {
super(new ByteColumnHandler(), Byte.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
index 606212e..8436b37 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class DoubleColumnHandlerTest extends ColumnHandlerTestBase {
+public class DoubleColumnHandlerTest extends AbstractTestColumnHandler<Double>
{
+
public DoubleColumnHandlerTest() {
super(new DoubleColumnHandler(), Double.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
index 5e3ab4b..f44488b 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class FloatColumnHandlerTest extends ColumnHandlerTestBase {
+public class FloatColumnHandlerTest extends AbstractTestColumnHandler<Float> {
+
public FloatColumnHandlerTest() {
super(new FloatColumnHandler(), Float.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandlerTest.java
index 8713d46..bd00b93 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandlerTest.java
@@ -25,7 +25,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class IntegerColumnHandlerTest extends ColumnHandlerTestBase {
+public class IntegerColumnHandlerTest extends
AbstractTestColumnHandler<Integer> {
+
public IntegerColumnHandlerTest() {
super(new IntegerColumnHandler(), Integer.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandlerTest.java
index 12606be..d58c6ef 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class LongColumnHandlerTest extends ColumnHandlerTestBase {
+public class LongColumnHandlerTest extends AbstractTestColumnHandler<Long> {
+
public LongColumnHandlerTest() {
super(new LongColumnHandler(), Long.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandlerTest.java
index e5a984b..a476f0e 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandlerTest.java
@@ -27,7 +27,8 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class SQLXMLColumnHandlerTest extends ColumnHandlerTestBase {
+public class SQLXMLColumnHandlerTest extends AbstractTestColumnHandler<SQLXML>
{
+
@Mock
private SQLXML sqlxml;
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandlerTest.java
index 303cff2..33d62d0 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class ShortColumnHandlerTest extends ColumnHandlerTestBase {
+public class ShortColumnHandlerTest extends AbstractTestColumnHandler<Short> {
+
public ShortColumnHandlerTest() {
super(new ShortColumnHandler(), Short.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandlerTest.java
index 7caca0a..d9f1988 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandlerTest.java
@@ -24,7 +24,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class StringColumnHandlerTest extends ColumnHandlerTestBase {
+public class StringColumnHandlerTest extends AbstractTestColumnHandler<String>
{
+
public StringColumnHandlerTest() {
super(new StringColumnHandler(), String.class);
}
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/TestColumnHandler.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/TestColumnHandler.java
index fce6281..b16f673 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/TestColumnHandler.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/TestColumnHandler.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
import org.apache.commons.dbutils.ColumnHandler;
-public class TestColumnHandler implements ColumnHandler {
+public class TestColumnHandler implements ColumnHandler<Object> {
@Override
public Object apply(final ResultSet rs, final int columnIndex) throws
SQLException {
diff --git
a/src/test/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandlerTest.java
b/src/test/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandlerTest.java
index dbeb5a8..24116a4 100644
---
a/src/test/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandlerTest.java
+++
b/src/test/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandlerTest.java
@@ -27,7 +27,8 @@ import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class TimestampColumnHandlerTest extends ColumnHandlerTestBase {
+public class TimestampColumnHandlerTest extends
AbstractTestColumnHandler<Timestamp> {
+
public TimestampColumnHandlerTest() {
super(new TimestampColumnHandler(), Timestamp.class);
}
