ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

JSON object stream bug fixes

Browse source
This commit is contained in:
Ziver Koc 2015-11-12 15:16:00 +01:00
parent 0f94a575a3
commit 2a51090813
3 changed files with 51 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/zutil/parser/json/JSONObjectOutputStream.java Normal file → Executable file
View file

@ -76,6 +76,7 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
protected DataNode getDataNode(Object obj) throws IOException, IllegalArgumentException, IllegalAccessException {
if(obj == null)
return null;
Class objClass = obj.getClass();
DataNode root;
// Check if the object is a primitive
@ -83,6 +84,31 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
ClassUtil.isWrapper(obj.getClass())){
root = getPrimitiveDataNode(obj.getClass(), obj);
}
// Add an array
else if(objClass.isArray()){
root = new DataNode(DataNode.DataType.List);
for(int i=0; i< Array.getLength(obj) ;i++){
root.add(getDataNode(Array.get(obj, i)));
}
}
// List
else if(List.class.isAssignableFrom(objClass)){
root = new DataNode(DataNode.DataType.List);
List list = (List)obj;
for(Object item : list){
root.add(getDataNode(item));
}
}
// Map
else if(Map.class.isAssignableFrom(objClass)){
root = new DataNode(DataNode.DataType.Map);
Map map = (Map)obj;
for(Object key : map.keySet()){
root.set(
getDataNode(key).getString(),
getDataNode(map.get(key)));
}
}
// Object is a complex data type
else {
root = new DataNode(DataNode.DataType.Map);
@ -109,40 +135,8 @@ public class JSONObjectOutputStream extends OutputStream implements ObjectOutput
// has object a value?
if(ignoreNullFields && fieldObj == null)
continue;
// Add basic type (int, float...)
else if(ClassUtil.isPrimitive(field.getType()) ||
ClassUtil.isWrapper(field.getType())){
root.set(field.getName(), getPrimitiveDataNode(field.getType(), fieldObj));
}
// Add an array
else if(field.getType().isArray()){
DataNode arrayNode = new DataNode(DataNode.DataType.List);
for(int i=0; i< Array.getLength(fieldObj) ;i++){
arrayNode.add(getDataNode(Array.get(fieldObj, i)));
}
root.set(field.getName(), arrayNode);
}
else if(List.class.isAssignableFrom(field.getType())){
DataNode listNode = new DataNode(DataNode.DataType.List);
List list = (List)fieldObj;
for(Object item : list){
listNode.add(getDataNode(item));
}
root.set(field.getName(), listNode);
}
else if(Map.class.isAssignableFrom(field.getType())){
DataNode mapNode = new DataNode(DataNode.DataType.Map);
Map map = (Map)fieldObj;
for(Object key : map.keySet()){
mapNode.set(
getDataNode(key).getString(),
getDataNode(map.get(key)));
}
root.set(field.getName(), mapNode);
}
else{
else
root.set(field.getName(), getDataNode(fieldObj));
}
}
}
}