From cb799e8aed64cf56010e2ade067158a352ff76a3 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 23 Apr 2021 16:53:00 +0200
Subject: [PATCH] [jOOQ/jOOQ#11799] Java 8 fix

---
 jOOQ/src/main/java/org/jooq/impl/DSL.java             | 8 ++++----
 jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index b940c8c271..2e99cf3377 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -19296,7 +19296,7 @@ public class DSL {
     @NotNull
     @Support({ H2, MARIADB, MYSQL, POSTGRES })
     public static JSONObjectNullStep<JSON> jsonObject(Field<?>... entries) {
-        return new JSONObject<>(SQLDataType.JSON, Tools.mapToList(entries, f -> jsonEntry(f)));
+        return new JSONObject<>(SQLDataType.JSON, Tools.jsonEntries(entries));
     }
 
     /**
@@ -19323,7 +19323,7 @@ public class DSL {
     @NotNull
     @Support({ H2, MARIADB, MYSQL, POSTGRES })
     public static JSONObjectNullStep<JSONB> jsonbObject(Field<?>... entries) {
-        return new JSONObject<>(SQLDataType.JSONB, Tools.mapToList(entries, f -> jsonEntry(f)));
+        return new JSONObject<>(SQLDataType.JSONB, Tools.jsonEntries(entries));
     }
 
     /**
@@ -27561,7 +27561,7 @@ public class DSL {
     @NotNull
     @Support
     public static <T> Table<Record1<T>> values(T... values) {
-        return values(Tools.map(values, t -> row(t), Row1[]::new));
+        return values(Tools.<T, Row1<T>>map(values, t -> row(t), Row1[]::new));
     }
 
     /**
@@ -27594,7 +27594,7 @@ public class DSL {
     @NotNull
     @Support
     public static <T> Table<Record1<T>> values(Field<T>... values) {
-        return values(Tools.map(values, f -> row(f), Row1[]::new));
+        return values(Tools.<Field<T>, Row1<T>>map(values, f -> row(f), Row1[]::new));
     }
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 2c2e529a19..af3884cc65 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -3213,7 +3213,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
                 // [#7222] Workaround for https://issues.apache.org/jira/browse/DERBY-6983
                 if (ctx.family() == DERBY)
-                    ctx.visit(new SelectFieldList<>(mapToList(fields, Tools::unqualified)));
+                    ctx.visit(new SelectFieldList<Field<?>>(mapToList(fields, Tools::unqualified)));
                 else
                     ctx.sql('*');