github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#11912] KotlinGenerator generates invalid code when column names X and isX clash

Browse Source
This commit is contained in:
Lukas Eder 2021-05-26 11:06:30 +02:00
parent 01bbe93e12
commit 67639e1076
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -2348,6 +2348,7 @@ public class JavaGenerator extends AbstractGenerator {
printColumnJPAAnnotation(out, (ColumnDefinition) column);
printValidationAnnotation(out, column);
printKotlinSetterAnnotation(out, column, Mode.RECORD);
out.println("%s%svar %s: %s?", visibility(generateInterfaces()), (generateInterfaces() ? "override " : ""), member, type);
out.tab(1).println("set(value): %s = set(%s, value)", setterReturnType, index);
@ -2938,6 +2939,8 @@ public class JavaGenerator extends AbstractGenerator {
printValidationAnnotation(out, column);
printNullableOrNonnullAnnotation(out, column);
if (kotlin)
printKotlinSetterAnnotation(out, column, Mode.INTERFACE);
if (scala)
out.println("%sdef %s: %s", visibilityPublic(), scalaWhitespaceSuffix(getter), type);
@ -4500,6 +4503,7 @@ public class JavaGenerator extends AbstractGenerator {
printColumnJPAAnnotation(out, (ColumnDefinition) column);
printValidationAnnotation(out, column);
printKotlinSetterAnnotation(out, column, Mode.POJO);
out.println("%s%s%s %s: %s? = null%s",
visibility(generateInterfaces()),
@ -7251,6 +7255,23 @@ public class JavaGenerator extends AbstractGenerator {
}
}
protected void printKotlinSetterAnnotation(JavaWriter out, TypedElementDefinition<?> column, Mode mode) {
// [#11912] When X and IS_X create conflicts, we need to resolve
// them by specifying an explicit setter name
if (column instanceof ColumnDefinition) {
String member = getStrategy().getJavaMemberName(column, mode);
if (member.startsWith("is") && ((ColumnDefinition) column)
.getContainer()
.getColumns()
.stream()
.anyMatch(c -> member.equals("is" + StringUtils.toUC(getStrategy().getJavaMemberName(c, mode))))) {
out.println("@set:JvmName(\"%s\")", getStrategy().getJavaSetterName(column, mode));
}
}
}
private String nullableAnnotation(JavaWriter out) {
return generateNullableAnnotation() ? out.ref(generatedNullableAnnotationType()) : null;
}