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

[jOOQ/jOOQ#6456] Generate comments also on POJOs

Browse Source
This commit is contained in:
Lukas Eder 2020-02-28 16:11:29 +01:00
parent c56c8c28d1
commit e87b2eaa21
1 changed files with 7 additions and 13 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

@ -3517,16 +3517,18 @@ public class JavaGenerator extends AbstractGenerator {
}
private final void generatePojoGetter0(TypedElementDefinition<?> column, @SuppressWarnings("unused") int index, JavaWriter out) {
final String comment = StringUtils.defaultString(column.getComment());
final String columnTypeFull = getJavaType(column.getType(resolver(Mode.POJO)), Mode.POJO);
final String columnType = out.ref(columnTypeFull);
final String columnGetter = getStrategy().getJavaGetterName(column, Mode.POJO);
final String columnMember = getStrategy().getJavaMemberName(column, Mode.POJO);
final String name = column.getQualifiedOutputName();
// Getter
out.println();
if (!printDeprecationIfUnknownType(out, columnTypeFull))
printJavadoc(column, "Getter", out);
out.tab(1).javadoc("Getter for <code>%s</code>.%s", name, columnComment(column, comment));
if (column instanceof ColumnDefinition)
printColumnJPAAnnotation(out, (ColumnDefinition) column);
@ -3547,17 +3549,6 @@ public class JavaGenerator extends AbstractGenerator {
}
}
private void printJavadoc(TypedElementDefinition<?> column, String prefix, JavaWriter out) {
out.tab(1).println("/**");
out.tab(1).println(" * " + prefix + " for column '" + column.getInputName() + "'.");
if (column.getComment() != null && !column.getComment().isEmpty()) {
out.tab(1).println(" * <p>");
out.tab(1).println(" * " + column.getComment());
}
out.tab(1).println(" */");
}
/**
* Subclasses may override this method to provide their own pojo setters.
*/
@ -3573,6 +3564,7 @@ public class JavaGenerator extends AbstractGenerator {
}
private final void generatePojoSetter0(TypedElementDefinition<?> column, @SuppressWarnings("unused") int index, JavaWriter out) {
final String comment = StringUtils.defaultString(column.getComment());
final String className = getStrategy().getJavaClassName(column.getContainer(), Mode.POJO);
final String columnTypeFull = getJavaType(column.getType(resolver(Mode.POJO)), Mode.POJO);
final String columnType = out.ref(columnTypeFull);
@ -3581,13 +3573,15 @@ public class JavaGenerator extends AbstractGenerator {
final String columnMember = getStrategy().getJavaMemberName(column, Mode.POJO);
final boolean isUDT = column.getType(resolver()).isUDT();
final boolean isUDTArray = column.getType(resolver()).isArray() && database.getArray(column.getType(resolver()).getSchema(), column.getType(resolver()).getQualifiedUserType()).getElementType(resolver()).isUDT();
final String name = column.getQualifiedOutputName();
// We cannot have covariant setters for arrays because of type erasure
if (!(generateInterfaces() && isUDTArray)) {
out.println();
if (!printDeprecationIfUnknownType(out, columnTypeFull))
printJavadoc(column, "Setter", out);
out.tab(1).javadoc("Setter for <code>%s</code>.%s", name, columnComment(column, comment));
if (scala) {
out.tab(1).println("def %s(%s : %s) : %s = {", columnSetter, columnMember, columnType, columnSetterReturnType);
out.tab(2).println("this.%s = %s", columnMember, columnMember);