From 81b82a56b156264e21caa85852202596f414ca7d Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 26 Jun 2019 10:55:22 +0200
Subject: [PATCH] [jOOQ/jOOQ#8854] Make Tools.fields() methods generic

---
 .../java/org/jooq/impl/AbstractField.java     |  6 ++---
 .../java/org/jooq/impl/CreateTypeImpl.java    |  2 +-
 jOOQ/src/main/java/org/jooq/impl/Tools.java   | 24 +++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
index 05f57ea6a5..04a505e1af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
@@ -864,9 +864,8 @@ abstract class AbstractField<T> extends AbstractNamed implements Field<T> {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public final LikeEscapeStep likeAny(Collection<?> values) {
-        return new CombinedCompareCondition(this, LIKE, Quantifier.ANY, (Collection<? extends Field<String>>) Tools.fields(values, SQLDataType.VARCHAR));
+        return new CombinedCompareCondition(this, LIKE, Quantifier.ANY, Tools.fields(values, SQLDataType.VARCHAR));
     }
 
     @Override
@@ -881,9 +880,8 @@ abstract class AbstractField<T> extends AbstractNamed implements Field<T> {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public final LikeEscapeStep notLikeAll(Collection<?> values) {
-        return new CombinedCompareCondition(this, NOT_LIKE, Quantifier.ALL, (Collection<? extends Field<String>>) Tools.fields(values, SQLDataType.VARCHAR));
+        return new CombinedCompareCondition(this, NOT_LIKE, Quantifier.ALL, Tools.fields(values, SQLDataType.VARCHAR));
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
index b17ffe376c..d05f7aa103 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
@@ -98,7 +98,7 @@ final class CreateTypeImpl extends AbstractRowCountQuery implements
 
     @Override
     public final CreateTypeFinalStep asEnum(Collection<?> v) {
-        values = new QueryPartList<Field<?>>(Tools.fields(v, VARCHAR));
+        values = new QueryPartList<Field<String>>(Tools.fields(v, VARCHAR));
         return this;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 0e06e4a734..aa16513e62 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -1576,11 +1576,11 @@ final class Tools {
      * @return The argument objects themselves, if they are {@link Field}s, or a bind
      *         values created from the argument objects.
      */
-    static final List<Field<?>> fields(Object[] values, Field<?> field) {
+    static final <T> List<Field<T>> fields(Object[] values, Field<T> field) {
         if (values == null || field == null)
-            return new ArrayList<Field<?>>();
+            return new ArrayList<Field<T>>();
 
-        List<Field<?>> result = new ArrayList<Field<?>>(values.length);
+        List<Field<T>> result = new ArrayList<Field<T>>(values.length);
 
         for (int i = 0; i < values.length; i++)
             result.add(field(values[i], field));
@@ -1638,11 +1638,11 @@ final class Tools {
      * @return The argument objects themselves, if they are {@link Field}s, or a bind
      *         values created from the argument objects.
      */
-    static final List<Field<?>> fields(Object[] values, Class<?> type) {
+    static final <T> List<Field<T>> fields(Object[] values, Class<T> type) {
         if (values == null || type == null)
-            return new ArrayList<Field<?>>();
+            return new ArrayList<Field<T>>();
 
-        List<Field<?>> result = new ArrayList<Field<?>>(values.length);
+        List<Field<T>> result = new ArrayList<Field<T>>(values.length);
 
         for (int i = 0; i < values.length; i++)
             result.add(field(values[i], type));
@@ -1679,11 +1679,11 @@ final class Tools {
      * @return The argument objects themselves, if they are {@link Field}s, or a bind
      *         values created from the argument objects.
      */
-    static final List<Field<?>> fields(Object[] values, DataType<?> type) {
+    static final <T> List<Field<T>> fields(Object[] values, DataType<T> type) {
         if (values == null || type == null)
-            return new ArrayList<Field<?>>();
+            return new ArrayList<Field<T>>();
 
-        List<Field<?>> result = new ArrayList<Field<?>>(values.length);
+        List<Field<T>> result = new ArrayList<Field<T>>(values.length);
 
         for (Object value : values)
             result.add(field(value, type));
@@ -1699,11 +1699,11 @@ final class Tools {
      * @return The argument objects themselves, if they are {@link Field}s, or a bind
      *         values created from the argument objects.
      */
-    static final List<Field<?>> fields(Collection<?> values, DataType<?> type) {
+    static final <T> List<Field<T>> fields(Collection<?> values, DataType<T> type) {
         if (values == null || type == null)
-            return new ArrayList<Field<?>>();
+            return new ArrayList<Field<T>>();
 
-        List<Field<?>> result = new ArrayList<Field<?>>(values.size());
+        List<Field<T>> result = new ArrayList<Field<T>>(values.size());
 
         for (Object value : values)
             result.add(field(value, type));