Add serialization and unserialization tests; unserialize does not unserialize to the right type yet

Author: fdechelle

build.gradle

@@ -14,6 +14,7 @@ repositories {
 
 dependencies {
     implementation 'net.jimblackler.jsonschemafriend:core:0.11.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }

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

@@ -1,8 +1,12 @@
 package org.idmef;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import net.jimblackler.jsonschemafriend.*;
 
+import java.io.IOException;
 import java.net.URL;
+import java.util.Map;
 
 /**
  * IDMEF Message implementation.
@@ -58,19 +62,23 @@ public void validate() throws IDMEFException {
      * @return the JSON bytes
      * @throws IDMEFException if the Message is not valid
      */
-    public byte[] serialize() throws IDMEFException {
+    public byte[] serialize() throws IDMEFException, IOException {
         validate();
 
-        return null;
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        return objectMapper.writeValueAsBytes(this);
     }
 
     /**
      * Deserialize JSON bytes to a Message
      *
-     * @param b the JSON bytes
+     * @param json the JSON bytes
      * @return a Message object with content filled from JSON
      */
-    public static Message unserialize(byte[] b) {
-        return null;
+    public static Map<String, Object> unserialize(byte[] json) throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        return objectMapper.readValue(json, new TypeReference<Map<String,Object>>(){});
     }
 }

src/test/java/TestSerialize.java

@@ -0,0 +1,18 @@
+import org.idmef.Message;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestSerialize {
+
+    @Test
+    void testSerializeMessage1() {
+        Message m = Util.message1();
+
+        try {
+            byte[] b = m.serialize();
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+}

src/test/java/TestUnserialize.java

@@ -0,0 +1,20 @@
+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 {
+
+    @Test
+    void testUnserializeMessage1() {
+        String s = Util.string1();
+
+        try {
+            Map<String, Object> m = Message.unserialize(s.getBytes());
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+}

src/test/java/TestValidate.java

@@ -1,5 +1,3 @@
-import org.idmef.Analyzer;
-import org.idmef.IDMEFException;
 import org.idmef.Message;
 import org.junit.jupiter.api.Test;
 
@@ -9,23 +7,13 @@ public class TestValidate {
 
     @Test
     void testValidateMessage1() {
-        Message msg = new Message();
-        msg.put("Version", "2.0.3");
-        msg.put("ID", "afe884a3-d658-4a15-bd08-34abba526aca");
-        msg.put("CreateTime", "2021-10-28T11:32:19.359177");
-        Analyzer analyzer = new Analyzer();
-        analyzer.put("IP", "127.0.0.1");
-        analyzer.put("Name", "foobar");
-        analyzer.put("Model", "generic");
-        analyzer.put("Category", new String[]{"LOG"});
-        analyzer.put("Data", new String[]{"Log"});
-        analyzer.put("Method", new String[]{"Monitor"});
-        msg.put("Analyzer", analyzer);
+        Message m = Util.message1();
 
         try {
-            msg.validate();
-        } catch (IDMEFException e) {
+            m.validate();
+        } catch (Exception e) {
             fail(e.getMessage());
         }
     }
+
 }

src/test/java/Util.java

@@ -0,0 +1,38 @@
+import org.idmef.Analyzer;
+import org.idmef.Message;
+
+public class Util {
+
+    static Message message1() {
+        Message msg = new Message();
+        msg.put("Version", "2.0.3");
+        msg.put("ID", "afe884a3-d658-4a15-bd08-34abba526aca");
+        msg.put("CreateTime", "2021-10-28T11:32:19.359177");
+        Analyzer analyzer = new Analyzer();
+        analyzer.put("IP", "127.0.0.1");
+        analyzer.put("Name", "foobar");
+        analyzer.put("Model", "generic");
+        analyzer.put("Category", new String[]{"LOG"});
+        analyzer.put("Data", new String[]{"Log"});
+        analyzer.put("Method", new String[]{"Monitor"});
+        msg.put("Analyzer", analyzer);
+
+        return msg;
+    }
+
+    static String string1() {
+        return "{\n" +
+                "\"Version\":\"2.0.3\",\n" +
+                "\"CreateTime\":\"2021-10-28T11:32:19.359177\",\n" +
+                "\"ID\":\"afe884a3-d658-4a15-bd08-34abba526aca\",\n" +
+                "\"Analyzer\":{\n" +
+                    "\"Category\":[\"LOG\"],\n" +
+                    "\"IP\":\"127.0.0.1\",\n" +
+                    "\"Model\":\"generic\",\n" +
+                    "\"Data\":[\"Log\"],\n" +
+                    "\"Method\":[\"Monitor\"],\n" +
+                    "\"Name\":\"foobar\"\n" +
+                    "}\n" +
+                "}\n";
+    }
+}