From 261d1762934e52ec3d6500d7e2e7668c65721395 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 1 Jun 2018 10:37:39 +0200
Subject: [PATCH] Java 6 fixes

---
 jOOQ/src/main/java/org/jooq/ResultQuery.java          | 2 ++
 jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 9cebeed96d..04120beb42 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -278,6 +278,8 @@ public interface ResultQuery<R extends Record> extends Query, Iterable<R> {
      */
     <X, A> X collect(Collector<? super R, A, X> collector) throws DataAccessException;
 
+
+
     /**
      * Execute the query and "lazily" return the generated result.
      * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index a39eb98527..e726f5dbda 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -644,16 +644,16 @@ final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
 
         // [#7365] PostgreSQL ON CONFLICT (conflict columns) clause
         if (onConflict != null && onConflict.size() > 0)
-            return Collections.singletonList(onConflict);
+            return Collections.<List<? extends Field<?>>>singletonList(onConflict);
 
         // [#7409] PostgreSQL ON CONFLICT ON CONSTRAINT clause
         else if (onConstraintUniqueKey != null)
-            return Collections.singletonList(onConstraintUniqueKey.getFields());
+            return Collections.<List<? extends Field<?>>>singletonList(onConstraintUniqueKey.getFields());
 
         // [#6462] MySQL ON DUPLICATE KEY UPDATE clause
         //         Flag for backwards compatibility considers only PRIMARY KEY
         else if (TRUE.equals(Tools.settings(configuration).isEmulateOnDuplicateKeyUpdateOnPrimaryKeyOnly()))
-            return Collections.singletonList(table.getPrimaryKey().getFields());
+            return Collections.<List<? extends Field<?>>>singletonList(table.getPrimaryKey().getFields());
 
         // [#6462] MySQL ON DUPLICATE KEY UPDATE clause
         //         All conflicting keys are considered