Rename indexChildren to recursive

alegauss · alegauss · commit 12050b25fc66 · 2026-02-04T18:09:10.000-03:00
Rename the DumAemSession flag from indexChildren to recursive and update usages across the plugin. Adjusted AemNodeNavigator and DumAemSessionService to check/set isRecursive (preserving default true), and updated builders and tests to use the new property. Replaced Mockito doNothing() stubs for dumConnectorContext.addJobItem(...) with when(...).thenReturn(true) to match the method behavior. Also add standard logback-test.xml to test resources in aem-commons, aem-plugin-sample and aem-plugin modules.
diff --git a/aem-commons/src/test/resources/logback-test.xml b/aem-commons/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -- %msg%n%nopex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/aem/aem-plugin-sample/src/test/resources/logback-test.xml b/aem/aem-plugin-sample/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -- %msg%n%nopex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/context/DumAemSession.java b/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/context/DumAemSession.java
@@ -20,6 +20,6 @@ public class DumAemSession extends DumConnectorSession {
     private DumAemContentMapping contentMapping;
     private DumAemEvent event;
     private boolean standalone;
-    private boolean indexChildren;
+    private boolean recursive;
     private List<TurSNAttributeSpec> attributeSpecs;
 }
diff --git a/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/navigator/AemNodeNavigator.java b/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/navigator/AemNodeNavigator.java
@@ -88,7 +88,7 @@ public void navigateAndIndex(DumAemSession session, String path, JSONObject infi
 
         processNode(session, aemObject);
 
-        if (session.isIndexChildren()) {
+        if (session.isRecursive()) {
             navigateChildren(session, aemObject);
         }
     }
@@ -161,7 +161,7 @@ private void processChildNode(DumAemSession session, String childPath) {
                     DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);
                     processNode(session, childObject);
 
-                    if (session.isIndexChildren()) {
+                    if (session.isRecursive()) {
                         navigateChildrenSync(session, childObject);
                     }
                 });
@@ -176,7 +176,7 @@ private Mono<Void> processChildNodeReactive(DumAemSession session, String childP
                     DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);
                     processNode(session, childObject);
 
