ludbo refractor; tests

luticateutils/src/main/java/com/luticate/utils/dbo/JSONContainer/LuAbstractJsonContainer.java

@@ -0,0 +1,20 @@
+package com.luticate.utils.dbo.JSONContainer;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Created by robin on 10/21/16.
+ */
+
+public interface LuAbstractJsonContainer {
+    int getInt(Object key) throws JSONException;
+    String getString(Object key) throws JSONException;
+    long getLong(Object key) throws JSONException;
+    double getDouble(Object key) throws JSONException;
+    boolean getBoolean(Object key) throws JSONException;
+    JSONObject getJSONObject(Object key) throws JSONException;
+    JSONArray getJSONArray(Object key) throws JSONException;
+    boolean isNull(Object key) throws JSONException;
+}

luticateutils/src/main/java/com/luticate/utils/dbo/JSONContainer/LuJSONArrayContainer.java

@@ -0,0 +1,58 @@
+package com.luticate.utils.dbo.JSONContainer;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Created by robin on 10/21/16.
+ */
+
+public class LuJSONArrayContainer implements LuAbstractJsonContainer {
+    protected JSONArray _jsonArray;
+
+    public LuJSONArrayContainer(JSONArray jsonArray)
+    {
+        _jsonArray = jsonArray;
+    }
+
+    @Override
+    public int getInt(Object key) throws JSONException {
+        return _jsonArray.getInt((int) key);
+    }
+
+    @Override
+    public String getString(Object key) throws JSONException {
+        return _jsonArray.getString((int) key);
+    }
+
+    @Override
+    public long getLong(Object key) throws JSONException {
+        return _jsonArray.getLong((int) key);
+    }
+
+    @Override
+    public double getDouble(Object key) throws JSONException {
+        return _jsonArray.getDouble((int) key);
+    }
+
+    @Override
+    public boolean getBoolean(Object key) throws JSONException {
+        return _jsonArray.getBoolean((int) key);
+    }
+
+    @Override
+    public JSONObject getJSONObject(Object key) throws JSONException {
+        return _jsonArray.getJSONObject((int) key);
+    }
+
+    @Override
+    public JSONArray getJSONArray(Object key) throws JSONException {
+        return _jsonArray.getJSONArray((int) key);
+    }
+
+    @Override
+    public boolean isNull(Object key) throws JSONException {
+        return _jsonArray.isNull((int) key);
+    }
+}

luticateutils/src/main/java/com/luticate/utils/dbo/JSONContainer/LuJSONObjectContainer.java

@@ -0,0 +1,59 @@
+package com.luticate.utils.dbo.JSONContainer;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Created by robin on 10/21/16.
+ */
+
+public class LuJSONObjectContainer implements LuAbstractJsonContainer {
+
+    protected JSONObject _jsonObject;
+
+    public LuJSONObjectContainer(JSONObject jsonObject)
+    {
+        _jsonObject = jsonObject;
+    }
+
+    @Override
+    public int getInt(Object key) throws JSONException {
+        return _jsonObject.getInt((String) key);
+    }
+
+    @Override
+    public String getString(Object key) throws JSONException {
+        return _jsonObject.getString((String) key);
+    }
+
+    @Override
+    public long getLong(Object key) throws JSONException {
+        return _jsonObject.getLong((String) key);
+    }
+
+    @Override
+    public double getDouble(Object key) throws JSONException {
+        return _jsonObject.getDouble((String) key);
+    }
+
+    @Override
+    public boolean getBoolean(Object key) throws JSONException {
+        return _jsonObject.getBoolean((String) key);
+    }
+
+    @Override
+    public JSONObject getJSONObject(Object key) throws JSONException {
+        return _jsonObject.getJSONObject((String) key);
+    }
+
+    @Override
+    public JSONArray getJSONArray(Object key) throws JSONException {
+        return _jsonObject.getJSONArray((String) key);
+    }
+
+    @Override
+    public boolean isNull(Object key) throws JSONException {
+        return _jsonObject.isNull((String) key);
+    }
+}

luticateutils/src/main/java/com/luticate/utils/dbo/LuDbo.java

@@ -1,19 +1,19 @@
 package com.luticate.utils.dbo;
 
