Propagate DumAemEvent to object creation

Include the DumAemEvent when creating DumAemObjectGeneric instances. AemNodeNavigator (and its reactive variant) now pass session.getEvent() to objectService.getDumAemObjectGeneric. The DumAemObjectService convenience overload without an event was removed in favor of a single method that requires a DumAemEvent. Tests were updated to call the service with DumAemEvent.NONE. This preserves event context when constructing AEM objects.

Author: alegauss

aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/navigator/AemNodeNavigator.java

@@ -158,7 +158,8 @@ private Mono<Void> navigateChildrenReactive(DumAemSession session, DumAemObjectG
     private void processChildNode(DumAemSession session, String childPath) {
         DumAemCommonsUtils.getInfinityJson(childPath, session.getConfiguration(), false)
                 .ifPresent(infinityJson -> {
-                    DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);
+                    DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson,
+                            session.getEvent());
                     processNode(session, childObject);
 
                     if (session.isRecursive()) {
@@ -173,7 +174,8 @@ private void processChildNode(DumAemSession session, String childPath) {
     private Mono<Void> processChildNodeReactive(DumAemSession session, String childPath) {
         return reactiveUtils.getInfinityJsonReactive(childPath, session.getConfiguration())
                 .flatMap(infinityJson -> {
-                    DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);
+                    DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson,
+                            session.getEvent());
                     processNode(session, childObject);
 
                     if (session.isRecursive()) {

aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/service/DumAemObjectService.java

@@ -2,16 +2,12 @@
 
 import org.json.JSONObject;
 import org.springframework.stereotype.Service;
+
 import com.viglet.dumont.connector.aem.commons.DumAemObjectGeneric;
 import com.viglet.dumont.connector.aem.commons.bean.DumAemEvent;
 
 @Service
 public class DumAemObjectService {
-
-    public DumAemObjectGeneric getDumAemObjectGeneric(String path, JSONObject infinityJson) {
-        return getDumAemObjectGeneric(path, infinityJson, DumAemEvent.NONE);
-    }
-
     public DumAemObjectGeneric getDumAemObjectGeneric(String path, JSONObject infinityJson,
             DumAemEvent dumAemEvent) {
         return new DumAemObjectGeneric(path, infinityJson, dumAemEvent);

aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/service/DumAemObjectServiceTest.java

@@ -57,7 +57,7 @@ void shouldCreateObjectWithPathAndJson() {
             JSONObject json = new JSONObject();
             json.put("jcr:primaryType", "cq:Page");
 
-            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test", json);
+            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test", json, DumAemEvent.NONE);
 
             assertNotNull(result);
             assertEquals("/content/test", result.getPath());
@@ -72,7 +72,7 @@ void shouldHandlePageTypeJson() {
             jcrContent.put("jcr:title", "Test Page");
             json.put("jcr:content", jcrContent);
 
-            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test/page", json);
+            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test/page", json, DumAemEvent.NONE);
 
             assertNotNull(result);
             assertEquals("/content/test/page", result.getPath());
@@ -84,7 +84,8 @@ void shouldHandleAssetTypeJson() {
             JSONObject json = new JSONObject();
             json.put("jcr:primaryType", "dam:Asset");
 
-            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/dam/test.jpg", json);
+            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/dam/test.jpg", json,
+                    DumAemEvent.NONE);
 
             assertNotNull(result);
             assertEquals("/content/dam/test.jpg", result.getPath());
@@ -95,7 +96,7 @@ void shouldHandleAssetTypeJson() {
         void shouldHandleEmptyJsonObject() {
             JSONObject json = new JSONObject();
 
-            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test", json);
+            DumAemObjectGeneric result = service.getDumAemObjectGeneric("/content/test", json, DumAemEvent.NONE);
 
             assertNotNull(result);
             assertEquals("/content/test", result.getPath());
@@ -159,7 +160,7 @@ void shouldHandleContentFragment() {
             json.put("jcr:content", jcrContent);
 
             DumAemObjectGeneric result = service.getDumAemObjectGeneric(
-                    "/content/dam/test/cf", json);
+                    "/content/dam/test/cf", json, DumAemEvent.NONE);
 
             assertNotNull(result);
         }
@@ -175,7 +176,7 @@ void shouldHandleFolderAndUnstructuredTypes(String primaryType, String path) {
             JSONObject json = new JSONObject();
             json.put("jcr:primaryType", primaryType);
 
-            DumAemObjectGeneric result = service.getDumAemObjectGeneric(path, json);
+            DumAemObjectGeneric result = service.getDumAemObjectGeneric(path, json, DumAemEvent.NONE);
 
             assertNotNull(result);
         }
@@ -201,7 +202,7 @@ void shouldHandleNestedJsonStructures() {
             json.put("jcr:content", jcrContent);
 
             DumAemObjectGeneric result = service.getDumAemObjectGeneric(
-                    "/content/test/page", json);
+                    "/content/test/page", json, DumAemEvent.NONE);
 
             assertNotNull(result);
             assertNotNull(result.getJcrNode());