From e45a9eaf1f1fa9150aabb62de57052a85eefa385 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 6 Sep 2024 09:53:30 +0200 Subject: [PATCH] [jOOQ/jOOQ#17196] ScalaGenerator produces wrong code when generated interfaces (traits) extend multiple other interfaces --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 1d96bbec39..bdbb3c3881 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -3348,7 +3348,7 @@ public class JavaGenerator extends AbstractGenerator { printTableJPAAnnotation(out, (TableDefinition) tableUdtOrEmbeddable); if (scala) - out.println("%strait %s[[before= extends ][%s]] {", visibility(), className, interfaces); + out.println("%strait %s[[before= extends ][separator= with ][%s]] {", visibility(), className, interfaces); else if (kotlin) out.println("%sinterface %s[[before= : ][%s]] {", visibility(), className, interfaces); else @@ -5837,8 +5837,7 @@ public class JavaGenerator extends AbstractGenerator { ? out.ref(getStrategy().getFullJavaClassName(tableUdtOrEmbeddable, Mode.INTERFACE)) : ""; final String superName = - // [#644] [#17189] TODO: Support this in ScalaGenerator - !scala && udtSupertype(tableUdtOrEmbeddable) != null + udtSupertype(tableUdtOrEmbeddable) != null ? out.ref(getStrategy().getFullJavaClassName(udtSupertype(tableUdtOrEmbeddable), Mode.POJO)) + (kotlin ? "(" + udtSupertype(tableUdtOrEmbeddable) .getAttributes()