Use HashMap in favor of LinkedHashMap

Author: MinnDevelopment

src/main/java/net/dv8tion/jda/api/utils/data/DataArray.java

@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import net.dv8tion.jda.api.exceptions.ParsingException;
 import org.jetbrains.annotations.Contract;
@@ -44,8 +45,19 @@
 public class DataArray implements Iterable<Object>
 {
     private static final Logger log = LoggerFactory.getLogger(DataObject.class);
-    private static final ObjectMapper mapper = new ObjectMapper();
-    private static final CollectionType listType = mapper.getTypeFactory().constructCollectionType(List.class, Object.class);
+    private static final ObjectMapper mapper;
+    private static final SimpleModule module;
+    private static final CollectionType listType;
+
+    static
+    {
+        mapper = new ObjectMapper();
+        module = new SimpleModule();
+        module.addAbstractTypeMapping(Map.class, HashMap.class);
+        module.addAbstractTypeMapping(List.class, ArrayList.class);
+        mapper.registerModule(module);
+        listType = mapper.getTypeFactory().constructRawCollectionType(ArrayList.class);
+    }
 
     protected final List<Object> data;
 

src/main/java/net/dv8tion/jda/api/utils/data/DataObject.java

@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.type.MapType;
 import net.dv8tion.jda.api.exceptions.ParsingException;
 import org.jetbrains.annotations.Contract;
@@ -44,8 +45,19 @@
 public class DataObject implements SerializableData
 {
     private static final Logger log = LoggerFactory.getLogger(DataObject.class);
-    private static final ObjectMapper mapper = new ObjectMapper();
-    private static final MapType mapType = mapper.getTypeFactory().constructMapType(Map.class, String.class, Object.class);
+    private static final ObjectMapper mapper;
+    private static final SimpleModule module;
+    private static final MapType mapType;
+
+    static
+    {
+        mapper = new ObjectMapper();
+        module = new SimpleModule();
+        module.addAbstractTypeMapping(Map.class, HashMap.class);
+        module.addAbstractTypeMapping(List.class, ArrayList.class);
+        mapper.registerModule(module);
+        mapType = mapper.getTypeFactory().constructRawMapType(HashMap.class);
+    }
 
     protected final Map<String, Object> data;
 

src/test/java/JsonTest.java

@@ -36,6 +36,8 @@ public void testParse()
     public void testJsonToString()
     {
         DataObject object = DataObject.fromJson(json);
-        Assertions.assertEquals(json, object.toString()); // lucky that this works here :)
+        String result = object.toString();
+        DataObject symmetric = DataObject.fromJson(result);
+        Assertions.assertEquals(object.toMap(), symmetric.toMap()); // lucky that this works here :)
     }
 }