This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 610b2c73f28c7a0af5321d2d7584125a56da1d9c Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 23 18:27:06 2026 -0400 Cleanup: EqualsBuilder is deprecated in favor of plain Java alternatives --- .../cayenne/dbsync/reverse/dbload/ExportedKey.java | 21 ++++++++------------- .../cayenne/access/jdbc/ColumnDescriptor.java | 11 +++++++---- .../java/org/apache/cayenne/util/EqualsBuilder.java | 5 ++++- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java index 6bc7004cd..ba06ad8c9 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java @@ -25,7 +25,6 @@ import java.util.Objects; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.util.CompareToBuilder; -import org.apache.cayenne.util.EqualsBuilder; import org.apache.cayenne.util.HashCodeBuilder; import org.apache.cayenne.util.Util; @@ -86,11 +85,9 @@ public class ExportedKey implements Comparable<ExportedKey> { return false; } ExportedKey rhs = (ExportedKey) obj; - return new EqualsBuilder() - .append(this.pk, rhs.pk) - .append(this.fk, rhs.fk) - .append(this.keySeq, rhs.keySeq) - .isEquals(); + return Objects.equals(pk, rhs.pk) + && Objects.equals(fk, rhs.fk) + && keySeq == rhs.keySeq; } @Override @@ -192,13 +189,11 @@ public class ExportedKey implements Comparable<ExportedKey> { return false; } KeyData rhs = (KeyData) obj; - return new EqualsBuilder() - .append(this.catalog, rhs.catalog) - .append(this.schema, rhs.schema) - .append(this.table, rhs.table) - .append(this.column, rhs.column) - .append(this.name, rhs.name) - .isEquals(); + return Objects.equals(catalog, rhs.catalog) + && Objects.equals(schema, rhs.schema) + && Objects.equals(table, rhs.table) + && Objects.equals(column, rhs.column) + && Objects.equals(name, rhs.name); } @Override diff --git a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java index 0f000ffab..73a415583 100644 --- a/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java +++ b/cayenne/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java @@ -26,8 +26,9 @@ import org.apache.cayenne.dba.TypesMapping; import org.apache.cayenne.map.DbAttribute; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ProcedureParameter; -import org.apache.cayenne.util.EqualsBuilder; import org.apache.cayenne.util.HashCodeBuilder; + +import java.util.Objects; import org.apache.cayenne.util.ToStringBuilder; /** @@ -179,9 +180,11 @@ public class ColumnDescriptor { } ColumnDescriptor rhs = (ColumnDescriptor) o; - return new EqualsBuilder().append(name, rhs.name).append(namePrefix, rhs.namePrefix) - .append(procedureName, rhs.procedureName).append(dataRowKey, rhs.dataRowKey) - .append(tableName, rhs.tableName).isEquals(); + return Objects.equals(name, rhs.name) + && Objects.equals(namePrefix, rhs.namePrefix) + && Objects.equals(procedureName, rhs.procedureName) + && Objects.equals(dataRowKey, rhs.dataRowKey) + && Objects.equals(tableName, rhs.tableName); } /** diff --git a/cayenne/src/main/java/org/apache/cayenne/util/EqualsBuilder.java b/cayenne/src/main/java/org/apache/cayenne/util/EqualsBuilder.java index eef5be191..c1c034a9e 100644 --- a/cayenne/src/main/java/org/apache/cayenne/util/EqualsBuilder.java +++ b/cayenne/src/main/java/org/apache/cayenne/util/EqualsBuilder.java @@ -21,9 +21,12 @@ package org.apache.cayenne.util; /** * Assists in implementing {@link Object#equals(Object)} methods. The code is based on * EqualsBuilder from commons-lang 2.1. - * + * + * @deprecated Use {@link java.util.Objects#equals(Object, Object)} or + * {@link java.util.Objects#deepEquals(Object, Object)} directly. * @since 3.0 */ +@Deprecated(since = "5.0", forRemoval = true) public class EqualsBuilder { /**
