From 44257064952167f4d4d0a07e58611df869cbd7bc Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 3 Dec 2024 12:13:04 +0100 Subject: [PATCH] [jOOQ/jOOQ#17714] KotlinGenerator doesn't respect visibility modifier configuration for companion object and its contents --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 d4b66edac7..55dd1f553d 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -3695,9 +3695,9 @@ public class JavaGenerator extends AbstractGenerator { out.println("%sopen class %s : %s<%s>(%s.name(\"%s\"), null, %s, %s.comment(\"[[%s]]\"), %s)[[before=, ][%s]] {", visibility(), className, classExtends, recordType, DSL.class, escapeString(udt.getOutputName()), packageId, DSL.class, asList(escapeString(comment)), synthetic, interfaces); out.println(); - out.println("public companion object {"); + out.println("%scompanion object {", visibility()); out.javadoc("The reference instance of %s", udt.getQualifiedOutputName()); - out.println("public val %s: %s = %s()", getStrategy().getJavaIdentifier(udt), className, className); + out.println("%sval %s: %s = %s()", visibility(), getStrategy().getJavaIdentifier(udt), className, className); out.println("}"); } else { @@ -9496,7 +9496,7 @@ public class JavaGenerator extends AbstractGenerator { out.println("%scompanion object {", visibility()); out.javadoc("The reference instance of %s", catalogName); - out.println("public val %s: %s = %s()", catalogId, className, className); + out.println("%sval %s: %s = %s()", visibility(), catalogId, className, className); out.println("}"); } else { @@ -9624,7 +9624,7 @@ public class JavaGenerator extends AbstractGenerator { out.println("%sopen class %s : %s(%s.name(\"%s\"), %s, %s.comment(\"[[%s]]\"))[[before=, ][%s]] {", visibility(), className, classExtends, DSL.class, escapeString(schema.getOutputName()), catalogId, DSL.class, asList(escapeString(comment)), interfaces); - out.println("public companion object {"); + out.println("%scompanion object {", visibility()); out.javadoc("The reference instance of %s", schemaName); out.println("%sval %s: %s = %s()", visibility(), scalaWhitespaceSuffix(schemaId), className, className); out.println("}");