From 05a37398f029a96dad8e39f1fd118b2bdc0e8840 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Fri, 20 Dec 2019 11:05:24 +0100 Subject: [PATCH] [jOOQ/jOOQ#9272] Fix Javadoc of default catalog and schema singletons Fixes the Javadoc comment of the default catalog and schema singletons generated into the `CatalogImpl` and `SchemaImpl` subclasses. For the default catalog and schema the name was always empty. --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 4 ++-- .../org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java | 4 ++-- .../main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java | 4 ++-- .../main/java/org/jooq/example/jpa/jooq/DefaultSchema.java | 4 ++-- .../src/main/java/org/jooq/example/db/h2/DefaultCatalog.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index 4547999830..52853536b6 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -4764,8 +4764,8 @@ public class JavaGenerator extends AbstractGenerator { } protected void generateCatalog(CatalogDefinition catalog, JavaWriter out) { - final String catalogName = catalog.getQualifiedOutputName(); final String catalogId = getStrategy().getJavaIdentifier(catalog); + final String catalogName = !catalog.getQualifiedOutputName().isEmpty() ? catalog.getQualifiedOutputName() : catalogId; final String className = getStrategy().getJavaClassName(catalog); final List interfaces = out.ref(getStrategy().getJavaClassImplements(catalog, Mode.DEFAULT)); @@ -4856,8 +4856,8 @@ public class JavaGenerator extends AbstractGenerator { protected void generateSchema(SchemaDefinition schema, JavaWriter out) { final String catalogId = out.ref(getStrategy().getFullJavaIdentifier(schema.getCatalog()), 2); - final String schemaName = schema.getQualifiedOutputName(); final String schemaId = getStrategy().getJavaIdentifier(schema); + final String schemaName = !schema.getQualifiedOutputName().isEmpty() ? schema.getQualifiedOutputName() : schemaId; final String className = getStrategy().getJavaClassName(schema); final List interfaces = out.ref(getStrategy().getJavaClassImplements(schema, Mode.DEFAULT)); diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java index c2909e34a6..f6184c5801 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java @@ -26,10 +26,10 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 602931876; + private static final long serialVersionUID = -949847017; /** - * The reference instance of + * The reference instance of DEFAULT_CATALOG */ public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java index 48836a599d..d37c845a5c 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java @@ -17,10 +17,10 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = -2138369575; + private static final long serialVersionUID = 1745902354; /** - * The reference instance of + * The reference instance of DEFAULT_CATALOG */ public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog(); diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java index 2dd88111f9..308e564ddd 100644 --- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java +++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java @@ -22,10 +22,10 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultSchema extends SchemaImpl { - private static final long serialVersionUID = 1869451816; + private static final long serialVersionUID = 471838153; /** - * The reference instance of + * The reference instance of DEFAULT_SCHEMA */ public static final DefaultSchema DEFAULT_SCHEMA = new DefaultSchema(); diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/DefaultCatalog.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/DefaultCatalog.java index f8ca455ce5..d9ab83e583 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/DefaultCatalog.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/DefaultCatalog.java @@ -17,10 +17,10 @@ import org.jooq.impl.CatalogImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class DefaultCatalog extends CatalogImpl { - private static final long serialVersionUID = 2007051757; + private static final long serialVersionUID = 1802263030; /** - * The reference instance of + * The reference instance of DEFAULT_CATALOG */ public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();