From 8fcb14edede55211928e2fc4f18fa620d3c236e7 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 17 May 2021 10:52:58 +0200
Subject: [PATCH] [jOOQ/jOOQ#9288] Avoid naming conflicts with j.u.s.Collectors

---
 .../src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java    | 4 ++--
 .../main/java/org/jooq/meta/postgres/PostgresDatabase.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java
index dc078dc3ef..6678bc50bd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java
@@ -38,7 +38,7 @@
 
 package org.jooq.meta.cubrid;
 
-import static org.jooq.Records.toList;
+import static org.jooq.Records.intoList;
 import static org.jooq.impl.DSL.concat;
 import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.name;
@@ -137,7 +137,7 @@ public class CUBRIDDatabase extends AbstractDatabase {
                     .selectDistinct(DB_INDEX.CLASS_NAME)
                     .from(DB_INDEX)
                     .where(DB_INDEX.IS_FOREIGN_KEY.isTrue())
-                    .collect(toList())) {
+                    .collect(intoList())) {
 
                 for (Record record : create().fetch(meta.getImportedKeys(null, null, table))) {
                     String foreignKeyName =
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
index 6b5637d06e..f741749478 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
@@ -41,6 +41,7 @@ package org.jooq.meta.postgres;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
+import static org.jooq.Records.intoList;
 import static org.jooq.Records.mapping;
 import static org.jooq.Rows.toRowArray;
 import static org.jooq.SQLDialect.POSTGRES;
@@ -1183,6 +1184,6 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat
                 .where(PG_ENUM.pgType().pgNamespace().NSPNAME.eq(nspname))
                 .and(PG_ENUM.pgType().TYPNAME.eq(typname))
                 .orderBy(orderBy)
-                .collect(Records.toList());
+                .collect(intoList());
     }
 }