[#16006] Compilation error in KotlinGenerator generated code

when GeneratorStrategy produces identifiers conflicting with property access syntax of AbstractRoutine getters
jOOQ · Jan 5, 2024 · c901b2d · c901b2d
1 parent 902a5c9
commit c901b2d
Showing 1 changed file with 9 additions and 9 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
@@ -9480,15 +9480,15 @@ else if (kotlin) {
                     if (scala)
                         out.println("setSyntheticReturnParameter(%s.%s)", className, paramId);
                     else if (kotlin)
-                        out.println("setSyntheticReturnParameter(%s)", paramId);
+                        out.println("setSyntheticReturnParameter(%s.%s)", className, paramId);
                     else
                         out.println("setSyntheticReturnParameter(%s);", paramId);
                 }
                 else {
                     if (scala)
                         out.println("setReturnParameter(%s.%s)", className, paramId);
                     else if (kotlin)
-                        out.println("returnParameter = %s", paramId);
+                        out.println("returnParameter = %s.%s", className, paramId);
                     else
                         out.println("setReturnParameter(%s);", paramId);
                 }
@@ -9498,15 +9498,15 @@ else if (routine.getInParameters().contains(parameter)) {
                     if (scala)
                         out.println("addInOutParameter(%s.%s)", className, paramId);
                     else if (kotlin)
-                        out.println("addInOutParameter(%s)", paramId);
+                        out.println("addInOutParameter(%s.%s)", className, paramId);
                     else
                         out.println("addInOutParameter(%s);", paramId);
                 }
                 else {
                     if (scala)
                         out.println("addInParameter(%s.%s)", className, paramId);
                     else if (kotlin)
-                        out.println("addInParameter(%s)", paramId);
+                        out.println("addInParameter(%s.%s)", className, paramId);
                     else
                         out.println("addInParameter(%s);", paramId);
                 }
@@ -9515,7 +9515,7 @@ else if (kotlin)
                 if (scala)
                     out.println("addOutParameter(%s.%s)", className, paramId);
                 else if (kotlin)
-                    out.println("addOutParameter(%s)", paramId);
+                    out.println("addOutParameter(%s.%s)", className, paramId);
                 else
                     out.println("addOutParameter(%s);", paramId);
             }
@@ -9567,8 +9567,8 @@ else if (kotlin)
                     visibility(), setter, scalaWhitespaceSuffix(paramName), refNumberType(out, parameter.getType(resolver(out))), numberValue, className, paramId, paramName);
             }
             else if (kotlin) {
-                out.println("%sfun %s(%s: %s?): Unit = set%s(%s, %s)",
-                    visibility(), setter, paramName, refNumberType(out, parameter.getType(resolver(out))), numberValue, paramId, paramName);
+                out.println("%sfun %s(%s: %s?): Unit = set%s(%s.%s, %s)",
+                    visibility(), setter, paramName, refNumberType(out, parameter.getType(resolver(out))), numberValue, className, paramId, paramName);
             }
             else {
                 out.println("%svoid %s(%s %s) {", visibility(), setter, varargsIfArray(refNumberType(out, parameter.getType(resolver(out)))), paramName);
@@ -9590,7 +9590,7 @@ else if (kotlin) {
                 }
                 else if (kotlin) {
                     out.println("%sfun %s(field: %s<%s?>): %s {", visibility(), setter, Field.class, refExtendsNumberType(out, parameter.getType(resolver(out))), setterReturnType);
-                    out.println("set%s(%s, field)", numberField, paramId);
+                    out.println("set%s(%s.%s, field)", numberField, className, paramId);
 
                     if (generateFluentSetters())
                         out.println("return this");
@@ -9627,7 +9627,7 @@ else if (kotlin) {
                     out.println("%sdef %s: %s = get(%s.%s)", visibility(), scalaWhitespaceSuffix(paramGetter), paramType, className, paramId);
                 }
                 else if (kotlin) {
-                    out.println("%sfun %s(): %s? = get(%s)", visibility(), paramGetter, paramType, paramId);
+                    out.println("%sfun %s(): %s? = get(%s.%s)", visibility(), paramGetter, paramType, className, paramId);
                 }
                 else {
                     out.println("%s%s %s() {", visibility(), paramType, paramGetter);