From 1976d6eb26c66d57aa2d0c68983ba6ccb2cae5f3 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 24 Sep 2020 10:52:25 +0200 Subject: [PATCH] [jOOQ/jOOQ#10682] Add Collection overload for CatalogMetaProvider, SchemaMetaProvider, TableMetaProvider constructors --- jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java | 1 - jOOQ/src/main/java/org/jooq/impl/CatalogMetaProvider.java | 8 ++++++++ jOOQ/src/main/java/org/jooq/impl/SchemaMetaProvider.java | 8 ++++++++ jOOQ/src/main/java/org/jooq/impl/TableMetaProvider.java | 8 ++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java index ad5cccc617..7b2fd235b3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaImpl.java @@ -93,7 +93,6 @@ final class CatalogMetaImpl extends AbstractMeta { return filterSchemas(configuration, new HashSet<>(Arrays.asList(schemas))); } - static final Meta filterSchemas(Configuration configuration, final Set schemas) { // TODO: Some schemas may belong to another catalog diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaProvider.java index 029b5a5bac..93b50fb546 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogMetaProvider.java @@ -37,6 +37,10 @@ */ package org.jooq.impl; +import static org.jooq.impl.Tools.EMPTY_CATALOG; + +import java.util.Collection; + import org.jooq.Catalog; import org.jooq.Configuration; import org.jooq.Meta; @@ -58,6 +62,10 @@ public class CatalogMetaProvider implements MetaProvider { this.catalogs = catalogs; } + public CatalogMetaProvider(Configuration configuration, Collection catalogs) { + this(configuration, catalogs.toArray(EMPTY_CATALOG)); + } + @Override public Meta provide() { return CatalogMetaImpl.filterCatalogs(configuration, catalogs); diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/SchemaMetaProvider.java index 9152632e97..434f540119 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaMetaProvider.java @@ -37,6 +37,10 @@ */ package org.jooq.impl; +import static org.jooq.impl.Tools.EMTPY_SCHEMA; + +import java.util.Collection; + import org.jooq.Configuration; import org.jooq.Meta; import org.jooq.MetaProvider; @@ -58,6 +62,10 @@ public class SchemaMetaProvider implements MetaProvider { this.schemas = schemas; } + public SchemaMetaProvider(Configuration configuration, Collection schemas) { + this(configuration, schemas.toArray(EMTPY_SCHEMA)); + } + @Override public Meta provide() { return CatalogMetaImpl.filterSchemas(configuration, schemas); diff --git a/jOOQ/src/main/java/org/jooq/impl/TableMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/TableMetaProvider.java index 53a431e7f5..e2666189fe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableMetaProvider.java @@ -37,6 +37,10 @@ */ package org.jooq.impl; +import static org.jooq.impl.Tools.EMPTY_TABLE; + +import java.util.Collection; + import org.jooq.Configuration; import org.jooq.Meta; import org.jooq.MetaProvider; @@ -58,6 +62,10 @@ public class TableMetaProvider implements MetaProvider { this.tables = tables; } + public TableMetaProvider(Configuration configuration, Collection> tables) { + this(configuration, tables.toArray(EMPTY_TABLE)); + } + @Override public Meta provide() { return CatalogMetaImpl.filterTables(configuration, tables);