Refactor JSON handling and update Lombok config

Replaces use of Iterator with properties() for JsonNode traversal in DumAemCommonsUtils, improving code clarity. Updates ObjectMapper configuration to use setDefaultPropertyInclusion for JSON export. Adds Lombok annotation processor to Maven compiler plugin configuration for better annotation processing support.

Author: alegauss

aem-commons/src/main/java/com/viglet/dumont/connector/aem/commons/DumAemCommonsUtils.java

@@ -33,7 +33,6 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -81,7 +80,7 @@
 public class DumAemCommonsUtils {
 
     private static final Cache<String, Optional<String>> responseBodyCache = Caffeine.newBuilder().maximumSize(1000)
-            .expireAfterWrite(Duration.ofMinutes(5)).build();
+            .expireAfterWrite(Objects.requireNonNull(Duration.ofMinutes(5))).build();
 
     private DumAemCommonsUtils() {
         throw new IllegalStateException("Utility class");
@@ -108,11 +107,9 @@ private static Set<String> getContentValues(JsonNode node) {
 
     private static void extractContentValues(JsonNode node, Set<String> results) {
         if (node.isObject()) {
-            Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-            while (fields.hasNext()) {
-                Map.Entry<String, JsonNode> entry = fields.next();
-                extractContentValues(entry.getValue(), results);
-            }
+            node.properties().forEach(property -> {
+                extractContentValues(property.getValue(), results);
+            });
         } else if (node.isArray()) {
             for (JsonNode item : node) {
                 extractContentValues(item, results);
@@ -336,10 +333,10 @@ public static <T> Optional<T> getResponseBody(String url,
         }
     }
 
-    public static @NotNull Optional<String> fetchResponseBodyWithoutCache(String url,
+    public static @NotNull Optional<String> fetchResponseBodyWithoutCache(@NotNull String url,
             DumAemConfiguration dumAemSourceContext) throws IOException {
-        String escapedUrl = UrlEscapers.urlFragmentEscaper().escape(url);
-        URI normalizedUri = URI.create(Objects.requireNonNull(escapedUrl, "URL cannot be null")).normalize();
+        String escapedUrl = Objects.requireNonNull(UrlEscapers.urlFragmentEscaper().escape(url));
+        URI normalizedUri = URI.create(escapedUrl).normalize();
 
         try (CloseableHttpClient httpClient = createHttpClient(dumAemSourceContext)) {
             HttpGet request = new HttpGet(normalizedUri);

aem/aem-plugin/src/main/java/com/viglet/dumont/connector/plugin/aem/export/DumAemExchangeProcess.java

@@ -127,7 +127,7 @@ public StreamingResponseBody exportObject(HttpServletResponse response) {
                 log.error(e.getMessage(), e);
             }
             // Object to JSON in file
-            ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
+            ObjectMapper mapper = new ObjectMapper().setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
             try {
                 mapper.writerWithDefaultPrettyPrinter().writeValue(exportFile,
                         new DumAemExchange(dumAemSources.stream()

pom.xml

@@ -145,7 +145,15 @@
                             <arg>-Xlint:unchecked</arg>
                             <arg>-Xlint:deprecation</arg>
                         </compilerArgs>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>org.projectlombok</groupId>
+                                <artifactId>lombok</artifactId>
+                                <version>1.18.42</version>
+                            </path>
+                        </annotationProcessorPaths>
                     </configuration>
+
                 </plugin>
             </plugins>
         </pluginManagement>