From 12b913a2d99bc8e204d2317919ceeee5c4ccec24 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 27 Oct 2012 23:28:57 +0200
Subject: [PATCH] [#1374] Review usage of generics. Is <? extends T> really
 justified?

---
 .../src/main/resources/manual-3.0.xml         |  1 +
 jOOQ/src/main/java/org/jooq/DataType.java     |  4 ++--
 jOOQ/src/main/java/org/jooq/Field.java        |  4 ++--
 jOOQ/src/main/java/org/jooq/Parameter.java    |  2 +-
 jOOQ/src/main/java/org/jooq/UDT.java          |  2 +-
 .../java/org/jooq/impl/AbstractDataType.java  | 20 ++++++++--------
 .../java/org/jooq/impl/AbstractField.java     |  4 ++--
 .../java/org/jooq/impl/DefaultDataType.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/Factory.java | 16 ++++++-------
 .../java/org/jooq/impl/FieldTypeHelper.java   | 24 +++++++++----------
 .../java/org/jooq/impl/ParameterImpl.java     |  2 +-
 .../main/java/org/jooq/impl/SQLDataType.java  |  4 ++--
 jOOQ/src/main/java/org/jooq/impl/UDTImpl.java |  2 +-
 jOOQ/src/main/java/org/jooq/impl/Utils.java   |  3 ++-
 .../java/org/jooq/util/ase/ASEDataType.java   |  2 +-
 .../org/jooq/util/cubrid/CUBRIDDataType.java  |  2 +-
 .../java/org/jooq/util/db2/DB2DataType.java   |  2 +-
 .../org/jooq/util/derby/DerbyDataType.java    |  2 +-
 .../jooq/util/firebird/FirebirdDataType.java  |  2 +-
 .../java/org/jooq/util/h2/H2DataType.java     |  2 +-
 .../org/jooq/util/hsqldb/HSQLDBDataType.java  |  2 +-
 .../org/jooq/util/ingres/IngresDataType.java  |  2 +-
 .../org/jooq/util/mysql/MySQLDataType.java    |  2 +-
 .../org/jooq/util/oracle/OracleDataType.java  |  2 +-
 .../jooq/util/postgres/PostgresDataType.java  |  2 +-
 .../org/jooq/util/sqlite/SQLiteDataType.java  |  2 +-
 .../util/sqlserver/SQLServerDataType.java     |  2 +-
 .../org/jooq/util/sybase/SybaseDataType.java  |  2 +-
 .../test/java/org/jooq/test/TestDataType.java |  2 +-
 29 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/jOOQ-website/src/main/resources/manual-3.0.xml b/jOOQ-website/src/main/resources/manual-3.0.xml
index 2f76c77eba..091b48ed30 100644
--- a/jOOQ-website/src/main/resources/manual-3.0.xml
+++ b/jOOQ-website/src/main/resources/manual-3.0.xml
@@ -9072,6 +9072,7 @@ SERVER = new RemoteDebuggerServer(DEBUGGER_PORT);</java>
 							<h3>Quantified comparison predicates (no deprecation yet)</h3>
 							<h3>Master data types have been removed</h3>
 							<h3>GroupField</h3>
+							<h3>? extends T has been relaxed, e.g. for casting, Field.getType(), etc.</h3>
 							
 							<h3>Object renames</h3>
 							<ul>
diff --git a/jOOQ/src/main/java/org/jooq/DataType.java b/jOOQ/src/main/java/org/jooq/DataType.java
index 7251c76afe..a5826d7d1f 100644
--- a/jOOQ/src/main/java/org/jooq/DataType.java
+++ b/jOOQ/src/main/java/org/jooq/DataType.java
@@ -72,7 +72,7 @@ public interface DataType<T> extends Serializable {
     /**
      * Retrieve the Java type associated with this data type
      */
-    Class<? extends T> getType();
+    Class<T> getType();
 
     /**
      * Retrieve a Java type associated with this data type and precision/scale
@@ -82,7 +82,7 @@ public interface DataType<T> extends Serializable {
     /**
      * Retrieve the Java type associated with ARRAYs of this data type
      */
-    Class<? extends T[]> getArrayType();
+    Class<T[]> getArrayType();
 
     /**
      * Retrieve the data type for an ARRAY of this data type
diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java
index 8940a2fbf7..9c0632df1a 100644
--- a/jOOQ/src/main/java/org/jooq/Field.java
+++ b/jOOQ/src/main/java/org/jooq/Field.java
@@ -92,7 +92,7 @@ public interface Field<T> extends GroupField {
     /**
      * The Java type of the field.
      */
-    Class<? extends T> getType();
+    Class<T> getType();
 
     /**
      * The type of this field (might not be dialect-specific)
@@ -170,7 +170,7 @@ public interface Field<T> extends GroupField {
      * @see #cast(DataType)
      */
     @Support
-    <Z> Field<Z> cast(Class<? extends Z> type);
+    <Z> Field<Z> cast(Class<Z> type);
 
     // ------------------------------------------------------------------------
     // Conversion of field into a sort field
diff --git a/jOOQ/src/main/java/org/jooq/Parameter.java b/jOOQ/src/main/java/org/jooq/Parameter.java
index 79e330e0d4..99588400a4 100644
--- a/jOOQ/src/main/java/org/jooq/Parameter.java
+++ b/jOOQ/src/main/java/org/jooq/Parameter.java
@@ -54,7 +54,7 @@ public interface Parameter<T> extends QueryPart {
     /**
      * The Java type of the parameter.
      */
-    Class<? extends T> getType();
+    Class<T> getType();
 
     /**
      * The type of this parameter (might not be dialect-specific)
diff --git a/jOOQ/src/main/java/org/jooq/UDT.java b/jOOQ/src/main/java/org/jooq/UDT.java
index cd1b4e5770..cca94387eb 100644
--- a/jOOQ/src/main/java/org/jooq/UDT.java
+++ b/jOOQ/src/main/java/org/jooq/UDT.java
@@ -57,7 +57,7 @@ public interface UDT<R extends UDTRecord<R>> extends FieldProvider, QueryPart {
     /**
      * @return The record type produced by this table
      */
-    Class<? extends R> getRecordType();
+    Class<R> getRecordType();
 
     /**
      * The UDT's data type as known to the database
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
index bd1608340b..83e9dd9623 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
@@ -89,11 +89,11 @@ public abstract class AbstractDataType<T> implements DataType<T> {
     private final SQLDialect                             dialect;
 
     private final SQLDataType<T>                         sqlDataType;
-    private final Class<? extends T>                     type;
+    private final Class<T>                               type;
     private final String                                 castTypeName;
     private final String                                 typeName;
 
-    private final Class<? extends T[]>                   arrayType;
+    private final Class<T[]>                             arrayType;
 
     private final boolean                                hasPrecisionAndScale;
 
@@ -111,19 +111,19 @@ public abstract class AbstractDataType<T> implements DataType<T> {
         sqlDataTypesByType = new LinkedHashMap<Class<?>, DataType<?>>();
     }
 
-    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<? extends T> type, String typeName) {
+    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<T> type, String typeName) {
         this(dialect, sqldatatype, type, typeName, typeName, false);
     }
 
-    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<? extends T> type, String typeName, String castTypeName) {
+    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<T> type, String typeName, String castTypeName) {
         this(dialect, sqldatatype, type, typeName, castTypeName, false);
     }
 
-    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<? extends T> type, String typeName, boolean hasPrecisionAndScale) {
+    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqldatatype, Class<T> type, String typeName, boolean hasPrecisionAndScale) {
         this(dialect, sqldatatype, type, typeName, typeName, hasPrecisionAndScale);
     }
 
-    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqlDataType, Class<? extends T> type, String typeName, String castTypeName, boolean hasPrecisionAndScale) {
+    protected AbstractDataType(SQLDialect dialect, SQLDataType<T> sqlDataType, Class<T> type, String typeName, String castTypeName, boolean hasPrecisionAndScale) {
         this.dialect = dialect;
 
         // [#858] SQLDataTypes should reference themselves for more convenience
@@ -132,7 +132,7 @@ public abstract class AbstractDataType<T> implements DataType<T> {
         this.typeName = typeName;
         this.castTypeName = castTypeName;
         this.hasPrecisionAndScale = hasPrecisionAndScale;
-        this.arrayType = (Class<? extends T[]>) Array.newInstance(type, 0).getClass();
+        this.arrayType = (Class<T[]>) Array.newInstance(type, 0).getClass();
 
         init();
     }
@@ -282,7 +282,7 @@ public abstract class AbstractDataType<T> implements DataType<T> {
     }
 
     @Override
-    public final Class<? extends T> getType() {
+    public final Class<T> getType() {
         return type;
     }
 
@@ -297,7 +297,7 @@ public abstract class AbstractDataType<T> implements DataType<T> {
     }
 
     @Override
-    public final Class<? extends T[]> getArrayType() {
+    public final Class<T[]> getArrayType() {
         return arrayType;
     }
 
@@ -426,7 +426,7 @@ public abstract class AbstractDataType<T> implements DataType<T> {
         return result;
     }
 
-    protected static <T> DataType<T> getDataType(SQLDialect dialect, Class<? extends T> type) {
+    protected static <T> DataType<T> getDataType(SQLDialect dialect, Class<T> type) {
 
         // Recurse for arrays
         if (byte[].class != type && type.isArray()) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
index f6df3026fc..343c62b00c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
@@ -133,7 +133,7 @@ abstract class AbstractField<T> extends AbstractQueryPart implements Field<T> {
     }
 
     @Override
-    public final Class<? extends T> getType() {
+    public final Class<T> getType() {
         return dataType.getType();
     }
 
@@ -160,7 +160,7 @@ abstract class AbstractField<T> extends AbstractQueryPart implements Field<T> {
     }
 
     @Override
-    public final <Z> Field<Z> cast(Class<? extends Z> type) {
+    public final <Z> Field<Z> cast(Class<Z> type) {
         return cast(SQLDataType.getDataType(null, type));
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
index baf7533c0c..5c6fa40df7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
@@ -50,7 +50,7 @@ class DefaultDataType<T> extends AbstractDataType<T> {
      */
     private static final long serialVersionUID = -2612295936942892367L;
 
-    DefaultDataType(SQLDialect dialect, Class<? extends T> type, String typeName, String castTypeName) {
+    DefaultDataType(SQLDialect dialect, Class<T> type, String typeName, String castTypeName) {
         super(dialect, null, type, typeName, castTypeName);
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 465edba2cf..3b74defb62 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -1196,7 +1196,7 @@ public class Factory {
      * @return The cast field
      */
     @Support
-    public static <T> Field<T> cast(Object value, Class<? extends T> type) {
+    public static <T> Field<T> cast(Object value, Class<T> type) {
         return val(value, type).cast(type);
     }
 
@@ -1233,7 +1233,7 @@ public class Factory {
      * @return The cast field
      */
     @Support
-    public static <T> Field<T> castNull(Class<? extends T> type) {
+    public static <T> Field<T> castNull(Class<T> type) {
         return NULL().cast(type);
     }
 
@@ -1246,7 +1246,7 @@ public class Factory {
      * @return The cast fields
      */
     @SuppressWarnings("unchecked")
-    static <T> Field<T>[] castAll(Class<? extends T> type, Field<?>... fields) {
+    static <T> Field<T>[] castAll(Class<T> type, Field<?>... fields) {
         Field<?>[] castFields = new Field<?>[fields.length];
 
         for (int i = 0; i < fields.length; i++) {
@@ -4449,7 +4449,7 @@ public class Factory {
      * @see #param(String, Object)
      */
     @Support
-    public static <T> Param<T> param(String name, Class<? extends T> type) {
+    public static <T> Param<T> param(String name, Class<T> type) {
         return param(name, SQLDataType.getDataType(null, type));
     }
 
@@ -4503,7 +4503,7 @@ public class Factory {
      * @see #val(Object, Class)
      */
     @Support
-    public static <T> Field<T> value(Object value, Class<? extends T> type) {
+    public static <T> Field<T> value(Object value, Class<T> type) {
         return val(value, type);
     }
 
@@ -4611,7 +4611,7 @@ public class Factory {
      * @see #val(Object, Class)
      */
     @Support
-    public static <T> Param<T> inline(Object value, Class<? extends T> type) {
+    public static <T> Param<T> inline(Object value, Class<T> type) {
         // [#1309] TODO, make this type-safe
         Param<T> val = (Param<T>) val(value, type);
         val.setInline(true);
@@ -4714,7 +4714,7 @@ public class Factory {
      * @see #val(Object, DataType)
      */
     @Support
-    public static <T> Field<T> val(Object value, Class<? extends T> type) {
+    public static <T> Field<T> val(Object value, Class<T> type) {
         return val(value, getDataType(type));
     }
 
@@ -5145,7 +5145,7 @@ public class Factory {
      */
     @SuppressWarnings("deprecation")
     @Support
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return FieldTypeHelper.getDataType(SQLDialect.SQL99, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java b/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
index aa90ae1db1..bfff991cbd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java
@@ -118,7 +118,7 @@ public final class FieldTypeHelper {
 
     @SuppressWarnings("unchecked")
     public static <T> T getFromSQLInput(Configuration configuration, SQLInput stream, Field<T> field) throws SQLException {
-        Class<? extends T> type = field.getType();
+        Class<T> type = field.getType();
         DataType<T> dataType = field.getDataType();
 
         if (type == Blob.class) {
@@ -229,12 +229,10 @@ public final class FieldTypeHelper {
     }
 
     public static <T> void writeToSQLOutput(SQLOutput stream, Field<T> field, T value) throws SQLException {
-        Class<? extends T> type = field.getType();
-
-        writeToSQLOutput(stream, type, field.getDataType(), value);
+        writeToSQLOutput(stream, field.getType(), field.getDataType(), value);
     }
 
-    private static <T> void writeToSQLOutput(SQLOutput stream, Class<? extends T> type, DataType<T> dataType, T value) throws SQLException {
+    private static <T> void writeToSQLOutput(SQLOutput stream, Class<T> type, DataType<T> dataType, T value) throws SQLException {
         if (value == null) {
             stream.writeObject(null);
         }
@@ -376,7 +374,7 @@ public final class FieldTypeHelper {
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T getFromResultSet(ExecuteContext ctx, Class<? extends T> type, int index)
+    private static <T> T getFromResultSet(ExecuteContext ctx, Class<T> type, int index)
         throws SQLException {
 
         ResultSet rs = ctx.resultSet();
@@ -390,7 +388,7 @@ public final class FieldTypeHelper {
         else if (type == BigInteger.class) {
         	// The SQLite JDBC driver doesn't support BigDecimals
             if (ctx.getDialect() == SQLDialect.SQLITE) {
-                return Convert.convert(rs.getString(index), (Class<? extends T>) BigInteger.class);
+                return Convert.convert(rs.getString(index), (Class<T>) BigInteger.class);
             }
             else {
                 BigDecimal result = rs.getBigDecimal(index);
@@ -400,7 +398,7 @@ public final class FieldTypeHelper {
         else if (type == BigDecimal.class) {
             // The SQLite JDBC driver doesn't support BigDecimals
             if (ctx.getDialect() == SQLDialect.SQLITE) {
-                return Convert.convert(rs.getString(index), (Class<? extends T>) BigDecimal.class);
+                return Convert.convert(rs.getString(index), (Class<T>) BigDecimal.class);
             }
             else {
                 return (T) rs.getBigDecimal(index);
@@ -663,7 +661,7 @@ public final class FieldTypeHelper {
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T getEnumType(Class<? extends T> type, String literal) throws SQLException {
+    private static <T> T getEnumType(Class<T> type, String literal) throws SQLException {
         try {
             Object[] list = (Object[]) type.getMethod("values").invoke(type);
 
@@ -683,7 +681,7 @@ public final class FieldTypeHelper {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T getFromStatement(ExecuteContext ctx, Class<? extends T> type, int index) throws SQLException {
+    public static <T> T getFromStatement(ExecuteContext ctx, Class<T> type, int index) throws SQLException {
         CallableStatement stmt = (CallableStatement) ctx.statement();
 
         if (type == Blob.class) {
@@ -882,7 +880,7 @@ public final class FieldTypeHelper {
         }
     }
 
-    public static <T> DataType<T> getDataType(SQLDialect dialect, Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(SQLDialect dialect, Class<T> type) {
         switch (dialect) {
             case ASE:
                 return ASEDataType.getDataType(type);
@@ -931,7 +929,7 @@ public final class FieldTypeHelper {
     // -------------------------------------------------------------------------
 
     @SuppressWarnings("unchecked")
-    private static <T> T pgFromString(Class<? extends T> type, String string) throws SQLException {
+    private static <T> T pgFromString(Class<T> type, String string) throws SQLException {
         if (string == null) {
             return null;
         }
@@ -1055,7 +1053,7 @@ public final class FieldTypeHelper {
      * Workarounds for the unimplemented Postgres JDBC driver features
      */
     @SuppressWarnings("unchecked")
-    private static <T> T pgGetArray(ExecuteContext ctx, Class<? extends T> type, int index)
+    private static <T> T pgGetArray(ExecuteContext ctx, Class<T> type, int index)
         throws SQLException {
 
         ResultSet rs = ctx.resultSet();
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
index 6913820771..79f8a261ef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
@@ -77,7 +77,7 @@ class ParameterImpl<T> extends AbstractQueryPart implements Parameter<T> {
     }
 
     @Override
-    public final Class<? extends T> getType() {
+    public final Class<T> getType() {
         return type.getType();
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
index fe1d83d33c..eda62e4d5c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLDataType.java
@@ -327,11 +327,11 @@ public final class SQLDataType<T> extends AbstractDataType<T> {
         } catch (Exception ignore) {}
     }
 
-    private SQLDataType(Class<? extends T> type, String typeName) {
+    private SQLDataType(Class<T> type, String typeName) {
         this(type, typeName, false);
     }
 
-    private SQLDataType(Class<? extends T> type, String typeName, boolean hasPrecisionAndScale) {
+    private SQLDataType(Class<T> type, String typeName, boolean hasPrecisionAndScale) {
         super(null, null, type, typeName, hasPrecisionAndScale);
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
index effcb830b7..7048e97aa7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
@@ -87,7 +87,7 @@ public class UDTImpl<R extends UDTRecord<R>> extends AbstractFieldProviderQueryP
      * parameter <R> for other types than {@link Record}
      */
     @Override
-    public Class<? extends R> getRecordType() {
+    public Class<R> getRecordType() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index b2bf19bfe1..7d4a0a9d7b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -549,7 +549,8 @@ final class Utils {
                     result.add((QueryPart) substitute);
                 }
                 else {
-                    Class<?> type = substitute != null ? substitute.getClass() : Object.class;
+                    @SuppressWarnings("unchecked")
+                    Class<Object> type = (Class<Object>) (substitute != null ? substitute.getClass() : Object.class);
                     result.add(new Val<Object>(substitute, Factory.getDataType(type)));
                 }
             }
diff --git a/jOOQ/src/main/java/org/jooq/util/ase/ASEDataType.java b/jOOQ/src/main/java/org/jooq/util/ase/ASEDataType.java
index 011d1f6248..06a702455b 100644
--- a/jOOQ/src/main/java/org/jooq/util/ase/ASEDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/ase/ASEDataType.java
@@ -122,7 +122,7 @@ public class ASEDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.ASE, sqlDataType, sqlDataType.getType(), typeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.ASE, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java
index 1cdb45a8cb..29619786c6 100644
--- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java
@@ -141,7 +141,7 @@ public class CUBRIDDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.CUBRID, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.CUBRID, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/db2/DB2DataType.java b/jOOQ/src/main/java/org/jooq/util/db2/DB2DataType.java
index 2fec877c09..01ff4f99d6 100644
--- a/jOOQ/src/main/java/org/jooq/util/db2/DB2DataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/db2/DB2DataType.java
@@ -122,7 +122,7 @@ public class DB2DataType<T> extends AbstractDataType<T> {
         super(SQLDialect.DB2, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.DB2, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java
index 794a0b7662..22f83c1b8c 100644
--- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java
@@ -135,7 +135,7 @@ public class DerbyDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.DERBY, sqlDataType, sqlDataType.getType(), typeName, castName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.DERBY, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
index d56075776b..2299974003 100644
--- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java
@@ -127,7 +127,7 @@ public class FirebirdDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.FIREBIRD, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.FIREBIRD, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
index 43f31119f3..8e2b3d9861 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
@@ -148,7 +148,7 @@ public class H2DataType<T> extends AbstractDataType<T> {
         super(SQLDialect.H2, sqlDataType, sqlDataType.getType(), typeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.H2, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java
index 6c7aaa5bc8..c4e33f6b85 100644
--- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java
@@ -135,7 +135,7 @@ public class HSQLDBDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.HSQLDB, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.HSQLDB, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/ingres/IngresDataType.java b/jOOQ/src/main/java/org/jooq/util/ingres/IngresDataType.java
index 0e7f6df531..33fa9f20ff 100644
--- a/jOOQ/src/main/java/org/jooq/util/ingres/IngresDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/ingres/IngresDataType.java
@@ -146,7 +146,7 @@ public class IngresDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.INGRES, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.INGRES, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java
index 903f829e96..c038a30094 100644
--- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java
@@ -136,7 +136,7 @@ public class MySQLDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.MYSQL, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.MYSQL, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/oracle/OracleDataType.java b/jOOQ/src/main/java/org/jooq/util/oracle/OracleDataType.java
index 5ff729f07c..6f99c6c3eb 100644
--- a/jOOQ/src/main/java/org/jooq/util/oracle/OracleDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/oracle/OracleDataType.java
@@ -157,7 +157,7 @@ public class OracleDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.ORACLE, sqlDataType, sqlDataType.getType(), typeName, castTypeName, hasPrecisionAndScale);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.ORACLE, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java
index 5cfbc1cc05..cb849c7089 100644
--- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java
@@ -153,7 +153,7 @@ public class PostgresDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.POSTGRES, sqlDataType, sqlDataType.getType(), typeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.POSTGRES, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java
index 31eccbd3f6..e8a1b18b20 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java
@@ -121,7 +121,7 @@ public class SQLiteDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.SQLITE, sqlDataType, sqlDataType.getType(), typeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.SQLITE, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDataType.java b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDataType.java
index 628200f453..edc53d01f9 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDataType.java
@@ -124,7 +124,7 @@ public class SQLServerDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.SQLSERVER, sqlDataType, sqlDataType.getType(), typeName, castTypeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.SQLSERVER, type);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDataType.java b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDataType.java
index 9a5884be9e..93d18ea132 100644
--- a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDataType.java
@@ -122,7 +122,7 @@ public class SybaseDataType<T> extends AbstractDataType<T> {
         super(SQLDialect.SYBASE, sqlDataType, sqlDataType.getType(), typeName);
     }
 
-    public static <T> DataType<T> getDataType(Class<? extends T> type) {
+    public static <T> DataType<T> getDataType(Class<T> type) {
         return getDataType(SQLDialect.SYBASE, type);
     }
 
diff --git a/jOOQ/src/test/java/org/jooq/test/TestDataType.java b/jOOQ/src/test/java/org/jooq/test/TestDataType.java
index 57215f7f1a..6e48bb6134 100644
--- a/jOOQ/src/test/java/org/jooq/test/TestDataType.java
+++ b/jOOQ/src/test/java/org/jooq/test/TestDataType.java
@@ -55,7 +55,7 @@ public final class TestDataType<T> extends AbstractDataType<T> {
     public static final DataType<String>  STRING_TYPE      = new TestDataType<String>(String.class);
     public static final DataType<Date>    DATE_TYPE        = new TestDataType<Date>(Date.class);
 
-    protected TestDataType(Class<? extends T> type) {
+    protected TestDataType(Class<T> type) {
         super(SQLDialect.ORACLE, null, type, type.getSimpleName());
     }
 }