github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lukas Eder 2021-05-17 10:52:58 +02:00
parent a29873aee4
commit 8fcb14eded
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ-meta/src/main/java/org/jooq/meta/cubrid/CUBRIDDatabase.java
View File

@ -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 =

3
jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java
View File

@ -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());
}
}