Add missing handling of array JsonNode

Author: fdechelle

src/main/java/org/idmef/IDMEFObject.java

@@ -58,29 +58,40 @@ public IDMEFObject()
         properties.putAll(map);
     }
 
-    private static void putFields(IDMEFObject idmefObject, JsonNode node) throws IDMEFException {
+    private static Object convertField(JsonNode value) throws IDMEFException {
+        if (value.isInt())
+            return value.asInt();
+        else if (value.isTextual())
+            return value.textValue();
+        else if (value.isObject())
+            return new IDMEFObject(value);
+        else if (value.isArray()) {
+            List<Object> l = new ArrayList<>();
+
+            for(int i = 0; i < value.size(); i++)
+                l.add(convertField(value.get(i)));
+
+            return l;
+        } else
+            throw new IDMEFException("Unhandled node type: " + value.getClass().getName());
+    }
+
+    private void putFields(JsonNode node) throws IDMEFException {
         Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
 
         while (fields.hasNext()) {
             Map.Entry<String, JsonNode> field = fields.next();
             String key = field.getKey();
             JsonNode value = field.getValue();
 
-            if (value.isInt())
-                idmefObject.put(key, value.asInt());
-            else if (value.isTextual())
-                idmefObject.put(key, value.textValue());
-            else if (value.isObject())
-                idmefObject.put(key, new IDMEFObject(value));
-            else
-                throw new IDMEFException("Unhandled node type: " + value.getClass().getName());
+            put(key, convertField(value));
         }
     }
 
     IDMEFObject(JsonNode node) throws IDMEFException {
         this();
 
-        putFields(this, node);
+        putFields(node);
     }
 
     @JsonAnyGetter

src/test/java/TestDeserialize.java

@@ -26,7 +26,7 @@ void testDeserializeMessage1() {
         System.err.println("Message: " + msg.getProperties().getClass().getName());
         System.err.println("Analyzer: " + msg.get("Analyzer").getClass().getName());
 
-        assertEquals(deserialize(Util.string1()), Util.message1());
+        assertEquals(msg, Util.message1());
     }
 
     @Test