handle empty array

wcm-io-devops · Jan 10, 2024 · c645502 · c645502
1 parent 85eb82c
commit c645502
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/JsonOsgiConfigUtil.java b/...sling-plugin/src/main/java/io/wcm/devops/conga/plugins/sling/util/JsonOsgiConfigUtil.java
@@ -101,13 +101,18 @@ else if (value instanceof Map) {
   private static Class<?> detectArrayType(Collection<?> list) {
     Class<?> type = null;
     for (Object item : list) {
-      if (type == null) {
-        type = item.getClass();
-      }
-      else if (type != item.getClass()) {
-        type = Object.class;
+      if (item != null) {
+        if (type == null) {
+          type = item.getClass();
+        }
+        else if (type != item.getClass()) {
+          type = Object.class;
+        }
       }
     }
+    if (type == null) {
+      type = Object.class;
+    }
     return type;
   }
 

diff --git a/...g-plugin/src/test/java/io/wcm/devops/conga/plugins/sling/util/JsonOsgiConfigUtilTest.java b/...g-plugin/src/test/java/io/wcm/devops/conga/plugins/sling/util/JsonOsgiConfigUtilTest.java
@@ -42,6 +42,7 @@ void testListToArrayConversion() throws IOException {
     assertArrayEquals(new Integer[] { 1, 2, 3 }, (Integer[])content.get("intArray"));
     assertArrayEquals(new Boolean[] { true, false }, (Boolean[])content.get("boolArray"));
     assertArrayEquals(new Object[] { "v1", 1, true }, (Object[])content.get("mixedArray"));
+    assertArrayEquals(new Object[0], (Object[])content.get("emptyArray"));
     assertArrayEquals(new String[] { "v1" }, (String[])((Map)content.get("nested")).get("stringArray"));
   }
 

diff --git a/conga-sling-plugin/src/test/resources/arrayTypes.json b/conga-sling-plugin/src/test/resources/arrayTypes.json
@@ -3,6 +3,7 @@
   "intArray": [1,2,3],
   "boolArray": [true,false],
   "mixedArray": ["v1",1,true],
+  "emptyArray": [],
   "nested": {
     "stringArray": ["v1"]
   }