This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch past-M2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit c7c537a42730c194f040a5adb8c9b2cb049e3e3f Author: Andrus Adamchik <[email protected]> AuthorDate: Sun Jun 14 15:36:46 2026 -0400 cleanup --- .../org/apache/cayenne/access/jdbc/ColumnDescriptor.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 90ad64ae5..64a75f2d3 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 @@ -19,16 +19,15 @@ package org.apache.cayenne.access.jdbc; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; - 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.ToStringBuilder; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; import java.util.Objects; -import org.apache.cayenne.util.ToStringBuilder; /** * A descriptor of a ResultSet column. @@ -140,10 +139,10 @@ public class ColumnDescriptor { private static String getColumnNameFromMeta(ResultSetMetaData metaData, int position) throws SQLException { String name = metaData.getColumnLabel(position); - if (name == null || name.length() == 0) { + if (name == null || name.isEmpty()) { name = metaData.getColumnName(position); - if (name == null || name.length() == 0) { + if (name == null || name.isEmpty()) { name = "column_" + position; } } @@ -174,11 +173,10 @@ public class ColumnDescriptor { */ @Override public boolean equals(Object o) { - if (!(o instanceof ColumnDescriptor)) { + if (!(o instanceof ColumnDescriptor rhs)) { return false; } - ColumnDescriptor rhs = (ColumnDescriptor) o; return Objects.equals(name, rhs.name) && Objects.equals(namePrefix, rhs.namePrefix) && Objects.equals(procedureName, rhs.procedureName)