+import com.luticate.utils.dbo.JSONContainer.LuAbstractJsonContainer;
+import com.luticate.utils.dbo.JSONContainer.LuJSONArrayContainer;
+import com.luticate.utils.dbo.JSONContainer.LuJSONObjectContainer;
+
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
-import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Vector;
 
 /**
@@ -43,47 +43,7 @@ public abstract class LuDbo {
         return fieldName;
     }
 
-    public Object getObjectFromJson(Class clazz, JSONObject json, String key) throws Exception {
-        if (json.isNull(key)) {
-            return null;
-        }
-
-        if (clazz == Byte.class || clazz == byte.class) {
-            return (byte) json.getInt(key);
-        }
-        if (clazz == Character.class || clazz == char.class) {
-            return json.getString(key).charAt(0);
-        }
-        if (clazz == Short.class || clazz == short.class) {
-            return (short) json.getInt(key);
-        }
-        if (clazz == Integer.class || clazz == int.class) {
-            return json.getInt(key);
-        }
-        if (clazz == Long.class || clazz == long.class) {
-            return json.getLong(key);
-        }
-        if (clazz == Float.class || clazz == float.class) {
-            return (float) json.getDouble(key);
-        }
-        if (clazz == Double.class || clazz == double.class) {
-            return json.getDouble(key);
-        }
-        if (clazz == Boolean.class || clazz == boolean.class) {
-            return json.getBoolean(key);
-        }
-        if (clazz == String.class) {
-            return json.getString(key);
-        }
-        if (LuDbo.class.isAssignableFrom(clazz)) {
-            LuDbo dbo = (LuDbo) getInstance(clazz);
-            dbo.fromJson(json.getJSONObject(key));
-            return dbo;
-        }
-        return null;
-    }
-
-    public Object getObjectFromJson(Class clazz, JSONArray json, int key) throws Exception {
+    public Object getObjectFromJson(Class clazz, LuAbstractJsonContainer json, Object key) throws Exception {
         if (json.isNull(key)) {
             return null;
         }
@@ -145,7 +105,7 @@ public abstract class LuDbo {
             List list = new Vector();
 
             for (Object item : objList) {
-                list.add(getJsonFromObject(item == null ? null : item.getClass(), item));
+                list.add(getJsonFromObject(getClazz(item), item));
             }
 
             return list;
@@ -157,7 +117,7 @@ public abstract class LuDbo {
             for (Object k : objMap.keySet()) {
                 if (k.getClass() == String.class) {
                     Object item = objMap.get(k);
-                    map.put(k, getJsonFromObject(item == null ? null : item.getClass(), item));
+                    map.put(k, getJsonFromObject(getClazz(item), item));
                 }
             }
 
@@ -186,6 +146,11 @@ public abstract class LuDbo {
         return clazz.newInstance();
     }
 
+    public Class getClazz(Object obj)
+    {
+        return obj == null ? null : obj.getClass();
+    }
+
     public void fromJson(JSONObject json) throws Exception
     {
         for (Field field : getClass().getDeclaredFields()) {
@@ -193,13 +158,14 @@ public abstract class LuDbo {
             Class clazz = field.getType();
             if (json.has(key)) {
                 Object value = null;
+
                 if (List.class.isAssignableFrom(clazz)) {
                     ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
                     Class type = (Class) parameterizedType.getActualTypeArguments()[0];
                     List<Object> list = (List<Object>) getInstance(clazz);
                     JSONArray jsonArray = json.getJSONArray(key);
                     for (int i = 0; i < jsonArray.length(); ++i) {
-                        list.add(getObjectFromJson(type, jsonArray, i));
+                        list.add(getObjectFromJson(type, new LuJSONArrayContainer(jsonArray), i));
                     }
                     value = list;
                 }
@@ -208,7 +174,7 @@ public abstract class LuDbo {
                     JSONArray jsonArray = json.getJSONArray(key);
                     Object array = Array.newInstance(type, jsonArray.length());
                     for (int i = 0; i < jsonArray.length(); ++i) {
-                        Array.set(array, i, getObjectFromJson(type, jsonArray, i));
+                        Array.set(array, i, getObjectFromJson(type, new LuJSONArrayContainer(jsonArray), i));
                     }
                     value = array;
                 }
@@ -222,13 +188,13 @@ public abstract class LuDbo {
                         Iterator<String> it = obj.keys();
                         while (it.hasNext()) {
                             String k = it.next();
-                            map.put(k, getObjectFromJson(type, obj, k));
+                            map.put(k, getObjectFromJson(type, new LuJSONObjectContainer(obj), k));
                         }
                         value = map;
                     }
                 }
                 else {
-                    value = getObjectFromJson(clazz, json, key);
+                    value = getObjectFromJson(clazz, new LuJSONObjectContainer(json), key);
                 }
                 field.setAccessible(true);
                 field.set(this, value);