From 593ad03ab4e24733b569a060a9d11dbee0db13a4 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 8 Mar 2021 12:19:34 +0100 Subject: [PATCH] [jOOQ/jOOQ#11585] Remove unnecessary restriction from sequences and domains "Must provide a qualified name of length 1 or 2" --- jOOQ/src/main/java/org/jooq/impl/DSL.java | 42 +++++++---------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index c972ef561f..c7ed20ff60 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -11762,16 +11762,7 @@ public class DSL { @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) public static Sequence sequenceByName(DataType type, String... qualifiedName) { - if (qualifiedName == null) - throw new NullPointerException(); - - if (qualifiedName.length < 1 || qualifiedName.length > 2) - throw new IllegalArgumentException("Must provide a qualified name of length 1 or 2 : " + name(qualifiedName)); - - String name = qualifiedName[qualifiedName.length - 1]; - Schema schema = qualifiedName.length == 2 ? schemaByName(qualifiedName[0]) : null; - - return new SequenceImpl<>(name, schema, type); + return sequence(name(qualifiedName), type); } /** @@ -11828,16 +11819,12 @@ public class DSL { @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) public static Sequence sequence(Name name, DataType type) { - if (name == null) - throw new NullPointerException(); - - if (name.getName().length < 1 || name.getName().length > 2) - throw new IllegalArgumentException("Must provide a qualified name of length 1 or 2 : " + name); - - Name n = name.unqualifiedName(); - Schema s = name.parts().length == 2 ? schema(name.qualifier()) : null; - - return new SequenceImpl<>(n, s, type, false); + return new SequenceImpl<>( + name.unqualifiedName(), + name.qualified() ? schema(name.qualifier()) : null, + type, + false + ); } /** @@ -13567,16 +13554,11 @@ public class DSL { @NotNull @Support({ FIREBIRD, H2, HSQLDB, POSTGRES }) public static Domain domain(Name name) { - if (name == null) - throw new NullPointerException(); - - if (name.getName().length < 1 || name.getName().length > 2) - throw new IllegalArgumentException("Must provide a qualified name of length 1 or 2 : " + name); - - Name n = name.unqualifiedName(); - Schema s = name.parts().length == 2 ? schema(name.qualifier()) : null; - - return new DomainImpl<>(s, n, new DefaultDataType<>(null, Object.class, name)); + return new DomainImpl<>( + name.qualified() ? schema(name.qualifier()) : null, + name.unqualifiedName(), + new DefaultDataType<>(null, Object.class, name) + ); } /**