GithubStar/fastjson
1
0
Fork 0
mirror of https://github.com/alibaba/fastjson.git synced 2026-10-17 05:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fixed for Set[]

Browse Source
This commit is contained in:
高铁
2021-10-12 18:42:15 +08:00
parent 93d8c01e90
commit 869746101f
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/fastjson/serializer/CollectionCodec.java
+7 -1
View File
@@ -120,7 +120,13 @@ public class CollectionCodec implements ObjectSerializer, ObjectDeserializer {
return (T) array;
}
Collection list = TypeUtils.createCollection(type);
Collection list;
if (parser.lexer.token() == JSONToken.SET) {
parser.lexer.nextToken();
list = TypeUtils.createSet(type);
} else {
list = TypeUtils.createCollection(type);
}
Type itemType = TypeUtils.getCollectionItemType(type);
parser.parseArray(itemType, list, fieldName);
src/main/java/com/alibaba/fastjson/util/TypeUtils.java
+30
View File
@@ -2702,6 +2702,36 @@ public class TypeUtils {
return clz;
}
public static Set createSet(Type type) {
Class<?> rawClass = getRawClass(type);
Set set;
if (rawClass == AbstractCollection.class //
|| rawClass == Collection.class) {
set = new HashSet();
} else if (rawClass.isAssignableFrom(HashSet.class)) {
set = new HashSet();
} else if (rawClass.isAssignableFrom(LinkedHashSet.class)) {
set = new LinkedHashSet();
} else if (rawClass.isAssignableFrom(TreeSet.class)) {
set = new TreeSet();
} else if (rawClass.isAssignableFrom(EnumSet.class)) {
Type itemType;
if (type instanceof ParameterizedType) {
itemType = ((ParameterizedType) type).getActualTypeArguments()[0];
} else {
itemType = Object.class;
}
set = EnumSet.noneOf((Class<Enum>) itemType);
} else {
try {
set = (Set) rawClass.newInstance();
} catch (Exception e) {
throw new JSONException("create instance error, class " + rawClass.getName());
}
}
return set;
}
@SuppressWarnings({"rawtypes", "unchecked"})
public static Collection createCollection(Type type) {
Class<?> rawClass = getRawClass(type);