Rename base class

Author: fdechelle

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

@@ -8,7 +8,7 @@
  * Current implementation does not check property keys in put method. Property keys and values are checked
  * when calling validate() method.
  */
-public class Analyzer extends BaseObject {
+public class Analyzer extends IDMEFObject {
 
     /**
      * Constructs an empty Analyzer.

src/main/java/org/idmef/BaseObject.java renamed to src/main/java/org/idmef/IDMEFObject.java

@@ -5,16 +5,18 @@
 import java.util.HashMap;
 import java.util.List;
 
-class BaseObject extends HashMap<String, Object> {
+class IDMEFObject extends HashMap<String, Object> {
 
     /**
-     * Set a property of the Message.
+     * Set a property of the Message. If value is an array, transform it to a List.
+     *
      * @param key the property key
      * @param value the property value
      * @return the value that was set
      */
     public Object put(String key, Object value) {
         Object adaptedValue = value;
+
         if (value.getClass().isArray()) {
             List<Object> l = new ArrayList<>();
 

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

@@ -17,7 +17,7 @@
  * Current implementation does not check property keys in put method. Property keys and values are checked
  * when calling validate() method.
  */
-public class Message extends BaseObject {
+public class Message extends IDMEFObject {
     private static final String SCHEMA_RESOURCE_PATH = "/IDMEFv2.schema";
 
     /**
@@ -79,6 +79,11 @@ public byte[] serialize() throws IDMEFException, IOException {
     public static Map<String, Object> unserialize(byte[] json) throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
 
-        return objectMapper.readValue(json, new TypeReference<Map<String,Object>>(){});
+        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;
     }
 }