Ability to set custom map/collection type on non parameterized types

Author: hevav

src/main/java/net/elytrium/serializer/language/reader/AbstractReader.java

@@ -214,9 +214,9 @@ public Object readByType(@Nullable Field owner, @Nullable Object holder, Type ty
         }
       } else if (type instanceof Class<?> clazz) {
         if (Map.class.isAssignableFrom(clazz)) {
-          return this.readMap(owner);
-        } else if (List.class.isAssignableFrom(clazz)) {
-          return this.readList(owner);
+          return this.readMapByType(owner, type);
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+          return this.readCollectionByType(owner, type, clazz);
         } else if (String.class.isAssignableFrom(clazz)) {
           return this.readString(owner);
         } else if (Character.class.isAssignableFrom(clazz) || char.class.isAssignableFrom(clazz)) {
@@ -257,8 +257,8 @@ public Object readByType(@Nullable Field owner, @Nullable Object holder, Type ty
   }
 
   @SuppressFBWarnings("NP_LOAD_OF_KNOWN_NULL_VALUE")
-  private Collection<Object> readCollectionByType(Field owner, ParameterizedType parameterizedType, Class<?> clazz) {
-    Type collectionEntryType = GenericUtils.getParameterType(Collection.class, parameterizedType, 0);
+  private Collection<Object> readCollectionByType(Field owner, Type type, Class<?> clazz) {
+    Type collectionEntryType = GenericUtils.getParameterType(Collection.class, type, 0);
     if (owner != null) {
       CollectionType collectionType = owner.getAnnotation(CollectionType.class);
       if (collectionType != null) {
@@ -270,7 +270,7 @@ private Collection<Object> readCollectionByType(Field owner, ParameterizedType p
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
           throw new SerializableReadException(e);
         }
-      } else {
+      } else if (Collection.class.isAssignableFrom(owner.getType())) {
         try {
           //noinspection unchecked
           return this.readCollection(owner,
@@ -293,9 +293,9 @@ private Collection<Object> readCollectionByType(Field owner, ParameterizedType p
   }
 
   @SuppressFBWarnings("NP_LOAD_OF_KNOWN_NULL_VALUE")
-  private Map<Object, Object> readMapByType(Field owner, ParameterizedType parameterizedType) {
-    Type mapKeyType = GenericUtils.getParameterType(Map.class, parameterizedType, 0);
-    Type mapValueType = GenericUtils.getParameterType(Map.class, parameterizedType, 1);
+  private Map<Object, Object> readMapByType(Field owner, Type type) {
+    Type mapKeyType = GenericUtils.getParameterType(Map.class, type, 0);
+    Type mapValueType = GenericUtils.getParameterType(Map.class, type, 1);
     if (owner != null) {
       MapType mapType = owner.getAnnotation(MapType.class);
       if (mapType != null) {
@@ -306,7 +306,7 @@ private Map<Object, Object> readMapByType(Field owner, ParameterizedType paramet
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
           throw new SerializableReadException(e);
         }
-      } else {
+      } else if (Map.class.isAssignableFrom(owner.getType())) {
         try {
           //noinspection unchecked
           return this.readMap(owner,

src/main/java/net/elytrium/serializer/utils/GenericUtils.java

@@ -34,7 +34,7 @@ public static int getParameterIndex(TypeVariable<?>[] variables, TypeVariable<?>
   }
 
   public static Type getParameterTypeFromSuperclass(Class<?> parent, Type type, Type superclass, int searchIndex) {
-    Type superclassType = GenericUtils.getParameterType(parent, superclass, searchIndex);
+    Type superclassType = GenericUtils.getParameterType0(parent, superclass, searchIndex);
     if (superclassType instanceof TypeVariable<?> typeVariable && type instanceof ParameterizedType parameterizedType) {
       Class<?> rawSuperclass = (Class<?>) parameterizedType.getRawType();
       int index = GenericUtils.getParameterIndex(rawSuperclass.getTypeParameters(), typeVariable);
@@ -46,7 +46,7 @@ public static Type getParameterTypeFromSuperclass(Class<?> parent, Type type, Ty
     return superclassType;
   }
 
-  public static Type getParameterType(Class<?> parent, Type type, int index) {
+  private static Type getParameterType0(Class<?> parent, Type type, int index) {
     if (type == null) {
       return null;
     }
@@ -81,4 +81,9 @@ public static Type getParameterType(Class<?> parent, Type type, int index) {
 
     return null;
   }
+
+  public static Type getParameterType(Class<?> parent, Type type, int index) {
+    Type parameterType = GenericUtils.getParameterType0(parent, type, index);
+    return parameterType == null ? Object.class : parameterType;
+  }
 }