-                    if (session.isIndexChildren()) {
+                    if (session.isRecursive()) {
                         return navigateChildrenReactive(session, childObject);
                     }
                     return Mono.empty();
diff --git a/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/service/DumAemSessionService.java b/aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/service/DumAemSessionService.java
@@ -52,7 +52,7 @@ public DumAemSession getDumAemSession(DumAemSource dumAemSource,
                                 .map(DumAemPathList::getEvent)
                                 .orElse(DumAemEvent.NONE);
 
-                boolean indexChildren = Optional.ofNullable(dumAemPathList)
+                boolean recursive = Optional.ofNullable(dumAemPathList)
                                 .map(DumAemPathList::getRecursive)
                                 .orElse(true);
 
@@ -61,7 +61,7 @@ public DumAemSession getDumAemSession(DumAemSource dumAemSource,
                                 .configuration(dumAemConfiguration)
                                 .event(event)
                                 .standalone(standalone)
-                                .indexChildren(indexChildren)
+                                .recursive(recursive)
                                 .source(session.getSource())
                                 .transactionId(session.getTransactionId())
                                 .sites(session.getSites())
diff --git a/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/context/DumAemSessionTest.java b/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/context/DumAemSessionTest.java
@@ -70,7 +70,7 @@ void shouldBuildSessionWithAllFields() {
                     .contentMapping(contentMapping)
                     .event(event)
                     .standalone(true)
-                    .indexChildren(true)
+                    .recursive(true)
                     .attributeSpecs(attributeSpecs)
                     .build();
 
@@ -79,7 +79,7 @@ void shouldBuildSessionWithAllFields() {
             assertNotNull(session.getContentMapping());
             assertNotNull(session.getEvent());
             assertTrue(session.isStandalone());
-            assertTrue(session.isIndexChildren());
+            assertTrue(session.isRecursive());
             assertEquals(1, session.getAttributeSpecs().size());
         }
 
@@ -93,7 +93,7 @@ void shouldBuildSessionWithMinimalFields() {
             assertNull(session.getContentMapping());
             assertNull(session.getEvent());
             assertFalse(session.isStandalone());
-            assertFalse(session.isIndexChildren());
+            assertFalse(session.isRecursive());
             assertNull(session.getAttributeSpecs());
         }
     }
@@ -110,7 +110,7 @@ void shouldCreateSessionWithDefaultValues() {
             assertNull(session.getConfiguration());
             assertNull(session.getModel());
             assertFalse(session.isStandalone());
-            assertFalse(session.isIndexChildren());
+            assertFalse(session.isRecursive());
         }
     }
 
@@ -133,7 +133,7 @@ void shouldCreateSessionWithAllArguments() {
                     .contentMapping(contentMapping)
                     .event(event)
                     .standalone(true)
-                    .indexChildren(true)
+                    .recursive(true)
                     .attributeSpecs(attributeSpecs)
                     .build();
 
@@ -142,7 +142,7 @@ void shouldCreateSessionWithAllArguments() {
             assertEquals(contentMapping, session.getContentMapping());
             assertEquals(event, session.getEvent());
             assertTrue(session.isStandalone());
-            assertTrue(session.isIndexChildren());
+            assertTrue(session.isRecursive());
             assertEquals(attributeSpecs, session.getAttributeSpecs());
         }
     }
diff --git a/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/navigator/AemNodeNavigatorTest.java b/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/navigator/AemNodeNavigatorTest.java
@@ -160,8 +160,8 @@ void shouldProcessNodeWhenTypeMatchesContentType() {
         }
 
         @Test
-        @DisplayName("Should navigate children when indexChildren is true")
-        void shouldNavigateChildrenWhenIndexChildrenIsTrue() {
+        @DisplayName("Should navigate children when recursive is true")
+        void shouldNavigateChildrenWhenRecursiveIsTrue() {
             // Given
             DumAemSession session = createMockSession(true);
             String path = "/content/test";
@@ -179,8 +179,8 @@ void shouldNavigateChildrenWhenIndexChildrenIsTrue() {
         }
 
         @Test
-        @DisplayName("Should not navigate children when indexChildren is false")
-        void shouldNotNavigateChildrenWhenIndexChildrenIsFalse() {
+        @DisplayName("Should not navigate children when recursive is false")
+        void shouldNotNavigateChildrenWhenRecursiveIsFalse() {
             // Given
             DumAemSession session = createMockSession(false);
             String path = "/content/test";
@@ -225,15 +225,15 @@ void shouldUseReactiveNavigationWhenEnabled() {
         }
     }
 
-    private DumAemSession createMockSession(boolean indexChildren) {
+    private DumAemSession createMockSession(boolean recursive) {
         DumAemConfiguration config = mock(DumAemConfiguration.class);
         lenient().when(config.getContentType()).thenReturn("cq:Page");
         lenient().when(config.getSubType()).thenReturn(null);
 
         return DumAemSession.builder()
                 .configuration(config)
                 .event(DumAemEvent.NONE)
-                .indexChildren(indexChildren)
+                .recursive(recursive)
                 .standalone(true)
                 .providerName("AEM")
                 .build();
diff --git a/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/service/DumAemJobServiceTest.java b/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/service/DumAemJobServiceTest.java
@@ -21,7 +21,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -197,7 +196,7 @@ void shouldIndexForAuthorEnvironmentWhenConfigured() {
                     .thenReturn(new DumAemTargetAttrValueMap());
             when(dumAemContentDefinitionService.getDeltaDate(any(), any(), any()))
                     .thenReturn(new Date());
-            doNothing().when(dumConnectorContext).addJobItem(any());
+            when(dumConnectorContext.addJobItem(any())).thenReturn(true);
 
             // When
             service.indexObject(session, aemObjectGeneric);
@@ -217,7 +216,7 @@ void shouldIndexForPublishEnvironmentWhenConfiguredAndDelivered() {
                     .thenReturn(new DumAemTargetAttrValueMap());
             lenient().when(dumAemContentDefinitionService.getDeltaDate(any(), any(), any()))
                     .thenReturn(new Date());
-            lenient().doNothing().when(dumConnectorContext).addJobItem(any());
+            lenient().when(dumConnectorContext.addJobItem(any())).thenReturn(true);
 
             // When
             service.indexObject(session, aemObjectGeneric);
diff --git a/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/service/DumAemSessionServiceTest.java b/aem/aem-plugin/src/test/java/com/viglet/dumont/connector/plugin/aem/service/DumAemSessionServiceTest.java
@@ -125,8 +125,8 @@ void shouldSetEventFromPathList() {
         }
 
         @Test
-        @DisplayName("Should set indexChildren from path list recursive flag")
-        void shouldSetIndexChildrenFromPathListRecursiveFlag() {
+        @DisplayName("Should set recursive from path list recursive flag")
+        void shouldSetRecursiveFromPathListRecursiveFlag() {
             // Given
             DumAemSource source = createDumAemSource();
             DumAemPathList pathList = createDumAemPathList(DumAemEvent.NONE, false);
@@ -138,7 +138,7 @@ void shouldSetIndexChildrenFromPathListRecursiveFlag() {
 
             // Then
             assertNotNull(result);
-            assertFalse(result.isIndexChildren());
+            assertFalse(result.isRecursive());
         }
 
         @Test
@@ -158,8 +158,8 @@ void shouldDefaultToNoneEventWhenPathListIsNull() {
         }
 
         @Test
-        @DisplayName("Should default to true for indexChildren when path list is null")
-        void shouldDefaultToTrueForIndexChildrenWhenPathListIsNull() {
+        @DisplayName("Should default to true for recursive when path list is null")
+        void shouldDefaultToTrueForRecursiveWhenPathListIsNull() {
             // Given
             DumAemSource source = createDumAemSource();
 
@@ -170,7 +170,7 @@ void shouldDefaultToTrueForIndexChildrenWhenPathListIsNull() {
 
             // Then
             assertNotNull(result);
-            assertTrue(result.isIndexChildren());
+            assertTrue(result.isRecursive());
         }
 
         @Test
@@ -281,7 +281,7 @@ void shouldUseDefaultValuesWhenNoPathListProvided() {
             // Then
             assertNotNull(result);
             assertEquals(DumAemEvent.NONE, result.getEvent());
-            assertTrue(result.isIndexChildren());
+            assertTrue(result.isRecursive());
             assertFalse(result.isStandalone());
         }
     }
diff --git a/aem/aem-plugin/src/test/resources/logback-test.xml b/aem/aem-plugin/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -- %msg%n%nopex</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public class DumAemSession extends DumConnectorSession {`
`20`	`20`	`private DumAemContentMapping contentMapping;`
`21`	`21`	`private DumAemEvent event;`
`22`	`22`	`private boolean standalone;`
`23`		`- private boolean indexChildren;`
	`23`	`+ private boolean recursive;`
`24`	`24`	`private List<TurSNAttributeSpec> attributeSpecs;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void navigateAndIndex(DumAemSession session, String path, JSONObject infi`
`88`	`88`
`89`	`89`	`processNode(session, aemObject);`
`90`	`90`
`91`		`- if (session.isIndexChildren()) {`
	`91`	`+ if (session.isRecursive()) {`
`92`	`92`	`navigateChildren(session, aemObject);`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -161,7 +161,7 @@ private void processChildNode(DumAemSession session, String childPath) {`
`161`	`161`	`DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);`
`162`	`162`	`processNode(session, childObject);`
`163`	`163`
`164`		`- if (session.isIndexChildren()) {`
	`164`	`+ if (session.isRecursive()) {`
`165`	`165`	`navigateChildrenSync(session, childObject);`
`166`	`166`	`}`
`167`	`167`	`});`
`@@ -176,7 +176,7 @@ private Mono<Void> processChildNodeReactive(DumAemSession session, String childP`
`176`	`176`	`DumAemObjectGeneric childObject = objectService.getDumAemObjectGeneric(childPath, infinityJson);`
`177`	`177`	`processNode(session, childObject);`
`178`	`178`
`179`		`- if (session.isIndexChildren()) {`
	`179`	`+ if (session.isRecursive()) {`
`180`	`180`	`return navigateChildrenReactive(session, childObject);`
`181`	`181`	`}`
`182`	`182`	`return Mono.empty();`