This commit is contained in:
@@ -213,7 +213,7 @@ public interface Creator<T> {
|
|||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static <T> Creator<T> create(Class<T> clazz) {
|
public static <T> Creator<T> create(Class<T> clazz) {
|
||||||
if (Collection.class.isAssignableFrom(clazz) && (clazz.isAssignableFrom(ArrayList.class) || clazz.getName().startsWith("java.util.Collections") || clazz.getName().startsWith("java.util.ImmutableCollections") || clazz.getName().startsWith("java.util.Arrays"))) {
|
if (List.class.isAssignableFrom(clazz) && (clazz.isAssignableFrom(ArrayList.class) || clazz.getName().startsWith("java.util.Collections") || clazz.getName().startsWith("java.util.ImmutableCollections") || clazz.getName().startsWith("java.util.Arrays"))) {
|
||||||
clazz = (Class<T>) ArrayList.class;
|
clazz = (Class<T>) ArrayList.class;
|
||||||
} else if (Map.class.isAssignableFrom(clazz) && (clazz.isAssignableFrom(HashMap.class) || clazz.getName().startsWith("java.util.Collections") || clazz.getName().startsWith("java.util.ImmutableCollections"))) {
|
} else if (Map.class.isAssignableFrom(clazz) && (clazz.isAssignableFrom(HashMap.class) || clazz.getName().startsWith("java.util.Collections") || clazz.getName().startsWith("java.util.ImmutableCollections"))) {
|
||||||
clazz = (Class<T>) HashMap.class;
|
clazz = (Class<T>) HashMap.class;
|
||||||
@@ -221,6 +221,8 @@ public interface Creator<T> {
|
|||||||
clazz = (Class<T>) HashSet.class;
|
clazz = (Class<T>) HashSet.class;
|
||||||
} else if (Map.class.isAssignableFrom(clazz) && clazz.isAssignableFrom(ConcurrentHashMap.class)) {
|
} else if (Map.class.isAssignableFrom(clazz) && clazz.isAssignableFrom(ConcurrentHashMap.class)) {
|
||||||
clazz = (Class<T>) ConcurrentHashMap.class;
|
clazz = (Class<T>) ConcurrentHashMap.class;
|
||||||
|
} else if (Collection.class.isAssignableFrom(clazz) && clazz.isAssignableFrom(ArrayList.class)) {
|
||||||
|
clazz = (Class<T>) ArrayList.class;
|
||||||
}
|
}
|
||||||
Creator creator = CreatorInner.creatorCacheMap.get(clazz);
|
Creator creator = CreatorInner.creatorCacheMap.get(clazz);
|
||||||
if (creator != null) return creator;
|
if (creator != null) return creator;
|
||||||
|
|||||||
Reference in New Issue
Block a user