Fixed collections, map type error.

Author: ParkJeongHwan

src/main/java/com/realtimetech/kson/KsonContext.java

@@ -4,6 +4,7 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -76,14 +77,14 @@ public Object serialize(KsonContext ksonContext, Date value) {
 			}
 
 			@Override
-			public Date deserialize(KsonContext ksonContext, Object value) {
+			public Date deserialize(KsonContext ksonContext, Class<?> fieldType, Object value) {
 				return new Date((Long) value);
 			}
 		});
 
-		this.registeredTransformers.put(List.class, new Transformer<ArrayList<?>>() {
+		this.registeredTransformers.put(Collection.class, new Transformer<Collection<?>>() {
 			@Override
-			public Object serialize(KsonContext ksonContext, ArrayList<?> value) {
+			public Object serialize(KsonContext ksonContext, Collection<?> value) {
 				KsonArray ksonArray = new KsonArray();
 
 				for (Object object : value) {
@@ -97,25 +98,32 @@ public Object serialize(KsonContext ksonContext, ArrayList<?> value) {
 				return ksonArray;
 			}
 
+			@SuppressWarnings("deprecation")
 			@Override
-			public ArrayList<?> deserialize(KsonContext ksonContext, Object value) {
-				ArrayList<Object> list = new ArrayList<Object>();
+			public Collection<?> deserialize(KsonContext ksonContext, Class<?> fieldType, Object value) {
+				Collection<Object> collections = null;
+
+				try {
+					collections = (Collection<Object>) fieldType.newInstance();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 
 				for (Object object : (KsonArray) value) {
 					try {
-						list.add(ksonContext.addToObjectStack(object.getClass(), object));
+						collections.add(ksonContext.addToObjectStack(object.getClass(), object));
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
 				}
 
-				return list;
+				return collections;
 			}
 		});
 
-		this.registeredTransformers.put(Map.class, new Transformer<HashMap<?, ?>>() {
+		this.registeredTransformers.put(Map.class, new Transformer<Map<?, ?>>() {
 			@Override
-			public Object serialize(KsonContext ksonContext, HashMap<?, ?> value) {
+			public Object serialize(KsonContext ksonContext, Map<?, ?> value) {
 				KsonObject ksonObject = new KsonObject();
 
 				for (Object keyObject : value.keySet()) {
@@ -133,22 +141,29 @@ public Object serialize(KsonContext ksonContext, HashMap<?, ?> value) {
 				return ksonObject;
 			}
 
+			@SuppressWarnings("deprecation")
 			@Override
-			public HashMap<?, ?> deserialize(KsonContext ksonContext, Object value) {
-				HashMap<Object, Object> hashMap = new HashMap<Object, Object>();
+			public Map<?, ?> deserialize(KsonContext ksonContext, Class<?> fieldType, Object value) {
+				Map<Object, Object> map = null;
+
+				try {
+					map = (Map<Object, Object>) fieldType.newInstance();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 
 				KsonObject ksonObject = (KsonObject) value;
 				for (Object keyObject : ksonObject.keySet()) {
 					Object valueObject = ksonObject.get(keyObject);
 
 					try {
-						hashMap.put(ksonContext.addToObjectStack(keyObject.getClass(), keyObject), ksonContext.addToObjectStack(valueObject.getClass(), valueObject));
+						map.put(ksonContext.addToObjectStack(keyObject.getClass(), keyObject), ksonContext.addToObjectStack(valueObject.getClass(), valueObject));
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
 				}
 
-				return hashMap;
+				return map;
 			}
 		});
 
@@ -270,6 +285,7 @@ public Object addToObjectStack(Class<?> clazz, Object object) throws Deserialize
 						try {
 							field.set(targetObject, createAtToObject(false, field.getType(), ksonValue.get(field.getName())));
 						} catch (IllegalArgumentException | IllegalAccessException e) {
+							e.printStackTrace();
 							throw new DeserializeException("Deserialize failed because can't access the field.");
 						}
 					}
@@ -324,8 +340,10 @@ private Object createAtToObject(boolean first, Class<?> type, Object originalVal
 			Transformer<Object> transformer = (Transformer<Object>) this.getTransformer(type);
 
 			if (transformer != null) {
+				Class<?> realType = type;
+
 				type = originalValue.getClass();
-				originalValue = transformer.deserialize(this, originalValue);
+				originalValue = transformer.deserialize(this, realType, originalValue);
 			}
 		}
 

src/main/java/com/realtimetech/kson/test/TestObject.java

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,6 +47,9 @@ public class TestObject {
 	private ArrayList<Date> dateArrayList;
 	private List<Date> dateList;
 
+	private LinkedList<Double> doubleLinkedList;
+	private List<Double> doubleList;
+
 	private HashMap<String, String> stringMap;
 	private HashMap<String, Date> dateMap;
 	private HashMap<HashMap<String, String>, HashMap<String, String>> mapMap;
@@ -233,6 +237,20 @@ public TestObject(Test test) {
 			this.dateMap.put("B", new Date());
 		}
 
+		this.doubleLinkedList = new LinkedList<Double>();
+		{
+			this.doubleLinkedList.add(0d);
+			this.doubleLinkedList.add(1d);
+			this.doubleLinkedList.add(2d);
+		}
+
+		this.doubleList = new LinkedList<Double>();
+		{
+			this.doubleList.add(0d);
+			this.doubleList.add(1d);
+			this.doubleList.add(2d);
+		}
+		
 		this.mapMap = new HashMap<HashMap<String, String>, HashMap<String, String>>();
 		{
 			{

src/main/java/com/realtimetech/kson/transform/Transformer.java

@@ -5,5 +5,5 @@
 public interface Transformer<T> {
 	public Object serialize(KsonContext ksonContext, T value);
 
-	public T deserialize(KsonContext ksonContext, Object value);
+	public T deserialize(KsonContext ksonContext, Class<?> object, Object value);
 }