Add objects contruction from Map for unserialization; not yet fully functional

Author: fdechelle

src/main/java/org/idmef/Analyzer.java

@@ -1,5 +1,7 @@
 package org.idmef;
 
+import java.util.Map;
+
 /**
  * IDMEF Analyzer object.
  *
@@ -16,4 +18,12 @@ public class Analyzer extends IDMEFObject {
     public Analyzer() {
     }
 
+    /**
+     * Construct an Analyzer from a map.
+     *
+     * @param map the map
+     */
+    public Analyzer(Map<String, Object> map) {
+        super(map);
+    }
 }

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

@@ -4,9 +4,26 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 class IDMEFObject extends HashMap<String, Object> {
 
+    /**
+     * Construct an empty IDMEFObject.
+     *
+     */
+    IDMEFObject() {
+    }
+
+    /**
+     * Construct an IDMEFObject from a map.
+     *
+     * @param map the map
+     */
+    IDMEFObject(Map<String, Object> map) {
+        putAll(map);
+    }
+
     /**
      * Set a property of the Message. If value is an array, transform it to a List.
      *

src/main/java/org/idmef/Message.java

@@ -26,6 +26,15 @@ public class Message extends IDMEFObject {
     public Message() {
     }
 
+    /**
+     * Construct a Message from a map.
+     *
+     * @param map the map
+     */
+    public Message(Map<String, Object> map) {
+        super(map);
+    }
+
     /**
      * Validate the Message content w.r.t. current IDMEF JSON schema.
      *
@@ -76,14 +85,11 @@ public byte[] serialize() throws IDMEFException, IOException {
      * @param json the JSON bytes
      * @return a Message object with content filled from JSON
      */
-    public static Map<String, Object> unserialize(byte[] json) throws IOException {
+    public static Message unserialize(byte[] json) throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
 
         Map<String, Object> map = objectMapper.readValue(json, new TypeReference<Map<String,Object>>(){});
 
-        for (Map.Entry<String,Object> entry : map.entrySet()) {
-            System.out.println("Item: " + entry.getKey() + ", Price: " + entry.getValue());
-        }
-        return map;
+        return new Message(map);
     }
 }

src/test/java/TestUnserialize.java

@@ -1,8 +1,6 @@
 import org.idmef.Message;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
-
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestUnserialize {
@@ -12,7 +10,7 @@ void testUnserializeMessage1() {
         String s = Util.string1();
 
         try {
-            Map<String, Object> m = Message.unserialize(s.getBytes());
+            Message m = Message.unserialize(s.getBytes());
         } catch (Exception e) {
             fail(e.getMessage());
         }