From 881d30745b3c6a5b75fc508cd1f4491097aa6298 Mon Sep 17 00:00:00 2001 From: Jurgen Date: Mon, 16 Nov 2026 17:15:03 +0200 Subject: [PATCH] CAY-3080 ObjectId.toString() prints binary key values as object identity --- RELEASE-NOTES.txt | 1 + .../org/apache/cayenne/ObjectIdCompound.java | 3 ++- .../org/apache/cayenne/ObjectIdSingle.java | 20 +++++++++++++- .../java/org/apache/cayenne/ObjectIdTest.java | 27 +++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4bd92a144b..89115b4abe 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -16,6 +16,7 @@ Bug Fixes: CAY-3071 DataNodeSQLAction could lose update count info CAY-3073 AI plugin / MCP db import schema description inconsistencies +CAY-3080 ObjectId.toString() prints binary key values as object identity ---------------------------------- Release: 5.0-RC1 diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java index 0d102ca6f4..106f9a89c2 100644 --- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java +++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdCompound.java @@ -213,7 +213,8 @@ public String toString() { String[] keys = objectIdKeys.keySet().toArray(new String[0]); Arrays.sort(keys); for (String key : keys) { - buffer.append(", ").append(key).append("=").append(objectIdKeys.get(key)); + buffer.append(", ").append(key).append("="); + ObjectIdSingle.appendIdValue(buffer, objectIdKeys.get(key)); } return buffer.append(">").toString(); } diff --git a/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java b/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java index e47ce4db82..cc6bd98306 100644 --- a/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java +++ b/cayenne/src/main/java/org/apache/cayenne/ObjectIdSingle.java @@ -19,6 +19,7 @@ package org.apache.cayenne; +import org.apache.cayenne.util.IDUtil; import org.apache.cayenne.util.SingleEntryMap; import java.util.Arrays; @@ -87,7 +88,24 @@ public boolean isReplacementIdAttached() { @Override public String toString() { - return ""; + StringBuilder buffer = new StringBuilder().append("").toString(); + } + + /** + * Appends an id value for {@link #toString()}, printing a byte[] (e.g. a binary PK) as a hex string, so that equal + * ids produce the same string. + */ + static void appendIdValue(StringBuilder buffer, Object value) { + if (value instanceof byte[] bytes) { + for (byte b : bytes) { + IDUtil.appendFormattedByte(buffer, b); + } + } else { + buffer.append(value); + } } String getKeyName() { diff --git a/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java b/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java index ba48aadcff..42f3f299d3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java +++ b/cayenne/src/test/java/org/apache/cayenne/ObjectIdTest.java @@ -294,4 +294,31 @@ public void toStringMethod() { assertEquals(i1, i2); assertEquals(i1.toString(), i2.toString()); } + + @Test + public void toStringBinaryKey() { + ObjectId i1 = ObjectId.of("E", "ID", new byte[]{1, 2, 10, -1}); + ObjectId i2 = ObjectId.of("E", "ID", new byte[]{1, 2, 10, -1}); + + assertEquals("", i1.toString()); + assertEquals(i1, i2); + assertEquals(i1.toString(), i2.toString()); + } + + @Test + public void toStringCompoundBinaryKey() { + Map m1 = new HashMap<>(); + m1.put("a", new byte[]{1, 2, 10, -1}); + m1.put("b", 5); + ObjectId i1 = ObjectId.of("E", m1); + + Map m2 = new HashMap<>(); + m2.put("b", 5); + m2.put("a", new byte[]{1, 2, 10, -1}); + ObjectId i2 = ObjectId.of("E", m2); + + assertEquals("", i1.toString()); + assertEquals(i1, i2); + assertEquals(i1.toString(), i2.toString()); + } }