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

[jOOQ/jOOQ#17477] Bad code generated when activating <springDao/> but not <springAnnotations/>

Browse Source
This commit is contained in:
Lukas Eder 2024-10-22 09:15:19 +02:00
parent 8aee20e2b0
commit 06eb51fda8
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java
View File

@ -837,7 +837,7 @@ abstract class AbstractGenerator implements Generator {
@Override
public boolean generateSpringAnnotations() {
return generateSpringAnnotations;
return generateSpringDao() || generateSpringAnnotations;
}
@Override

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

@ -5235,15 +5235,11 @@ public class JavaGenerator extends AbstractGenerator {
printClassJavadoc(out, catalog, "Spring specific {@link " + out.ref(DAOImpl.class) + "} override.");
printClassAnnotations(out, catalog, Mode.DEFAULT);
String transactional = generateSpringAnnotations()
? out.ref("org.springframework.transaction.annotation.Transactional")
: null;
String transactional = out.ref("org.springframework.transaction.annotation.Transactional");
String className = "AbstractSpringDAOImpl";
if (scala) {
if (generateSpringAnnotations())
out.println("@%s(readOnly = true)", transactional);
out.println("@%s(readOnly = true)", transactional);
out.println("%sabstract class %s[R <: %s[R], P, T](table: %s[R], klass: java.lang.Class[P], configuration: %s) extends %s[R, P, T](table, klass, configuration) {",
visibility(), className, UpdatableRecord.class, Table.class, Configuration.class, DAOImpl.class);
@ -5251,8 +5247,7 @@ public class JavaGenerator extends AbstractGenerator {
out.println("%sdef this(table: %s[R], klass: java.lang.Class[P]) = this(table, klass, null)", visibility(), Table.class);
}
else if (kotlin) {
if (generateSpringAnnotations())
out.println("@%s(readOnly = true)", transactional);
out.println("@%s(readOnly = true)", transactional);
// [#16691] P : Any is needed because of KT-68407
out.println("%sabstract class %s<R : %s<R>, P : Any, T>(table: %s<R>, type: %s<P>, configuration: %s?) : %s<R, P, T>(table, type, configuration) {",
@ -5262,9 +5257,7 @@ public class JavaGenerator extends AbstractGenerator {
out.println("%sconstructor(table: %s<R>, type: %s<P>) : this(table, type, null)", visibility(), Table.class, Class.class);
}
else {
if (generateSpringAnnotations())
out.println("@%s(readOnly = true)", transactional);
out.println("@%s(readOnly = true)", transactional);
out.println("%sabstract class %s<R extends %s<R>, P, T> extends %s<R, P, T> {", visibility(), className, UpdatableRecord.class, DAOImpl.class);
out.println();
out.println("protected %s(%s<R> table, %s<P> type) {", className, Table.class, Class.class);