Skip to content

#332 JSON deserialisation of special collections #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#332 JSON deserialisation of special collections #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/org/nustaq/serialization/serializers/FSTCollectionSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ public Object instantiate(Class objectClass, FSTObjectInput in, FSTClazzInfo ser
if ( objectClass == LinkedList.class ) {
res = new LinkedList();
} else {
if ( AbstractList.class.isAssignableFrom(objectClass) && objectClass.getName().startsWith( "java.util.Arrays" ) ) {
// some collections produced by JDK are not properly instantiable (e.g. Arrays.ArrayList), fall back to arraylist then
res = new ArrayList<>();
} else {
res = objectClass.newInstance();
}
// some collections produced by JDK are not properly instantiable (e.g. Arrays.ArrayList), fall back to 'normal' version of collection then
String className = objectClass.getClazz().getName();
boolean specialCollection = className.startsWith("java.util.Collections$") || className.startsWith("java.util.Arrays$");
Class deserializeAs = specialCollection ? (
List.class.isAssignableFrom(objectClass) ? ArrayList.class :
Set.class.isAssignableFrom(objectClass) ? LinkedHashSet.class : // preserve the order; we don't know if the class we passed did that
Map.class.isAssignableFrom(objectClass) ? LinkedHashMap.class :
objectClass
) : objectClass;
res = objectClass.newInstance();
}
in.registerObject(res, streamPosition,serializationInfo, referencee);
Collection col = (Collection)res;
Expand Down