[#9288] Avoid naming conflicts with j.u.s.Collectors

jOOQ · May 17, 2021 · 8fcb14e · 8fcb14e
1 parent a29873a
commit 8fcb14e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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 @@ protected void loadForeignKeys(final DefaultRelations relations) throws SQLExcep
                     .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
@@ -41,6 +41,7 @@
 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 @@ private List<String> enumLabels(String nspname, String typname, Field<?> orderBy
                 .where(PG_ENUM.pgType().pgNamespace().NSPNAME.eq(nspname))
                 .and(PG_ENUM.pgType().TYPNAME.eq(typname))
                 .orderBy(orderBy)
-                .collect(Records.toList());
+                .collect(intoList());
     }
 }