Added support for custom implementations of Collections and Maps

Author: JanHolger

src/main/java/org/javawebstack/abstractdata/mapper/DefaultMappers.java

@@ -9,7 +9,6 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.sql.Time;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -28,7 +27,7 @@ public final class DefaultMappers {
     public static final FallbackMapper FALLBACK = new FallbackMapper();
 
     public static Map<Class<?>, MapperTypeAdapter> create() {
-        Map<Class<?>, MapperTypeAdapter> map = new HashMap<>();
+        Map<Class<?>, MapperTypeAdapter> map = new LinkedHashMap<>();
 
         for (MapperTypeAdapter adapter : new MapperTypeAdapter[]{
                 ABSTRACT,
@@ -136,7 +135,7 @@ public AbstractElement toAbstract(MapperContext context, Object value) throws Ma
         }
 
         public Object fromAbstract(MapperContext context, AbstractElement element, Class<?> type) throws MapperException {
-            if (type.equals(List.class) || type.equals(AbstractList.class))
+            if (type.equals(List.class) || type.equals(Collection.class) || type.equals(AbstractList.class))
                 type = ArrayList.class;
             if (type.equals(Set.class))
                 type = HashSet.class;
@@ -163,6 +162,7 @@ public Object fromAbstract(MapperContext context, AbstractElement element, Class
 
         public Class<?>[] getSupportedTypes() {
             return new Class[]{
+                    Collection.class,
                     List.class,
                     ArrayList.class,
                     CopyOnWriteArrayList.class,

src/main/java/org/javawebstack/abstractdata/mapper/Mapper.java

@@ -41,7 +41,19 @@ public <T> T map(MapperContext context, AbstractElement element, Class<T> type)
         }
         if(context.getAdapter() != null)
             return (T) context.getAdapter().fromAbstract(context, element, type);
-        return (T) adapters.getOrDefault(type, DefaultMappers.FALLBACK).fromAbstract(context, element, type);
+        return (T) findAdapter(type).fromAbstract(context, element, type);
+    }
+
+    private MapperTypeAdapter findAdapter(Class<?> type) {
+        MapperTypeAdapter adapter = adapters.get(type);
+        if(adapter != null)
+            return adapter;
+        for(Class<?> t : adapters.keySet()) {
+            if(t.isAssignableFrom(type)) {
+                return adapters.get(t);
+            }
+        }
+        return DefaultMappers.FALLBACK;
     }
 
     public AbstractElement map(Object obj) throws MapperException {
@@ -59,7 +71,7 @@ public AbstractElement map(MapperContext context, Object obj) throws MapperExcep
         }
         if(context.getAdapter() != null)
             return context.getAdapter().toAbstract(context, obj);
-        return adapters.getOrDefault(obj.getClass(), DefaultMappers.FALLBACK).toAbstract(context, obj);
+        return findAdapter(obj.getClass()).toAbstract(context, obj);
     }
 
     public Mapper strict() {