diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java index f2b5e8c84a..e70faea96d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Abs.java +++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -150,7 +151,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Abs o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java index 1ae14135cb..47d90b5dfe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -174,7 +175,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acos o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acosh.java b/jOOQ/src/main/java/org/jooq/impl/Acosh.java index 73b5e80e14..c18b110c8b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acosh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -205,7 +206,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acosh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Acoth.java b/jOOQ/src/main/java/org/jooq/impl/Acoth.java index f9a41e68b5..8482d35bd1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acoth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acoth.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -227,7 +228,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Acoth o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Add.java b/jOOQ/src/main/java/org/jooq/impl/Add.java index f09988a163..519d23290a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Add.java +++ b/jOOQ/src/main/java/org/jooq/impl/Add.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -183,8 +184,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Add o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java index 7e748a34f4..8867fa9138 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java index 9062ab6ed7..86c1edc234 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java index bab5b069da..b07a638b15 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java index cfc0292631..b749a4950d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java index 7f52876342..a9f5dab5eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java index 9c62d55b2b..72cef54014 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java index d21dac6db9..0821ed677e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/And.java b/jOOQ/src/main/java/org/jooq/impl/And.java index 3c80cfd939..4fe242c725 100644 --- a/jOOQ/src/main/java/org/jooq/impl/And.java +++ b/jOOQ/src/main/java/org/jooq/impl/And.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,8 +188,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.And o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java index 9a4c4047e4..7516e49ed2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java +++ b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -219,7 +220,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.AnyValue o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java index 433648787e..dc3b4af652 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAllMatch.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,8 +215,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayAllMatch o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($predicate(), o.$predicate()) + Objects.equals($array(), o.$array()) && + Objects.equals($predicate(), o.$predicate()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java index 79816bb422..70aac74cff 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAnyMatch.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,8 +215,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayAnyMatch o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($predicate(), o.$predicate()) + Objects.equals($array(), o.$array()) && + Objects.equals($predicate(), o.$predicate()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java index 5957d03be2..5352e64b81 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAppend.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,8 +189,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayAppend o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($append(), o.$append()) + Objects.equals($array(), o.$array()) && + Objects.equals($append(), o.$append()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java b/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java index bae1588ab4..131c2e3a82 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayConcat.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -175,8 +176,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayConcat o) { return - StringUtils.equals($array1(), o.$array1()) && - StringUtils.equals($array2(), o.$array2()) + Objects.equals($array1(), o.$array1()) && + Objects.equals($array2(), o.$array2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java b/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java index 12d0afb0b0..e383694c61 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayFilter.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,8 +215,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayFilter o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($predicate(), o.$predicate()) + Objects.equals($array(), o.$array()) && + Objects.equals($predicate(), o.$predicate()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java index aaf65956f0..6b472ce00e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -218,8 +219,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayGet o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($index(), o.$index()) + Objects.equals($array(), o.$array()) && + Objects.equals($index(), o.$index()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java b/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java index df5dd0dd44..1969d7c9ae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayMap.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -213,8 +214,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayMap o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($mapper(), o.$mapper()) + Objects.equals($array(), o.$array()) && + Objects.equals($mapper(), o.$mapper()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java b/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java index 93a33d3094..7a1d5865cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayNoneMatch.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -209,8 +210,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayNoneMatch o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($predicate(), o.$predicate()) + Objects.equals($array(), o.$array()) && + Objects.equals($predicate(), o.$predicate()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java b/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java index 45d657f593..5ce58c7b45 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayOverlap.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -202,8 +203,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayOverlap o) { return - StringUtils.equals($array1(), o.$array1()) && - StringUtils.equals($array2(), o.$array2()) + Objects.equals($array1(), o.$array1()) && + Objects.equals($array2(), o.$array2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java b/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java index 23800044fc..7c4db5bd32 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayPrepend.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -199,8 +200,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayPrepend o) { return - StringUtils.equals($prepend(), o.$prepend()) && - StringUtils.equals($array(), o.$array()) + Objects.equals($prepend(), o.$prepend()) && + Objects.equals($array(), o.$array()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java b/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java index 4da8610638..fe9b8d967f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayRemove.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -181,8 +182,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayRemove o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($remove(), o.$remove()) + Objects.equals($array(), o.$array()) && + Objects.equals($remove(), o.$remove()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java b/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java index d4f308f60e..de6ebf8ede 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayReplace.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -197,9 +198,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayReplace o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($search(), o.$search()) && - StringUtils.equals($replace(), o.$replace()) + Objects.equals($array(), o.$array()) && + Objects.equals($search(), o.$search()) && + Objects.equals($replace(), o.$replace()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayToString.java b/jOOQ/src/main/java/org/jooq/impl/ArrayToString.java index 5d14734f73..f91aaa2e85 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayToString.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayToString.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -205,9 +206,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ArrayToString o) { return - StringUtils.equals($array(), o.$array()) && - StringUtils.equals($delimiter(), o.$delimiter()) && - StringUtils.equals($nullString(), o.$nullString()) + Objects.equals($array(), o.$array()) && + Objects.equals($delimiter(), o.$delimiter()) && + Objects.equals($nullString(), o.$nullString()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java index 1405175b1a..6fa2da3c46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -160,7 +161,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ascii o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java index 24c68540a2..d1288a012b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -170,7 +171,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Asin o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Asinh.java b/jOOQ/src/main/java/org/jooq/impl/Asinh.java index 46f4cbbf73..b251759f1f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asinh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -205,7 +206,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Asinh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java index 4d2a981fb8..96d6766916 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -157,7 +158,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Atan o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java index 3ab6541333..fdd295fe8f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -174,8 +175,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Atan2 o) { return - StringUtils.equals($x(), o.$x()) && - StringUtils.equals($y(), o.$y()) + Objects.equals($x(), o.$x()) && + Objects.equals($y(), o.$y()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Atanh.java b/jOOQ/src/main/java/org/jooq/impl/Atanh.java index b7ddd9e595..32616ec267 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atanh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -203,7 +204,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Atanh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Avg.java b/jOOQ/src/main/java/org/jooq/impl/Avg.java index 72bb1a56d6..a6bf0fdf75 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Avg.java +++ b/jOOQ/src/main/java/org/jooq/impl/Avg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -152,7 +153,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Avg o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java b/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java index 8d98cfa338..a9b33d3621 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinToUuid.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -185,7 +186,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinToUuid o) { return - StringUtils.equals($bytes(), o.$bytes()) + Objects.equals($bytes(), o.$bytes()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java index d0c9e0d34f..ccdd202883 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryBitLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -150,7 +151,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryBitLength o) { return - StringUtils.equals($bytes(), o.$bytes()) + Objects.equals($bytes(), o.$bytes()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java b/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java index ac91c5bc76..69f1a89e5b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryConcat.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -160,8 +161,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryConcat o) { return - StringUtils.equals($bytes1(), o.$bytes1()) && - StringUtils.equals($bytes2(), o.$bytes2()) + Objects.equals($bytes1(), o.$bytes1()) && + Objects.equals($bytes2(), o.$bytes2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java index 20d75e3c3a..2dd2bb0aa4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -150,7 +151,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryLength o) { return - StringUtils.equals($bytes(), o.$bytes()) + Objects.equals($bytes(), o.$bytes()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLike.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLike.java index 6a139f0afd..f89c9f6c56 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLike.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,8 +157,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryLike o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLikeQuantified.java index 71dc1db85b..6cf7bce199 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryLikeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLikeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryLikeQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java index e4e90ce966..17efa3d511 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryLtrim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -165,8 +166,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryLtrim o) { return - StringUtils.equals($bytes(), o.$bytes()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($bytes(), o.$bytes()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java b/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java index e100658638..ec54c35130 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryMd5.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -150,7 +151,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryMd5 o) { return - StringUtils.equals($bytes(), o.$bytes()) + Objects.equals($bytes(), o.$bytes()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java b/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java index 57051ef8ff..868fe341df 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryOctetLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -150,7 +151,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryOctetLength o) { return - StringUtils.equals($bytes(), o.$bytes()) + Objects.equals($bytes(), o.$bytes()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java b/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java index 08180800ac..bb25327b30 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryOverlay.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -208,10 +209,10 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryOverlay o) { return - StringUtils.equals($in(), o.$in()) && - StringUtils.equals($placing(), o.$placing()) && - StringUtils.equals($startIndex(), o.$startIndex()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($in(), o.$in()) && + Objects.equals($placing(), o.$placing()) && + Objects.equals($startIndex(), o.$startIndex()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java b/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java index ef7e1dd2bd..91cd6042a1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryPosition.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -189,9 +190,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryPosition o) { return - StringUtils.equals($in(), o.$in()) && - StringUtils.equals($search(), o.$search()) && - StringUtils.equals($startIndex(), o.$startIndex()) + Objects.equals($in(), o.$in()) && + Objects.equals($search(), o.$search()) && + Objects.equals($startIndex(), o.$startIndex()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java index 503df11221..66ca668ef6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryRtrim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -165,8 +166,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryRtrim o) { return - StringUtils.equals($bytes(), o.$bytes()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($bytes(), o.$bytes()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java b/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java index 8c9fd81661..f35cf7b41a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinarySubstring.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -196,9 +197,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinarySubstring o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($startingPosition(), o.$startingPosition()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($string(), o.$string()) && + Objects.equals($startingPosition(), o.$startingPosition()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java b/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java index 1b07f0fc2c..5de13b57f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/BinaryTrim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -165,8 +166,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BinaryTrim o) { return - StringUtils.equals($bytes(), o.$bytes()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($bytes(), o.$bytes()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java index 48a62b762e..ee648ebcf2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -225,8 +226,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitAnd o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java index 713b1fbfc3..6317848ba4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -364,7 +365,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitAndAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java index b7f2908056..69d2967c3a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -518,7 +519,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitCount o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitGet.java b/jOOQ/src/main/java/org/jooq/impl/BitGet.java index 243ce6256e..12e0c929ca 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitGet.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitGet.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -266,8 +267,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitGet o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($bit(), o.$bit()) + Objects.equals($value(), o.$value()) && + Objects.equals($bit(), o.$bit()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java index cf0a20b81e..a2f69f8203 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,7 +215,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitLength o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNand.java b/jOOQ/src/main/java/org/jooq/impl/BitNand.java index 20a71fd2a8..c66a33b33c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNand.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNand.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,8 +157,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitNand o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java index 9d61193843..0b585368b5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNandAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitNandAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNor.java b/jOOQ/src/main/java/org/jooq/impl/BitNor.java index 395ef30222..6c676ecb8b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNor.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,8 +157,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitNor o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java index 502658ce66..b47e78ebdf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNorAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitNorAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNot.java b/jOOQ/src/main/java/org/jooq/impl/BitNot.java index 27ad339087..4052c622d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitNot.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitNot.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,7 +215,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitNot o) { return - StringUtils.equals($arg1(), o.$arg1()) + Objects.equals($arg1(), o.$arg1()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOr.java b/jOOQ/src/main/java/org/jooq/impl/BitOr.java index 01603c45ec..a51cbf75ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitOr.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -234,8 +235,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitOr o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java index 3496c38e6e..10d2abae88 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -364,7 +365,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitOrAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitSet.java b/jOOQ/src/main/java/org/jooq/impl/BitSet.java index 3b051ff354..a83b583aba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitSet.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitSet.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -308,9 +309,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitSet o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($bit(), o.$bit()) && - StringUtils.equals($newValue(), o.$newValue()) + Objects.equals($value(), o.$value()) && + Objects.equals($bit(), o.$bit()) && + Objects.equals($newValue(), o.$newValue()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java index e0b6c8d89b..95e9039b44 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -242,8 +243,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitXNor o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java index c06e3a4c7f..58aa594d72 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXNorAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitXNorAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXor.java b/jOOQ/src/main/java/org/jooq/impl/BitXor.java index fbb4affd6e..3362eb959d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXor.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -246,8 +247,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitXor o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java index fe21080bcb..bac0c2a966 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -365,7 +366,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BitXorAgg o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java index febec43f49..5785c0856c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -180,7 +181,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BoolAnd o) { return - StringUtils.equals($condition(), o.$condition()) + Objects.equals($condition(), o.$condition()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java index 9e6585b4c1..11740e5077 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -181,7 +182,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.BoolOr o) { return - StringUtils.equals($condition(), o.$condition()) + Objects.equals($condition(), o.$condition()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java index 18ad474b82..3db7d254ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Call.java +++ b/jOOQ/src/main/java/org/jooq/impl/Call.java @@ -213,5 +213,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java index a2a197c27f..ec522dda3f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -159,7 +160,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cardinality o) { return - StringUtils.equals($array(), o.$array()) + Objects.equals($array(), o.$array()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cbrt.java b/jOOQ/src/main/java/org/jooq/impl/Cbrt.java index e7b9642361..97719b3aad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cbrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cbrt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -216,7 +217,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cbrt o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java index 8e84f6e761..88b6beda5f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -191,7 +192,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ceil o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java index 8f85cf91be..6a118dee12 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -173,7 +174,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.CharLength o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java index 10cd9581ad..6aac152c8c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Chr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -170,7 +171,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Chr o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index 5668fe686f..479cfa282c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Commit.java b/jOOQ/src/main/java/org/jooq/impl/Commit.java index ec33653f9c..b8ab9c51d7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Commit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Commit.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java index 9a33de4e24..f939e3ce35 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -192,7 +193,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ConditionAsField o) { return - StringUtils.equals($condition(), o.$condition()) + Objects.equals($condition(), o.$condition()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java index 2421027b9a..0735c5ab3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java @@ -133,5 +133,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java index 2421027b9a..0735c5ab3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java @@ -133,5 +133,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java index a03f242f33..0a41d1d1d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java @@ -148,5 +148,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Contains.java b/jOOQ/src/main/java/org/jooq/impl/Contains.java index 4f13a9a36d..9eb6afddb6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Contains.java +++ b/jOOQ/src/main/java/org/jooq/impl/Contains.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -257,8 +258,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Contains o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($content(), o.$content()) + Objects.equals($value(), o.$value()) && + Objects.equals($content(), o.$content()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java index 747cc0b52b..ba52a606a7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java +++ b/jOOQ/src/main/java/org/jooq/impl/ContainsIgnoreCase.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ContainsIgnoreCase o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($content(), o.$content()) + Objects.equals($value(), o.$value()) && + Objects.equals($content(), o.$content()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Corr.java b/jOOQ/src/main/java/org/jooq/impl/Corr.java index 53afc3c0a7..128742211e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Corr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -185,8 +186,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Corr o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java index 05c13d822d..55b19d9205 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -151,7 +152,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cos o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index d5f26d7b65..1bcd440cbd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -203,7 +204,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cosh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java index a81f209ea1..074984720f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -177,7 +178,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Cot o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java index 1f67d84159..52e0fc68fa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Coth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -230,7 +231,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Coth o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Count.java b/jOOQ/src/main/java/org/jooq/impl/Count.java index 104f8746f6..33985868c3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Count.java +++ b/jOOQ/src/main/java/org/jooq/impl/Count.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -160,7 +161,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Count o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java index 45bd96143d..fefdfa87b1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -198,8 +199,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.CovarPop o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java index 9964536e46..86c4117bce 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -198,8 +199,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.CovarSamp o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java index 63bb625495..86713f0f67 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java index bd7bb4b8e1..48a22de684 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java index 24f848678a..9639ced902 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java @@ -450,5 +450,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 586efdb959..6689ceba03 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java index eb9b28c730..9903d20d12 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java @@ -396,5 +396,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java index 74c01c01d4..39ebb38bc1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java index c67194fd2d..f4945efad2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSynonymImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSynonymImpl.java index b2b470217c..bb6c6f9cdd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSynonymImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSynonymImpl.java @@ -238,5 +238,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java index 0414382f2e..9dbf52ad52 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java @@ -62,6 +62,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java index 8d60859c79..b8a2ef9544 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java @@ -929,5 +929,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java index e782934e2e..ca49090a95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index c93e1d343c..03f376fcc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CumeDistAgg.java b/jOOQ/src/main/java/org/jooq/impl/CumeDistAgg.java index 0ff52c7c24..4b762e2221 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CumeDistAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/CumeDistAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -148,7 +149,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.CumeDistAgg o) { return - StringUtils.equals($fields(), o.$fields()) + Objects.equals($fields(), o.$fields()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java index 623af02d7d..8809b6f62a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java index daec6538f7..b12e508c51 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java index f1159f820f..f79341675a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java index 54717c3839..9ec7a972f2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -484,9 +485,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.DateAdd o) { return - StringUtils.equals($date(), o.$date()) && - StringUtils.equals($interval(), o.$interval()) && - StringUtils.equals($datePart(), o.$datePart()) + Objects.equals($date(), o.$date()) && + Objects.equals($interval(), o.$interval()) && + Objects.equals($datePart(), o.$datePart()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java index d015746d30..bb3b180e97 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java +++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -211,7 +212,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Degrees o) { return - StringUtils.equals($radians(), o.$radians()) + Objects.equals($radians(), o.$radians()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Deleting.java b/jOOQ/src/main/java/org/jooq/impl/Deleting.java index c4c88d44e4..5d4eda0e95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java +++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java @@ -140,5 +140,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DenseRankAgg.java b/jOOQ/src/main/java/org/jooq/impl/DenseRankAgg.java index abe55786c9..9f31188738 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DenseRankAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/DenseRankAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -147,7 +148,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.DenseRankAgg o) { return - StringUtils.equals($fields(), o.$fields()) + Objects.equals($fields(), o.$fields()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Digits.java b/jOOQ/src/main/java/org/jooq/impl/Digits.java index 8a2cfc5c98..1cb3e75e69 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Digits.java +++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -162,7 +163,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Digits o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Div.java b/jOOQ/src/main/java/org/jooq/impl/Div.java index fab51fb5a6..9e54830d70 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Div.java +++ b/jOOQ/src/main/java/org/jooq/impl/Div.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -183,8 +184,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Div o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java index ae6e399b93..efc521d3fd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java index 6d03da1236..da995235d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java index c6a9ed36f5..c27ce980f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java @@ -169,5 +169,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java index 84555252ee..6f68a818e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java index c6a9ed36f5..c27ce980f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java @@ -169,5 +169,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java index 9985625ecd..77c56fb6ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java index 92515cb438..c1605d9446 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSynonymImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSynonymImpl.java index 829986c9b4..4edee1d1d1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSynonymImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSynonymImpl.java @@ -195,5 +195,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java index 083974b12d..43856aaa6c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java index a51ae78517..f3c3160235 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java @@ -236,5 +236,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java index 2e090e4731..1fd60a5025 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java index 42d5ec5267..a0873de81e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/EndsWith.java b/jOOQ/src/main/java/org/jooq/impl/EndsWith.java index 3bdb130174..3be9bb70f0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EndsWith.java +++ b/jOOQ/src/main/java/org/jooq/impl/EndsWith.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -267,8 +268,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.EndsWith o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($suffix(), o.$suffix()) + Objects.equals($string(), o.$string()) && + Objects.equals($suffix(), o.$suffix()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java index e901358915..1c1f00b050 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java +++ b/jOOQ/src/main/java/org/jooq/impl/EndsWithIgnoreCase.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.EndsWithIgnoreCase o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($suffix(), o.$suffix()) + Objects.equals($string(), o.$string()) && + Objects.equals($suffix(), o.$suffix()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Eq.java b/jOOQ/src/main/java/org/jooq/impl/Eq.java index a56133b98d..9f06a617ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Eq.java +++ b/jOOQ/src/main/java/org/jooq/impl/Eq.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -257,8 +258,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Eq o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java b/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java index b53d57566b..3c19af7c63 100644 --- a/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/EqQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -396,8 +397,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.EqQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java index fdec62fe6f..5fd84c7d95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Euler.java +++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; diff --git a/jOOQ/src/main/java/org/jooq/impl/Excluded.java b/jOOQ/src/main/java/org/jooq/impl/Excluded.java index 24d066cc74..9285003c89 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Excluded.java +++ b/jOOQ/src/main/java/org/jooq/impl/Excluded.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -174,7 +175,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Excluded o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Execute.java b/jOOQ/src/main/java/org/jooq/impl/Execute.java index 72acc67748..e9b87ad428 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Execute.java +++ b/jOOQ/src/main/java/org/jooq/impl/Execute.java @@ -172,5 +172,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Exists.java b/jOOQ/src/main/java/org/jooq/impl/Exists.java index 360a908bc4..5cc83a6c65 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exists.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exists.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -163,7 +164,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Exists o) { return - StringUtils.equals($query(), o.$query()) + Objects.equals($query(), o.$query()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java index 47c0d6aad7..b8441a01dc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exp.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -165,7 +166,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Exp o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java index 528dc819b5..e58b60bb66 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -174,7 +175,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.FieldCondition o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java index 5d035022ec..bcda5b8037 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Floor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -180,7 +181,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Floor o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Ge.java b/jOOQ/src/main/java/org/jooq/impl/Ge.java index f29e578521..665646d315 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ge.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ge.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ge o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java index 655a014635..d4babed9e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/GeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.GeQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Goto.java b/jOOQ/src/main/java/org/jooq/impl/Goto.java index 010871da69..8b044d8bb0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Goto.java +++ b/jOOQ/src/main/java/org/jooq/impl/Goto.java @@ -144,5 +144,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java index 2fc1846617..bdc34337d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Gt.java b/jOOQ/src/main/java/org/jooq/impl/Gt.java index 4165d4c447..b97803086f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Gt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Gt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Gt o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java b/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java index 3ce1757a9d..36d45a6a47 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/GtQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.GtQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IAdd.java b/jOOQ/src/main/java/org/jooq/impl/IAdd.java index 6b3ab50a4c..a60bfbc2cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/IAdd.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -147,8 +148,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Add o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IDiv.java b/jOOQ/src/main/java/org/jooq/impl/IDiv.java index 9d69a8dc29..5e00c0ad08 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IDiv.java +++ b/jOOQ/src/main/java/org/jooq/impl/IDiv.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -147,8 +148,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Div o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IMul.java b/jOOQ/src/main/java/org/jooq/impl/IMul.java index 68b8a3169e..2f01a4a18c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IMul.java +++ b/jOOQ/src/main/java/org/jooq/impl/IMul.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -147,8 +148,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Mul o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ISub.java b/jOOQ/src/main/java/org/jooq/impl/ISub.java index 22d7b8a964..23df072b3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ISub.java +++ b/jOOQ/src/main/java/org/jooq/impl/ISub.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -147,8 +148,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sub o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/In.java b/jOOQ/src/main/java/org/jooq/impl/In.java index 6f33a431b6..91ac0d4b6f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/In.java +++ b/jOOQ/src/main/java/org/jooq/impl/In.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -161,8 +162,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.In o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Inserting.java b/jOOQ/src/main/java/org/jooq/impl/Inserting.java index ed628a1e87..2a00a0d027 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java +++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java @@ -142,5 +142,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java index 9c125a87a1..be3c5d4da0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -191,8 +192,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsDistinctFrom o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java index 8a175ad671..8c97bf88eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -139,7 +140,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsDocument o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsJson.java b/jOOQ/src/main/java/org/jooq/impl/IsJson.java index 4ca28b2431..64c042ebe8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsJson.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsJson.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -180,7 +181,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsJson o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java index fed766d6f0..d7d50ea1c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -189,8 +190,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsNotDistinctFrom o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java index e9deea3279..cc04fd53db 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -139,7 +140,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsNotDocument o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java index 4b6d98a15a..838a50ab88 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,7 +159,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsNotJson o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java index c724574365..4936abfdfe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsNotNull o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNull.java index 37d51e9de7..146668f1a2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/IsNull.java +++ b/jOOQ/src/main/java/org/jooq/impl/IsNull.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.IsNull o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java index 5cd825db2a..36d9bca86c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -417,10 +418,10 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONArray o) { return - StringUtils.equals($type(), o.$type()) && - StringUtils.equals($fields(), o.$fields()) && - StringUtils.equals($onNull(), o.$onNull()) && - StringUtils.equals($returning(), o.$returning()) + Objects.equals($type(), o.$type()) && + Objects.equals($fields(), o.$fields()) && + Objects.equals($onNull(), o.$onNull()) && + Objects.equals($returning(), o.$returning()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java b/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java index 8344af5491..d40a4dca19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArrayLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -194,7 +195,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONArrayLength o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java b/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java index 14184c4229..cef9561839 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBArrayLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -203,7 +204,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBArrayLength o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java index cd943bd5b3..85a9882f10 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttribute.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -239,8 +240,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBGetAttribute o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($attribute(), o.$attribute()) + Objects.equals($field(), o.$field()) && + Objects.equals($attribute(), o.$attribute()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java index ef36a028bf..3487daed2c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetAttributeAsText.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -240,8 +241,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBGetAttributeAsText o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($attribute(), o.$attribute()) + Objects.equals($field(), o.$field()) && + Objects.equals($attribute(), o.$attribute()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java index 5c9a266303..b27ee20fc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElement.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -234,8 +235,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBGetElement o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($index(), o.$index()) + Objects.equals($field(), o.$field()) && + Objects.equals($index(), o.$index()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java index 64deb3fddd..37fb5b85c1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBGetElementAsText.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -203,8 +204,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBGetElementAsText o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($index(), o.$index()) + Objects.equals($field(), o.$field()) && + Objects.equals($index(), o.$index()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java b/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java index fb16c1a8c0..eb1f6e92c6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBInsert.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -186,9 +187,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBInsert o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBKeyExists.java b/jOOQ/src/main/java/org/jooq/impl/JSONBKeyExists.java index 876b67fba3..252cdfd4e0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBKeyExists.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBKeyExists.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -203,8 +204,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBKeyExists o) { return - StringUtils.equals($json(), o.$json()) && - StringUtils.equals($key(), o.$key()) + Objects.equals($json(), o.$json()) && + Objects.equals($key(), o.$key()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java b/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java index 58b1f49038..c6cd5f6d6f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBKeys.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -220,7 +221,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBKeys o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java b/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java index f742224ad0..289e89d96f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBRemove.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -171,8 +172,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBRemove o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java b/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java index c5a7a6ed0b..082db68944 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBReplace.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -186,9 +187,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBReplace o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java b/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java index 8acb53ccf0..8213510daa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONBSet.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -185,9 +186,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONBSet o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java index 6abf01294d..3610f65966 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttribute.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -239,8 +240,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONGetAttribute o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($attribute(), o.$attribute()) + Objects.equals($field(), o.$field()) && + Objects.equals($attribute(), o.$attribute()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java index 5104c380b1..a70d306796 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetAttributeAsText.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -241,8 +242,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONGetAttributeAsText o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($attribute(), o.$attribute()) + Objects.equals($field(), o.$field()) && + Objects.equals($attribute(), o.$attribute()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java index b81527d15f..f5a8cc52e5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetElement.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -234,8 +235,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONGetElement o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($index(), o.$index()) + Objects.equals($field(), o.$field()) && + Objects.equals($index(), o.$index()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java b/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java index f243b8e37a..ad110cc2a1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONGetElementAsText.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -203,8 +204,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONGetElementAsText o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($index(), o.$index()) + Objects.equals($field(), o.$field()) && + Objects.equals($index(), o.$index()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java b/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java index 9a24541012..8b6c57ea46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONInsert.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -186,9 +187,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONInsert o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONKeyExists.java b/jOOQ/src/main/java/org/jooq/impl/JSONKeyExists.java index a2a9b090ac..c7a9f558d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONKeyExists.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONKeyExists.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -213,8 +214,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONKeyExists o) { return - StringUtils.equals($json(), o.$json()) && - StringUtils.equals($key(), o.$key()) + Objects.equals($json(), o.$json()) && + Objects.equals($key(), o.$key()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java b/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java index 6b11107618..e280e5bb29 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONKeys.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -214,7 +215,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONKeys o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java index 1709b1d301..8bd97d67de 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java @@ -61,6 +61,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -449,10 +450,10 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONObject o) { return - StringUtils.equals($type(), o.$type()) && - StringUtils.equals($entries(), o.$entries()) && - StringUtils.equals($onNull(), o.$onNull()) && - StringUtils.equals($returning(), o.$returning()) + Objects.equals($type(), o.$type()) && + Objects.equals($entries(), o.$entries()) && + Objects.equals($onNull(), o.$onNull()) && + Objects.equals($returning(), o.$returning()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java b/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java index 8d98c70db9..1a403af975 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONRemove.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -171,8 +172,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONRemove o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java b/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java index 84882db843..369e310f69 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONReplace.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -186,9 +187,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONReplace o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONSet.java b/jOOQ/src/main/java/org/jooq/impl/JSONSet.java index bf23019364..021eddbe8f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONSet.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONSet.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -185,9 +186,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.JSONSet o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($path(), o.$path()) && - StringUtils.equals($value(), o.$value()) + Objects.equals($field(), o.$field()) && + Objects.equals($path(), o.$path()) && + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java index 61cc766151..ef76a833c2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -199,8 +200,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ltrim o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($string(), o.$string()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Le.java b/jOOQ/src/main/java/org/jooq/impl/Le.java index 5070e7e139..2cd39248cf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Le.java +++ b/jOOQ/src/main/java/org/jooq/impl/Le.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Le o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java index eed0091af7..42ce3b5b89 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/LeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.LeQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java index f4749127aa..e36595cbea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -181,8 +182,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Left o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($string(), o.$string()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Level.java b/jOOQ/src/main/java/org/jooq/impl/Level.java index 4cfa847b15..6839fd8b4c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Level.java +++ b/jOOQ/src/main/java/org/jooq/impl/Level.java @@ -129,5 +129,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Like.java b/jOOQ/src/main/java/org/jooq/impl/Like.java index 2cc53eeb13..95e5751b07 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Like.java +++ b/jOOQ/src/main/java/org/jooq/impl/Like.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -292,9 +293,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Like o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java index f06696e717..bceaac6079 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java +++ b/jOOQ/src/main/java/org/jooq/impl/LikeIgnoreCase.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,9 +188,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.LikeIgnoreCase o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java index 9458c93e61..4cad173f7a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/LikeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,9 +189,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.LikeQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Ln.java b/jOOQ/src/main/java/org/jooq/impl/Ln.java index 303b1f0922..f07e4ddfae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ln.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ln.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -198,7 +199,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ln o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java index 94e94d722b..5f10cbe6bd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -200,8 +201,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Log o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($base(), o.$base()) + Objects.equals($value(), o.$value()) && + Objects.equals($base(), o.$base()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java index df2feffbc5..093d9e7aba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log10.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -202,7 +203,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Log10 o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java index 9723a001c1..90e4cc040b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lower.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,7 +157,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Lower o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java index c1f83605b1..326712fe18 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -220,9 +221,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Lpad o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($length(), o.$length()) && - StringUtils.equals($character(), o.$character()) + Objects.equals($string(), o.$string()) && + Objects.equals($length(), o.$length()) && + Objects.equals($character(), o.$character()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Lt.java b/jOOQ/src/main/java/org/jooq/impl/Lt.java index aa92986e89..5c49d9cf43 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Lt o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java b/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java index 99a7fed827..28dbbac94b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/LtQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.LtQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java index fa215660a3..7fbfc81ebe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MD5.java +++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -175,7 +176,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Md5 o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Max.java b/jOOQ/src/main/java/org/jooq/impl/Max.java index 2897112068..e4b9a5a850 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Max.java +++ b/jOOQ/src/main/java/org/jooq/impl/Max.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -151,7 +152,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Max o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/MaxBy.java b/jOOQ/src/main/java/org/jooq/impl/MaxBy.java index 6af6c3a56a..1bd4b13306 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MaxBy.java +++ b/jOOQ/src/main/java/org/jooq/impl/MaxBy.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -245,8 +246,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.MaxBy o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($by(), o.$by()) + Objects.equals($value(), o.$value()) && + Objects.equals($by(), o.$by()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java index 1c72bc8ef3..7913f3f084 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Median.java +++ b/jOOQ/src/main/java/org/jooq/impl/Median.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -154,7 +155,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Median o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Min.java b/jOOQ/src/main/java/org/jooq/impl/Min.java index aba90458b8..9790c5b7d5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Min.java +++ b/jOOQ/src/main/java/org/jooq/impl/Min.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -151,7 +152,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Min o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/MinBy.java b/jOOQ/src/main/java/org/jooq/impl/MinBy.java index 919c410c38..fe34be4475 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MinBy.java +++ b/jOOQ/src/main/java/org/jooq/impl/MinBy.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -245,8 +246,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.MinBy o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($by(), o.$by()) + Objects.equals($value(), o.$value()) && + Objects.equals($by(), o.$by()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java index a7ba2ca41d..ede3459f3a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Mod.java +++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -198,8 +199,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Mod o) { return - StringUtils.equals($dividend(), o.$dividend()) && - StringUtils.equals($divisor(), o.$divisor()) + Objects.equals($dividend(), o.$dividend()) && + Objects.equals($divisor(), o.$divisor()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Mul.java b/jOOQ/src/main/java/org/jooq/impl/Mul.java index 42e23dcbc2..26a8442e17 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Mul.java +++ b/jOOQ/src/main/java/org/jooq/impl/Mul.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -183,8 +184,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Mul o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Ne.java b/jOOQ/src/main/java/org/jooq/impl/Ne.java index 9f22ad7f46..4ba1039ec9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ne.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ne.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Ne o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java index 82538c9654..7de66272f7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/NeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NeQuantified o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Not.java b/jOOQ/src/main/java/org/jooq/impl/Not.java index 56d0ae5759..bc8c3bf101 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Not.java +++ b/jOOQ/src/main/java/org/jooq/impl/Not.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -159,7 +160,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Not o) { return - StringUtils.equals($condition(), o.$condition()) + Objects.equals($condition(), o.$condition()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotBinaryLike.java b/jOOQ/src/main/java/org/jooq/impl/NotBinaryLike.java index 29fd5d1506..388b214628 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotBinaryLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotBinaryLike.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotBinaryLike o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotBinaryLikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NotBinaryLikeQuantified.java index cad8d0950d..237e1ba594 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotBinaryLikeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotBinaryLikeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotBinaryLikeQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java index 36d132d357..ac89298100 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotField.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -162,7 +163,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotField o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotIn.java b/jOOQ/src/main/java/org/jooq/impl/NotIn.java index 31bc1f90e7..fce3e8c8d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotIn.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotIn.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -161,8 +162,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotIn o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLike.java b/jOOQ/src/main/java/org/jooq/impl/NotLike.java index fa4e6f75a3..702f75fc44 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotLike.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,9 +189,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotLike o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java index 12032affca..b1168b50eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotLikeIgnoreCase.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,9 +188,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotLikeIgnoreCase o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java index 2cf054e6bb..65c6043f09 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotLikeQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,9 +189,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotLikeQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java b/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java index 1d7cb11fe2..b43a088ee7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotSimilarTo.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,9 +188,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotSimilarTo o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java b/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java index 3ca07505b2..e4deded819 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/NotSimilarToQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,9 +189,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.NotSimilarToQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Nullif.java b/jOOQ/src/main/java/org/jooq/impl/Nullif.java index 7bfae468fc..921d1e48e1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nullif.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nullif.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -180,8 +181,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Nullif o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($other(), o.$other()) + Objects.equals($value(), o.$value()) && + Objects.equals($other(), o.$other()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java index 8509471152..e8ff7bdb7f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -263,8 +264,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Nvl o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($defaultValue(), o.$defaultValue()) + Objects.equals($value(), o.$value()) && + Objects.equals($defaultValue(), o.$defaultValue()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java index 5429c7aa35..e5f20f0254 100644 --- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -175,7 +176,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.OctetLength o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Or.java b/jOOQ/src/main/java/org/jooq/impl/Or.java index ab14542668..456d3bc1ab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Or.java +++ b/jOOQ/src/main/java/org/jooq/impl/Or.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,8 +188,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Or o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java index 240c4e3033..b29a1dd519 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java +++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -294,10 +295,10 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Overlay o) { return - StringUtils.equals($in(), o.$in()) && - StringUtils.equals($placing(), o.$placing()) && - StringUtils.equals($startIndex(), o.$startIndex()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($in(), o.$in()) && + Objects.equals($placing(), o.$placing()) && + Objects.equals($startIndex(), o.$startIndex()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/PercentRankAgg.java b/jOOQ/src/main/java/org/jooq/impl/PercentRankAgg.java index 4a82537239..777c9b25e6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PercentRankAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/PercentRankAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -148,7 +149,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.PercentRankAgg o) { return - StringUtils.equals($fields(), o.$fields()) + Objects.equals($fields(), o.$fields()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/PercentileCont.java b/jOOQ/src/main/java/org/jooq/impl/PercentileCont.java index b336fac0cf..e95e3452bd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PercentileCont.java +++ b/jOOQ/src/main/java/org/jooq/impl/PercentileCont.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -185,7 +186,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.PercentileCont o) { return - StringUtils.equals($percentile(), o.$percentile()) + Objects.equals($percentile(), o.$percentile()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/PercentileDisc.java b/jOOQ/src/main/java/org/jooq/impl/PercentileDisc.java index 6185bc2b0f..5d59d0e535 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PercentileDisc.java +++ b/jOOQ/src/main/java/org/jooq/impl/PercentileDisc.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -185,7 +186,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.PercentileDisc o) { return - StringUtils.equals($percentile(), o.$percentile()) + Objects.equals($percentile(), o.$percentile()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java index 411755ad33..35ca54ee19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Pi.java +++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; diff --git a/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java b/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java index 81b3822c7a..727140c3a5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java +++ b/jOOQ/src/main/java/org/jooq/impl/PlusJoin.java @@ -146,5 +146,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java index 12ef6da810..30c8d3159e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Position.java +++ b/jOOQ/src/main/java/org/jooq/impl/Position.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -282,9 +283,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Position o) { return - StringUtils.equals($in(), o.$in()) && - StringUtils.equals($search(), o.$search()) && - StringUtils.equals($startIndex(), o.$startIndex()) + Objects.equals($in(), o.$in()) && + Objects.equals($search(), o.$search()) && + Objects.equals($startIndex(), o.$startIndex()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java index c67160a246..3207cb29e4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Power.java +++ b/jOOQ/src/main/java/org/jooq/impl/Power.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -202,8 +203,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Power o) { return - StringUtils.equals($base(), o.$base()) && - StringUtils.equals($exponent(), o.$exponent()) + Objects.equals($base(), o.$base()) && + Objects.equals($exponent(), o.$exponent()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java index d2801ed104..8d8e3d74ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Prior.java +++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java @@ -167,5 +167,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Product.java b/jOOQ/src/main/java/org/jooq/impl/Product.java index 9019cbeae2..89f87133cd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Product.java +++ b/jOOQ/src/main/java/org/jooq/impl/Product.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -240,7 +241,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Product o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java index 62fa028052..9ee80046c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java +++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedRowid.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -160,7 +161,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.QualifiedRowid o) { return - StringUtils.equals($table(), o.$table()) + Objects.equals($table(), o.$table()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java index 49b4dd7235..baed5e2690 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -199,8 +200,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Rtrim o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($string(), o.$string()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java index 47ef702ad9..7b30dfd0a5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Radians.java +++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -196,7 +197,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Radians o) { return - StringUtils.equals($degrees(), o.$degrees()) + Objects.equals($degrees(), o.$degrees()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java index 3d1de11460..f2ffe947ab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rand.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; diff --git a/jOOQ/src/main/java/org/jooq/impl/RankAgg.java b/jOOQ/src/main/java/org/jooq/impl/RankAgg.java index 9583334d9b..662f9e74d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RankAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/RankAgg.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -147,7 +148,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RankAgg o) { return - StringUtils.equals($fields(), o.$fields()) + Objects.equals($fields(), o.$fields()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java index 3039ccadfe..281e754f93 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -195,8 +196,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrAvgX o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java index 90c144ad1e..fb29b59e3f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -195,8 +196,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrAvgY o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java index 50f955a85b..149ca9f5d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -181,8 +182,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrCount o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java index e88b6644f6..5c89060af5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -185,8 +186,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrIntercept o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java index 1dd35b7b8b..21b29bddad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -189,8 +190,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrR2 o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java index 6add51d9d7..20bfb17f46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -185,8 +186,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrSlope o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java index 3bc3e0eae5..2d4d2a5738 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -195,8 +196,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrSxx o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java index ce84af4680..ba507f4fec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -199,8 +200,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrSxy o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java index 43750af831..692e7eeda3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -195,8 +196,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RegrSyy o) { return - StringUtils.equals($y(), o.$y()) && - StringUtils.equals($x(), o.$x()) + Objects.equals($y(), o.$y()) && + Objects.equals($x(), o.$x()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java b/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java index 848ae8de4b..21d7364b8e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/ReleaseSavepoint.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java index 755c14b4d8..22e2f0f963 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -216,8 +217,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Repeat o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($count(), o.$count()) + Objects.equals($string(), o.$string()) && + Objects.equals($count(), o.$count()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java index f15468c2a6..a05073d111 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -247,9 +248,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Replace o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($search(), o.$search()) && - StringUtils.equals($replace(), o.$replace()) + Objects.equals($string(), o.$string()) && + Objects.equals($search(), o.$search()) && + Objects.equals($replace(), o.$replace()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java index 27d1d84524..77dc054719 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Return.java +++ b/jOOQ/src/main/java/org/jooq/impl/Return.java @@ -179,5 +179,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java index bd480a2bfa..4d11f553aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,7 +157,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Reverse o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java index e59456635b..cae39f80d5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java index f5babc0ec2..5e4d6ec46b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -186,8 +187,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Right o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($string(), o.$string()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollback.java b/jOOQ/src/main/java/org/jooq/impl/Rollback.java index a475ff3fc4..a31663df0a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rollback.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rollback.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Root.java b/jOOQ/src/main/java/org/jooq/impl/Root.java index 0ae498d6c0..6e3c82ef43 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Root.java +++ b/jOOQ/src/main/java/org/jooq/impl/Root.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -240,8 +241,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Root o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($degree(), o.$degree()) + Objects.equals($value(), o.$value()) && + Objects.equals($degree(), o.$degree()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java index 40c96561b1..9ac0b9cf19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Round.java +++ b/jOOQ/src/main/java/org/jooq/impl/Round.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -236,8 +237,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Round o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($decimals(), o.$decimals()) + Objects.equals($value(), o.$value()) && + Objects.equals($decimals(), o.$decimals()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowEq.java b/jOOQ/src/main/java/org/jooq/impl/RowEq.java index a07f85e3f2..2825f8c72d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowEq.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowEq.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -208,8 +209,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowEq o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGe.java b/jOOQ/src/main/java/org/jooq/impl/RowGe.java index 74a918c095..08b8bc7d46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowGe.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowGe.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowGe o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowGt.java b/jOOQ/src/main/java/org/jooq/impl/RowGt.java index b309d9582e..0bfc368195 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowGt.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowGt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowGt o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLe.java b/jOOQ/src/main/java/org/jooq/impl/RowLe.java index 63f54eb470..30c50d996b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowLe.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowLe.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowLe o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowLt.java b/jOOQ/src/main/java/org/jooq/impl/RowLt.java index 0dcac61cf7..904e56b65a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowLt.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowLt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowLt o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/RowNe.java b/jOOQ/src/main/java/org/jooq/impl/RowNe.java index d34d25e16f..2a2379fa7f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowNe.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowNe.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,8 +154,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.RowNe o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java index 2421027b9a..0735c5ab3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java @@ -133,5 +133,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java index 12e1fc377d..cb62f6be6c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -220,9 +221,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Rpad o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($length(), o.$length()) && - StringUtils.equals($character(), o.$character()) + Objects.equals($string(), o.$string()) && + Objects.equals($length(), o.$length()) && + Objects.equals($character(), o.$character()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Savepoint.java b/jOOQ/src/main/java/org/jooq/impl/Savepoint.java index 1e551e1b29..038f6a01ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Savepoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/Savepoint.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java index 154c6e1ab2..431a1f95fb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java index 060d535f1e..5100acfd27 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java index 8d30ca07d3..9e2b8f985d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/Shl.java b/jOOQ/src/main/java/org/jooq/impl/Shl.java index 6b81cea838..0096394771 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Shl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Shl.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -255,8 +256,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Shl o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($count(), o.$count()) + Objects.equals($value(), o.$value()) && + Objects.equals($count(), o.$count()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Shr.java b/jOOQ/src/main/java/org/jooq/impl/Shr.java index e69f07624d..75ad093d80 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Shr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Shr.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -255,8 +256,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Shr o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($count(), o.$count()) + Objects.equals($value(), o.$value()) && + Objects.equals($count(), o.$count()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java index 8161e5bb7d..a34237af88 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sign.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -173,7 +174,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sign o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java index bb6c6f9cdd..334fd06d3c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Signal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java @@ -239,5 +239,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java b/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java index 6a7abc925f..c7c38a6c99 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java +++ b/jOOQ/src/main/java/org/jooq/impl/SimilarTo.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -187,9 +188,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.SimilarTo o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java b/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java index 90680d9b10..0c3f204ea2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java +++ b/jOOQ/src/main/java/org/jooq/impl/SimilarToQuantified.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -188,9 +189,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.SimilarToQuantified o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($pattern(), o.$pattern()) && - StringUtils.equals($escape(), o.$escape()) + Objects.equals($value(), o.$value()) && + Objects.equals($pattern(), o.$pattern()) && + Objects.equals($escape(), o.$escape()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java index 46bec3915e..0bf3457f8c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -151,7 +152,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sin o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 1e04707504..9424f34bc3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -202,7 +203,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sinh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java index 0db439a313..a8958c79a8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Space.java +++ b/jOOQ/src/main/java/org/jooq/impl/Space.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -201,7 +202,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Space o) { return - StringUtils.equals($count(), o.$count()) + Objects.equals($count(), o.$count()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java index bd67a727cc..cd5c0959b4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java +++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -306,9 +307,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.SplitPart o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($delimiter(), o.$delimiter()) && - StringUtils.equals($n(), o.$n()) + Objects.equals($string(), o.$string()) && + Objects.equals($delimiter(), o.$delimiter()) && + Objects.equals($n(), o.$n()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java index 22783db7d3..759ad5a9ab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -172,7 +173,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sqrt o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java index 7487283408..9cbefaf0bd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Square.java +++ b/jOOQ/src/main/java/org/jooq/impl/Square.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -231,7 +232,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Square o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/StArea.java b/jOOQ/src/main/java/org/jooq/impl/StArea.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StArea.java +++ b/jOOQ/src/main/java/org/jooq/impl/StArea.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java index cd13ccea8e..6b4e057a4b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java +++ b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java @@ -177,5 +177,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StAstext.java b/jOOQ/src/main/java/org/jooq/impl/StAstext.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StAstext.java +++ b/jOOQ/src/main/java/org/jooq/impl/StAstext.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StBoundary.java b/jOOQ/src/main/java/org/jooq/impl/StBoundary.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StBoundary.java +++ b/jOOQ/src/main/java/org/jooq/impl/StBoundary.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StContains.java b/jOOQ/src/main/java/org/jooq/impl/StContains.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StContains.java +++ b/jOOQ/src/main/java/org/jooq/impl/StContains.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java b/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java index 547e581ede..f4ebb7c3d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCoveredBy.java @@ -175,5 +175,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StCovers.java b/jOOQ/src/main/java/org/jooq/impl/StCovers.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCovers.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCovers.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StDifference.java b/jOOQ/src/main/java/org/jooq/impl/StDifference.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDifference.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDifference.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StDimension.java b/jOOQ/src/main/java/org/jooq/impl/StDimension.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDimension.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDimension.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java index 547e581ede..f4ebb7c3d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java @@ -175,5 +175,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StDistance.java b/jOOQ/src/main/java/org/jooq/impl/StDistance.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDistance.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDistance.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StEquals.java b/jOOQ/src/main/java/org/jooq/impl/StEquals.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StEquals.java +++ b/jOOQ/src/main/java/org/jooq/impl/StEquals.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java +++ b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java index 7f263fe091..5a6b0df593 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java @@ -205,5 +205,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java index bad9531ded..3f60cd8b90 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java @@ -181,5 +181,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java index 7f263fe091..5a6b0df593 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java @@ -205,5 +205,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java index a66ab43705..d2801ed104 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java @@ -166,5 +166,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java index a66ab43705..d2801ed104 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java @@ -166,5 +166,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsRing.java b/jOOQ/src/main/java/org/jooq/impl/StIsRing.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsRing.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsRing.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsSimple.java b/jOOQ/src/main/java/org/jooq/impl/StIsSimple.java index a66ab43705..d2801ed104 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsSimple.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsSimple.java @@ -166,5 +166,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsValid.java b/jOOQ/src/main/java/org/jooq/impl/StIsValid.java index a66ab43705..d2801ed104 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsValid.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsValid.java @@ -166,5 +166,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StLength.java b/jOOQ/src/main/java/org/jooq/impl/StLength.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/StLength.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java index 6d27ff8cf0..1d87910226 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java @@ -184,5 +184,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java +++ b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StPerimeter.java b/jOOQ/src/main/java/org/jooq/impl/StPerimeter.java index 71aac4cb12..26c75e2b60 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StPerimeter.java +++ b/jOOQ/src/main/java/org/jooq/impl/StPerimeter.java @@ -153,5 +153,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StPointN.java b/jOOQ/src/main/java/org/jooq/impl/StPointN.java index c4dd35f85b..d06745e892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StPointN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StPointN.java @@ -186,5 +186,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StSrid.java b/jOOQ/src/main/java/org/jooq/impl/StSrid.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StSrid.java +++ b/jOOQ/src/main/java/org/jooq/impl/StSrid.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StTouches.java b/jOOQ/src/main/java/org/jooq/impl/StTouches.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StTouches.java +++ b/jOOQ/src/main/java/org/jooq/impl/StTouches.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StTransform.java b/jOOQ/src/main/java/org/jooq/impl/StTransform.java index 27d1d84524..77dc054719 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StTransform.java +++ b/jOOQ/src/main/java/org/jooq/impl/StTransform.java @@ -179,5 +179,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StUnion.java b/jOOQ/src/main/java/org/jooq/impl/StUnion.java index 4edee1d1d1..885ba81c9b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StUnion.java +++ b/jOOQ/src/main/java/org/jooq/impl/StUnion.java @@ -196,5 +196,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StWithin.java b/jOOQ/src/main/java/org/jooq/impl/StWithin.java index 3f60cd8b90..5b5e244892 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StWithin.java +++ b/jOOQ/src/main/java/org/jooq/impl/StWithin.java @@ -182,5 +182,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StX.java b/jOOQ/src/main/java/org/jooq/impl/StX.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StX.java +++ b/jOOQ/src/main/java/org/jooq/impl/StX.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StXMax.java b/jOOQ/src/main/java/org/jooq/impl/StXMax.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StXMax.java +++ b/jOOQ/src/main/java/org/jooq/impl/StXMax.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StXMin.java b/jOOQ/src/main/java/org/jooq/impl/StXMin.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StXMin.java +++ b/jOOQ/src/main/java/org/jooq/impl/StXMin.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StY.java b/jOOQ/src/main/java/org/jooq/impl/StY.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StY.java +++ b/jOOQ/src/main/java/org/jooq/impl/StY.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StYMax.java b/jOOQ/src/main/java/org/jooq/impl/StYMax.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StYMax.java +++ b/jOOQ/src/main/java/org/jooq/impl/StYMax.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StYMin.java b/jOOQ/src/main/java/org/jooq/impl/StYMin.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StYMin.java +++ b/jOOQ/src/main/java/org/jooq/impl/StYMin.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StZ.java b/jOOQ/src/main/java/org/jooq/impl/StZ.java index c27ce980f4..a5d4b623fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StZ.java +++ b/jOOQ/src/main/java/org/jooq/impl/StZ.java @@ -170,5 +170,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StZMax.java b/jOOQ/src/main/java/org/jooq/impl/StZMax.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StZMax.java +++ b/jOOQ/src/main/java/org/jooq/impl/StZMax.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StZMin.java b/jOOQ/src/main/java/org/jooq/impl/StZMin.java index 9df529b8a4..0f3add8e5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StZMin.java +++ b/jOOQ/src/main/java/org/jooq/impl/StZMin.java @@ -163,5 +163,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java b/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java index eb7dcd6f4a..3e8615c4cf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java +++ b/jOOQ/src/main/java/org/jooq/impl/StartTransaction.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/StartsWith.java b/jOOQ/src/main/java/org/jooq/impl/StartsWith.java index 9c2b692aeb..d0990350a2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StartsWith.java +++ b/jOOQ/src/main/java/org/jooq/impl/StartsWith.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -267,8 +268,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.StartsWith o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($prefix(), o.$prefix()) + Objects.equals($string(), o.$string()) && + Objects.equals($prefix(), o.$prefix()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java b/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java index 0c317bb8e3..48993d0737 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java +++ b/jOOQ/src/main/java/org/jooq/impl/StartsWithIgnoreCase.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -158,8 +159,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.StartsWithIgnoreCase o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($prefix(), o.$prefix()) + Objects.equals($string(), o.$string()) && + Objects.equals($prefix(), o.$prefix()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java index a2d7662d8d..7856014f91 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -172,7 +173,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.StddevPop o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java index ed3fc741d4..79147752cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -172,7 +173,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.StddevSamp o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/StringToArray.java b/jOOQ/src/main/java/org/jooq/impl/StringToArray.java index f761de7122..c737a2e9be 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StringToArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/StringToArray.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -220,9 +221,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.StringToArray o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($delimiter(), o.$delimiter()) && - StringUtils.equals($nullString(), o.$nullString()) + Objects.equals($string(), o.$string()) && + Objects.equals($delimiter(), o.$delimiter()) && + Objects.equals($nullString(), o.$nullString()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sub.java b/jOOQ/src/main/java/org/jooq/impl/Sub.java index b0a91b9503..3740ce4537 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sub.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sub.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; @@ -183,8 +184,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sub o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java index cc6c809389..04e9eb0147 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Substring.java +++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -243,9 +244,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Substring o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($startingPosition(), o.$startingPosition()) && - StringUtils.equals($length(), o.$length()) + Objects.equals($string(), o.$string()) && + Objects.equals($startingPosition(), o.$startingPosition()) && + Objects.equals($length(), o.$length()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java index a1b532265c..4538b516c2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java +++ b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -211,9 +212,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.SubstringIndex o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($delimiter(), o.$delimiter()) && - StringUtils.equals($n(), o.$n()) + Objects.equals($string(), o.$string()) && + Objects.equals($delimiter(), o.$delimiter()) && + Objects.equals($n(), o.$n()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Sum.java b/jOOQ/src/main/java/org/jooq/impl/Sum.java index 833daf8c60..899ad8a6b6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sum.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sum.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -152,7 +153,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Sum o) { return - StringUtils.equals($field(), o.$field()) && + Objects.equals($field(), o.$field()) && $distinct() == o.$distinct() ; } diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java index c6a9ed36f5..c27ce980f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java +++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java @@ -169,5 +169,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/TableEq.java b/jOOQ/src/main/java/org/jooq/impl/TableEq.java index 77997779b9..a15bfb3896 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableEq.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableEq.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -159,8 +160,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.TableEq o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/TableNe.java b/jOOQ/src/main/java/org/jooq/impl/TableNe.java index e3a15836b9..d03436c001 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableNe.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableNe.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -159,8 +160,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.TableNe o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java index 105127d7ab..03f4249970 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -151,7 +152,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Tan o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 2366987b59..a9fa28b206 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -200,7 +201,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Tanh o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Tau.java b/jOOQ/src/main/java/org/jooq/impl/Tau.java index 2aeb8da2d2..ffafb92cf2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tau.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tau.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java index 33e3855566..6ecaf4380c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -191,8 +192,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ToChar o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($formatMask(), o.$formatMask()) + Objects.equals($value(), o.$value()) && + Objects.equals($formatMask(), o.$formatMask()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java index 2c8668d690..a9e02c3103 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.sql.Date; @@ -176,8 +177,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ToDate o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($formatMask(), o.$formatMask()) + Objects.equals($value(), o.$value()) && + Objects.equals($formatMask(), o.$formatMask()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ToHex.java b/jOOQ/src/main/java/org/jooq/impl/ToHex.java index bdf7173258..d10698c5ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToHex.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToHex.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -198,7 +199,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ToHex o) { return - StringUtils.equals($value(), o.$value()) + Objects.equals($value(), o.$value()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java index 5208970f03..c66bf29e45 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.sql.Timestamp; @@ -176,8 +177,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.ToTimestamp o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($formatMask(), o.$formatMask()) + Objects.equals($value(), o.$value()) && + Objects.equals($formatMask(), o.$formatMask()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java index 83fa68f242..281082da4e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Translate.java +++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -200,9 +201,9 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Translate o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($from(), o.$from()) && - StringUtils.equals($to(), o.$to()) + Objects.equals($string(), o.$string()) && + Objects.equals($from(), o.$from()) && + Objects.equals($to(), o.$to()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java index 16e2ce1e2c..3306fdf434 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trim.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -203,8 +204,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Trim o) { return - StringUtils.equals($string(), o.$string()) && - StringUtils.equals($characters(), o.$characters()) + Objects.equals($string(), o.$string()) && + Objects.equals($characters(), o.$characters()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java index f3586e54c7..815ea0e6e4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -220,8 +221,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Trunc o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($decimals(), o.$decimals()) + Objects.equals($value(), o.$value()) && + Objects.equals($decimals(), o.$decimals()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java index 4126969899..90b82090db 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java @@ -62,6 +62,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; diff --git a/jOOQ/src/main/java/org/jooq/impl/TryCast.java b/jOOQ/src/main/java/org/jooq/impl/TryCast.java index 0bc1be9e95..c5f2bb12c6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TryCast.java +++ b/jOOQ/src/main/java/org/jooq/impl/TryCast.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -160,8 +161,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.TryCast o) { return - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($dataType(), o.$dataType()) + Objects.equals($value(), o.$value()) && + Objects.equals($dataType(), o.$dataType()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Unique.java b/jOOQ/src/main/java/org/jooq/impl/Unique.java index c622346b50..9866fc6a6f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Unique.java +++ b/jOOQ/src/main/java/org/jooq/impl/Unique.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -164,7 +165,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Unique o) { return - StringUtils.equals($query(), o.$query()) + Objects.equals($query(), o.$query()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Updating.java b/jOOQ/src/main/java/org/jooq/impl/Updating.java index c4c88d44e4..5d4eda0e95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Updating.java +++ b/jOOQ/src/main/java/org/jooq/impl/Updating.java @@ -140,5 +140,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java index 28fea6a74c..d12f4f1496 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Upper.java +++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,7 +157,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Upper o) { return - StringUtils.equals($string(), o.$string()) + Objects.equals($string(), o.$string()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Uuid.java b/jOOQ/src/main/java/org/jooq/impl/Uuid.java index a459e634b0..be75ff9507 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Uuid.java +++ b/jOOQ/src/main/java/org/jooq/impl/Uuid.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.UUID; diff --git a/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java b/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java index 2c18f8dd1c..35d857df94 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java +++ b/jOOQ/src/main/java/org/jooq/impl/UuidToBin.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -185,7 +186,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.UuidToBin o) { return - StringUtils.equals($uuid(), o.$uuid()) + Objects.equals($uuid(), o.$uuid()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java index 487032500e..9a08ec7974 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -183,7 +184,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.VarPop o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java index 63247de51d..43e3fa81e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.math.BigDecimal; @@ -171,7 +172,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.VarSamp o) { return - StringUtils.equals($field(), o.$field()) + Objects.equals($field(), o.$field()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java index b9ce39aeb6..a195966704 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java +++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -224,10 +225,10 @@ implements public boolean equals(Object that) { if (that instanceof QOM.WidthBucket o) { return - StringUtils.equals($field(), o.$field()) && - StringUtils.equals($low(), o.$low()) && - StringUtils.equals($high(), o.$high()) && - StringUtils.equals($buckets(), o.$buckets()) + Objects.equals($field(), o.$field()) && + Objects.equals($low(), o.$low()) && + Objects.equals($high(), o.$high()) && + Objects.equals($buckets(), o.$buckets()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java index a8e7a922d0..dfa435bbfe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -153,7 +154,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.XMLComment o) { return - StringUtils.equals($comment(), o.$comment()) + Objects.equals($comment(), o.$comment()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java index 84cb394f4c..2b8db10905 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -148,7 +149,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.XMLForest o) { return - StringUtils.equals($fields(), o.$fields()) + Objects.equals($fields(), o.$fields()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java index 10fa7f92ce..e00c93aa50 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -156,7 +157,7 @@ implements public boolean equals(Object that) { if (that instanceof QOM.XMLConcat o) { return - StringUtils.equals($args(), o.$args()) + Objects.equals($args(), o.$args()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java index 45720eb51c..7f210dd16f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java @@ -150,5 +150,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java index c058e80d55..bf62823bd8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -178,8 +179,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.XMLPi o) { return - StringUtils.equals($target(), o.$target()) && - StringUtils.equals($content(), o.$content()) + Objects.equals($target(), o.$target()) && + Objects.equals($content(), o.$content()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java index eb42391245..3522fe6228 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -189,8 +190,8 @@ implements if (that instanceof QOM.XMLSerialize o) { return $content() == o.$content() && - StringUtils.equals($value(), o.$value()) && - StringUtils.equals($type(), o.$type()) + Objects.equals($value(), o.$value()) && + Objects.equals($type(), o.$type()) ; } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Xor.java b/jOOQ/src/main/java/org/jooq/impl/Xor.java index 5472c20ca5..5ece4da108 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xor.java @@ -60,6 +60,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; import java.util.Set; @@ -184,8 +185,8 @@ implements public boolean equals(Object that) { if (that instanceof QOM.Xor o) { return - StringUtils.equals($arg1(), o.$arg1()) && - StringUtils.equals($arg2(), o.$arg2()) + Objects.equals($arg1(), o.$arg1()) && + Objects.equals($arg2(), o.$arg2()) ; } else