From be5658548dceb79709570975be394e92ddbf1975 Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz Date: Wed, 23 Jul 2025 10:22:46 +0200 Subject: [PATCH] [ACS-9736] Switch to latest acs-event-model --- pom.xml | 2 +- .../alfresco/repo/audit/AuditComponentImpl.java | 2 +- .../org/alfresco/repo/audit/AuditRecord.java | 9 +++++---- .../alfresco/repo/audit/AuditRecordUtils.java | 7 ++++--- .../repo/audit/AuditRecordUtilsTest.java | 16 ++++++++-------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 097c39f941..0ce78cfe3b 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 5.2.0-A.3 4.2.0 7.1 - 1.0.6-SNAPSHOT + 1.0.7 1.9.22.1 6.2.8 diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java index 7e98adf5ee..afdbd77f64 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java @@ -940,7 +940,7 @@ public class AuditComponentImpl implements AuditComponent * the name of the audit application * @return a constructed AuditRecord instance */ - private AuditRecord createAuditRecord(Map auditData, boolean inTransaction, String applicationName) + private AuditRecord createAuditRecord(Map auditData, boolean inTransaction, String applicationName) { int rootSize = applicationName.length() + 2; // Root is constructed like this -> '/' + auditedApplicationName + '/'. AuditRecord.Builder builder = AuditRecordUtils.generateAuditRecordBuilder(auditData, rootSize); diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditRecord.java b/repository/src/main/java/org/alfresco/repo/audit/AuditRecord.java index fc4bb769b1..3175cc9ee1 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditRecord.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditRecord.java @@ -25,6 +25,7 @@ */ package org.alfresco.repo.audit; +import java.io.Serializable; import java.time.ZonedDateTime; import java.util.Map; @@ -33,7 +34,7 @@ public class AuditRecord private final boolean inTransaction; private final String auditApplicationId; private final ZonedDateTime createdAt; - private final Map auditData; + private final Map auditData; public AuditRecord(Builder builder) { @@ -58,7 +59,7 @@ public class AuditRecord return createdAt; } - public Map getAuditData() + public Map getAuditData() { return auditData; } @@ -72,7 +73,7 @@ public class AuditRecord { private String auditApplicationId; private boolean inTransaction; - private Map auditData; + private Map auditData; public Builder setAuditApplicationId(String auditApplicationId) { @@ -86,7 +87,7 @@ public class AuditRecord return this; } - public Builder setAuditData(Map auditData) + public Builder setAuditData(Map auditData) { this.auditData = auditData; return this; 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 0bfccee7ef..4ba6cf668d 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditRecordUtils.java @@ -25,6 +25,7 @@ */ package org.alfresco.repo.audit; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -40,10 +41,10 @@ public class AuditRecordUtils * @return a preloaded {@link AuditRecord.Builder} */ @SuppressWarnings("unchecked") - public static AuditRecord.Builder generateAuditRecordBuilder(Map data, int keyRootLength) + public static AuditRecord.Builder generateAuditRecordBuilder(Map data, int keyRootLength) { var auditRecordBuilder = AuditRecord.builder(); - var rootNode = new HashMap(); + var rootNode = new HashMap(); data.forEach((k, v) -> { var keys = k.substring(keyRootLength).split("/"); @@ -51,7 +52,7 @@ public class AuditRecordUtils var current = rootNode; for (int i = 0; i < keys.length - 1; i++) { - current = (HashMap) current.computeIfAbsent(keys[i], newMap -> new HashMap()); + current = (HashMap) current.computeIfAbsent(keys[i], newMap -> new HashMap()); } current.put(keys[keys.length - 1], v); }); diff --git a/repository/src/test/java/org/alfresco/repo/audit/AuditRecordUtilsTest.java b/repository/src/test/java/org/alfresco/repo/audit/AuditRecordUtilsTest.java index d4dbc35426..985bfdd8d8 100644 --- a/repository/src/test/java/org/alfresco/repo/audit/AuditRecordUtilsTest.java +++ b/repository/src/test/java/org/alfresco/repo/audit/AuditRecordUtilsTest.java @@ -26,17 +26,17 @@ package org.alfresco.repo.audit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import org.alfresco.service.namespace.QName; +import org.junit.Test; +import java.io.Serializable; import java.time.Instant; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.junit.Test; - -import org.alfresco.service.namespace.QName; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class AuditRecordUtilsTest { @@ -44,14 +44,14 @@ public class AuditRecordUtilsTest @SuppressWarnings("unchecked") public void generateAuditRecordBuilderTest() { - var testData = new HashMap(); + var testData = new HashMap(); testData.put("/alfresco-access/transaction/path", "/app:company_home"); testData.put("/alfresco-access/transaction/user", "admin"); testData.put("/alfresco-access/transaction/sub-actions", "updateNodeProperties"); var now = Instant.now(); - testData.put("/alfresco-access/transaction/properties/from", Map.of(QName.createQName("modified"), Date.from(now))); - testData.put("/alfresco-access/transaction/properties/to", Map.of(QName.createQName("modified"), Date.from(now))); + testData.put("/alfresco-access/transaction/properties/from", (Serializable) Map.of(QName.createQName("modified"), Date.from(now))); + testData.put("/alfresco-access/transaction/properties/to", (Serializable) Map.of(QName.createQName("modified"), Date.from(now))); var builder = AuditRecordUtils.generateAuditRecordBuilder(testData, "/alfresco-access/".length()); builder.setAuditApplicationId("alfresco-access");