From 4bbc9b646334b7d635cb387431c5f16c1a2c0c68 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 20 Nov 2023 16:04:58 +0100 Subject: [PATCH] [jOOQ/jOOQ#15850] Accidental override when enabling for tables with columns X and IS_X in Kotlin --- .../src/main/java/org/jooq/codegen/JavaGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 79a3dd6f68..503da13646 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -3236,7 +3236,7 @@ public class JavaGenerator extends AbstractGenerator { printValidationAnnotation(out, column); printNullableOrNonnullAnnotation(out, column); - if (kotlin) + if (kotlin && !generateImmutableInterfaces()) printKotlinSetterAnnotation(out, column, Mode.INTERFACE); if (scala) @@ -9195,7 +9195,9 @@ public class JavaGenerator extends AbstractGenerator { if (kotlin && generateKotlinSetterJvmNameAnnotationsOnIsPrefix() && column instanceof ColumnDefinition - && P_IS.matcher(getStrategy().getJavaMemberName(column, mode)).matches()) { + + // TODO: The Mode should be INTERFACE + && P_IS.matcher(getStrategy().getJavaMemberName(column, Mode.POJO)).matches()) { // [#12440] And if we have interfaces, we'll run into https://youtrack.jetbrains.com/issue/KT-31420 // [#13467] Since jOOQ 3.17, all these properties are open, so this applies everywhere