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

Use Arrays.equals() inside generated equals() methods.

Browse Source
This commit is contained in:
Zoltan Tamasi 2014-09-02 15:07:55 +02:00
parent 1a4e1c0964
commit 9bf1073bae
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,6 @@ import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -1909,16 +1908,20 @@ public class JavaGenerator extends AbstractGenerator {
out.tab(2).println("final %s other = (%s) obj;", className, className);
Iterator<?> iterator = getTypedElements(tableOrUDT).iterator();
while (iterator.hasNext()) {
TypedElementDefinition<?> column = (TypedElementDefinition<?>) iterator.next();
for (TypedElementDefinition<?> column : getTypedElements(tableOrUDT)) {
final String columnMember = getStrategy().getJavaMemberName(column, Mode.POJO);
out.tab(2).println("if (%s == null) {", columnMember);
out.tab(3).println("if (other.%s != null)", columnMember);
out.tab(4).println("return false;");
out.tab(2).println("}");
out.tab(2).println("else if (!%s.equals(other.%s))", columnMember, columnMember);
if (getJavaType(column.getType()).endsWith("[]")) {
out.tab(2).println("else if (!java.util.Arrays.equals(%s, other.%s))", columnMember, columnMember);
} else {
out.tab(2).println("else if (!%s.equals(other.%s))", columnMember, columnMember);
}
out.tab(3).println("return false;");
}
@ -1934,9 +1937,7 @@ public class JavaGenerator extends AbstractGenerator {
out.tab(2).println("final int prime = 31;");
out.tab(2).println("int result = 1;");
Iterator<?> iterator = getTypedElements(tableOrUDT).iterator();
while (iterator.hasNext()) {
TypedElementDefinition<?> column = (TypedElementDefinition<?>) iterator.next();
for (TypedElementDefinition<?> column : getTypedElements(tableOrUDT)) {
final String columnMember = getStrategy().getJavaMemberName(column, Mode.POJO);
out.tab(2).println("result = prime * result + ((%s == null) ? 0 : %s.hashCode());",