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

[jOOQ/jOOQ#14564] KotlinGenerator generates invalid code in equals() and hashCode() methods for inline value class fields

Browse Source
This commit is contained in:
Lukas Eder 2023-02-08 15:53:18 +01:00
parent 3cdbc6abaa
commit 9ef3f9ebae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5679,7 +5679,7 @@ public class JavaGenerator extends AbstractGenerator {
out.println("%soverride fun equals(other: Any?): Boolean {", visibilityPublic());
out.println("if (this === other)");
out.println("return true");
out.println("if (other === null)");
out.println("if (other == null)");
out.println("return false");
out.println("if (this::class != other::class)");
out.println("return false");
@ -5699,8 +5699,8 @@ public class JavaGenerator extends AbstractGenerator {
out.println("if (this.%s != o.%s)", columnMember, columnMember);
}
else {
out.println("if (this.%s === null) {", columnMember);
out.println("if (o.%s !== null)", columnMember);
out.println("if (this.%s == null) {", columnMember);
out.println("if (o.%s != null)", columnMember);
out.println("return false");
out.println("}");
@ -5790,11 +5790,11 @@ public class JavaGenerator extends AbstractGenerator {
}
else {
if (isObjectArrayType(getJavaType(column.getType(resolver(out)), out)))
out.println("result = prime * result + (if (this.%s === null) 0 else %s.deepHashCode(this.%s))", columnMember, Arrays.class, columnMember);
out.println("result = prime * result + (if (this.%s == null) 0 else %s.deepHashCode(this.%s))", columnMember, Arrays.class, columnMember);
else if (isArrayType(getJavaType(column.getType(resolver(out)), out)))
out.println("result = prime * result + (if (this.%s === null) 0 else %s.hashCode(this.%s))", columnMember, Arrays.class, columnMember);
out.println("result = prime * result + (if (this.%s == null) 0 else %s.hashCode(this.%s))", columnMember, Arrays.class, columnMember);
else
out.println("result = prime * result + (if (this.%s === null) 0 else this.%s.hashCode())", columnMember, columnMember);
out.println("result = prime * result + (if (this.%s == null) 0 else this.%s.hashCode())", columnMember, columnMember);
}
}