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

[jOOQ/jOOQ#11716] Using embedded domains with POJO generation results in duplicate getters

Browse Source
This commit is contained in:
Lukas Eder 2024-09-02 13:57:55 +02:00
parent 865765d223
commit 3b10066935
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5828,11 +5828,20 @@ public class JavaGenerator extends AbstractGenerator {
if (tableUdtOrEmbeddable instanceof TableDefinition) {
List<EmbeddableDefinition> embeddables = ((TableDefinition) tableUdtOrEmbeddable).getReferencedEmbeddables();
embeddablesLoop:
for (int i = 0; i < embeddables.size(); i++) {
EmbeddableDefinition embeddable = embeddables.get(i);
if (!generateImmutablePojos())
generateEmbeddablePojoSetter(embeddable, i, out);
generateEmbeddablePojoGetter(embeddable, i, out);
}
}
@ -6052,11 +6061,10 @@ public class JavaGenerator extends AbstractGenerator {
forEach(embeddable.getColumns(), (column, separator) -> {
if (kotlin)
out.tab(1).println("%s%s", getStrategy().getJavaMemberName(column.getReferencingColumn(), Mode.POJO), separator);
else if (generatePojosAsJavaRecordClasses())
out.println("%s%s%s", getStrategy().getJavaMemberName(column.getReferencingColumn(), Mode.POJO), emptyparens, separator);
else
out.println("%s%s%s", generatePojosAsJavaRecordClasses()
? getStrategy().getJavaMemberName(column.getReferencingColumn(), Mode.POJO)
: getStrategy().getJavaGetterName(column.getReferencingColumn(), Mode.POJO), emptyparens, separator
);
out.println("this.%s%s", getStrategy().getJavaMemberName(column.getReferencingColumn(), Mode.POJO), separator);
});
if (scala)
@ -6158,10 +6166,10 @@ public class JavaGenerator extends AbstractGenerator {
}
else {
for (EmbeddableColumnDefinition column : embeddable.getColumns()) {
final String s = getStrategy().getJavaSetterName(column.getReferencingColumn(), Mode.POJO);
final String s = getStrategy().getJavaMemberName(column.getReferencingColumn(), Mode.POJO);
final String g = getStrategy().getJavaGetterName(column, Mode.POJO);
out.println("%s(value.%s%s)%s", s, g, emptyparens, semicolon);
out.println("this.%s = value.%s%s%s", s, g, emptyparens, semicolon);
}
}