From fa24c26e30aab57ac05be5b3fd6c6c5bdfe67794 Mon Sep 17 00:00:00 2001
From: Kacper Magdziarz <kacper.magdziarz@hyland.com>
Date: Tue, 9 Sep 2025 11:43:25 +0200
Subject: [PATCH] [ACS-9736] Add value decoding for NodeRef in audit record
 utility

---
 .../alfresco/repo/audit/AuditRecordUtils.java    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java b/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java
index 55d86f52d2..c9540e27d5 100644
--- a/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java
+++ b/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java
@@ -29,6 +29,8 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.alfresco.service.cmr.repository.NodeRef;
+
 public class AuditRecordUtils
 {
     private AuditRecordUtils()
@@ -59,10 +61,22 @@ public class AuditRecordUtils
             {
                 current = (HashMap<String, Serializable>) current.computeIfAbsent(keys[i], newMap -> new HashMap<String, Serializable>());
             }
-            current.put(keys[keys.length - 1], v);
+            current.put(keys[keys.length - 1], decodeValueByInstance(v));
         });
         auditRecordBuilder.setAuditRecordData(rootNode);
 
         return auditRecordBuilder;
     }
+
+    private static Serializable decodeValueByInstance(Serializable value)
+    {
+        if (value instanceof NodeRef)
+        {
+            return ((NodeRef) value).getId();
+        }
+        else
+        {
+            return value;
+        }
+    }
 }