From 7ce9a64fc3c4cb3fc7692fa7b81bdeb3e8cbd179 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 1 May 2020 09:43:42 +0200
Subject: [PATCH] [jOOQ/jOOQ#10015] Fix Java 6 type inference problems

---
 jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java | 3 +--
 jOOQ/src/main/java/org/jooq/impl/Collect.java  | 1 -
 jOOQ/src/main/java/org/jooq/impl/ListAgg.java  | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
index bca1a3e7fd..46bf16c4ca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
@@ -38,7 +38,6 @@
 package org.jooq.impl;
 
 import static org.jooq.impl.Names.N_ARRAY_AGG;
-import static org.jooq.impl.QueryPartListView.wrap;
 
 import org.jooq.Context;
 import org.jooq.Field;
@@ -60,7 +59,7 @@ final class ArrayAgg<T> extends DefaultAggregateFunction<T[]> {
     @Override
     public final void accept(Context<?> ctx) {
         ctx.visit(N_ARRAY_AGG).sql('(');
-        acceptArguments1(ctx, wrap(arguments.get(0)));
+        acceptArguments1(ctx, new QueryPartListView<>(arguments.get(0)));
         acceptOrderBy(ctx);
         ctx.sql(')');
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Collect.java b/jOOQ/src/main/java/org/jooq/impl/Collect.java
index 84a31199a1..bbcf39be63 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Collect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Collect.java
@@ -83,6 +83,5 @@ package org.jooq.impl;
 
 
 
-
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
index 193f189c4c..dbd76ec2f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
@@ -64,7 +64,6 @@ import static org.jooq.impl.Names.N_SUBSTR;
 import static org.jooq.impl.Names.N_XMLAGG;
 import static org.jooq.impl.Names.N_XMLSERIALIZE;
 import static org.jooq.impl.Names.N_XMLTEXT;
-import static org.jooq.impl.QueryPartListView.wrap;
 import static org.jooq.impl.Tools.castIfNeeded;
 
 import java.util.Set;
@@ -132,7 +131,7 @@ final class ListAgg extends DefaultAggregateFunction<String> {
      */
     private final void acceptGroupConcat(Context<?> ctx) {
         ctx.visit(N_GROUP_CONCAT).sql('(');
-        acceptArguments1(ctx, wrap(arguments.get(0)));
+        acceptArguments1(ctx, new QueryPartListView<>(arguments.get(0)));
         acceptOrderBy(ctx);
 
         if (arguments.size() > 1)