ludbo tojson; tests

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

@@ -123,6 +123,59 @@ public abstract class LuDbo {
         return null;
     }
 
+    public Object getJsonFromObject(Class clazz, Object obj)
+    {
+        if (obj == null) {
+            return null;
+        }
+        if (clazz == char.class || clazz == Character.class) {
+            return obj.toString();
+        }
+        if (clazz.isPrimitive() || clazz == Byte.class || clazz == Character.class
+                || clazz == Short.class || clazz == Integer.class || clazz == Long.class
+                || clazz == Float.class || clazz == Double.class || clazz == Boolean.class
+                || clazz == String.class) {
+            return obj;
+        }
+        if (LuDbo.class.isAssignableFrom(clazz)) {
+            return ((LuDbo)obj).toArray();
+        }
+        if (List.class.isAssignableFrom(clazz)) {
+            List objList = (List) obj;
+            List list = new Vector();
+
+            for (Object item : objList) {
+                list.add(getJsonFromObject(item == null ? null : item.getClass(), item));
+            }
+
+            return list;
+        }
+        if (AbstractMap.class.isAssignableFrom(clazz)) {
+            HashMap objMap = (HashMap) obj;
+            HashMap map = new HashMap();
+
+            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));
+                }
+            }
+
+            return map;
+        }
+        if (clazz.isArray()) {
+            List list = new Vector();
+
+            for (int i = 0; i < Array.getLength(obj); ++i) {
+                Object item = Array.get(obj, i);
+                list.add(getJsonFromObject(item == null ? null : item.getClass(), item));
+            }
+
+            return list;
+        }
+        return null;
+    }
+
     public Object getInstance(Class clazz) throws Exception {
         if (clazz == List.class) {
             return new Vector<>();
@@ -138,8 +191,8 @@ public abstract class LuDbo {
         for (Field field : getClass().getDeclaredFields()) {
             String key = getJsonFromField(field.getName());
             Class clazz = field.getType();
-            Object value = null;
             if (json.has(key)) {
+                Object value = null;
                 if (List.class.isAssignableFrom(clazz)) {
                     ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
                     Class type = (Class) parameterizedType.getActualTypeArguments()[0];
@@ -177,10 +230,10 @@ public abstract class LuDbo {
                 else {
                     value = getObjectFromJson(clazz, json, key);
                 }
+                field.setAccessible(true);
+                field.set(this, value);
+                field.setAccessible(false);
             }
-            field.setAccessible(true);
-            field.set(this, value);
-            field.setAccessible(false);
         }
     }
 
@@ -191,6 +244,15 @@ public abstract class LuDbo {
         for (Field field : getClass().getDeclaredFields()) {
             String key = getJsonFromField(field.getName());
             Class clazz = field.getType();
+            field.setAccessible(true);
+            Object obj = null;
+            try {
+                obj = field.get(this);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            field.setAccessible(false);
+            map.put(key, getJsonFromObject(clazz, obj));
         }
 
         return map;

luticateutils/src/test/java/com/luticate/utils/TestDbo.java

@@ -4,6 +4,7 @@ import com.luticate.utils.dbo.LuDbo;
 
 import java.io.Serializable;
 import java.util.AbstractMap;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -243,4 +244,87 @@ public class TestDbo extends LuDbo implements Serializable {
     public void setHashMap2(AbstractMap<String, Test2Dbo> hashMap2) {
         _hashMap2 = hashMap2;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        TestDbo testDbo = (TestDbo) o;
+
+        if (_byte != testDbo._byte) return false;
+        if (_char != testDbo._char) return false;
+        if (_short != testDbo._short) return false;
+        if (_int != testDbo._int) return false;
+        if (_long != testDbo._long) return false;
+        if (Float.compare(testDbo._float, _float) != 0) return false;
+        if (Double.compare(testDbo._double, _double) != 0) return false;
+        if (_boolean != testDbo._boolean) return false;
+        if (_byteObject != null ? !_byteObject.equals(testDbo._byteObject) : testDbo._byteObject != null)
+            return false;
+        if (_charObject != null ? !_charObject.equals(testDbo._charObject) : testDbo._charObject != null)
+            return false;
+        if (_shortObject != null ? !_shortObject.equals(testDbo._shortObject) : testDbo._shortObject != null)
+            return false;
+        if (_intObject != null ? !_intObject.equals(testDbo._intObject) : testDbo._intObject != null)
+            return false;
+        if (_longObject != null ? !_longObject.equals(testDbo._longObject) : testDbo._longObject != null)
+            return false;
+        if (_floatObject != null ? !_floatObject.equals(testDbo._floatObject) : testDbo._floatObject != null)
+            return false;
+        if (_doubleObject != null ? !_doubleObject.equals(testDbo._doubleObject) : testDbo._doubleObject != null)
+            return false;
+        if (_booleanObject != null ? !_booleanObject.equals(testDbo._booleanObject) : testDbo._booleanObject != null)
+            return false;
+        if (_string != null ? !_string.equals(testDbo._string) : testDbo._string != null)
+            return false;
+        if (_test2Dbo != null ? !_test2Dbo.equals(testDbo._test2Dbo) : testDbo._test2Dbo != null)
+            return false;
+        if (_test2Dbo2 != null ? !_test2Dbo2.equals(testDbo._test2Dbo2) : testDbo._test2Dbo2 != null)
+            return false;
+        if (_integers != null ? !_integers.equals(testDbo._integers) : testDbo._integers != null)
+            return false;
+        if (!Arrays.equals(_ints, testDbo._ints)) return false;
+        if (_test2Dbos != null ? !_test2Dbos.equals(testDbo._test2Dbos) : testDbo._test2Dbos != null)
+            return false;
+        // Probably incorrect - comparing Object[] arrays with Arrays.equals
+        if (!Arrays.equals(_dbos, testDbo._dbos)) return false;
+        if (_hashMap != null ? !_hashMap.equals(testDbo._hashMap) : testDbo._hashMap != null)
+            return false;
+        return _hashMap2 != null ? _hashMap2.equals(testDbo._hashMap2) : testDbo._hashMap2 == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        result = (int) _byte;
+        result = 31 * result + (int) _char;
+        result = 31 * result + (int) _short;
+        result = 31 * result + _int;
+        result = 31 * result + (int) (_long ^ (_long >>> 32));
+        result = 31 * result + (_float != +0.0f ? Float.floatToIntBits(_float) : 0);
+        temp = Double.doubleToLongBits(_double);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + (_boolean ? 1 : 0);
+        result = 31 * result + (_byteObject != null ? _byteObject.hashCode() : 0);
+        result = 31 * result + (_charObject != null ? _charObject.hashCode() : 0);
+        result = 31 * result + (_shortObject != null ? _shortObject.hashCode() : 0);
+        result = 31 * result + (_intObject != null ? _intObject.hashCode() : 0);
+        result = 31 * result + (_longObject != null ? _longObject.hashCode() : 0);
+        result = 31 * result + (_floatObject != null ? _floatObject.hashCode() : 0);
+        result = 31 * result + (_doubleObject != null ? _doubleObject.hashCode() : 0);
+        result = 31 * result + (_booleanObject != null ? _booleanObject.hashCode() : 0);
+        result = 31 * result + (_string != null ? _string.hashCode() : 0);
+        result = 31 * result + (_test2Dbo != null ? _test2Dbo.hashCode() : 0);
+        result = 31 * result + (_test2Dbo2 != null ? _test2Dbo2.hashCode() : 0);
+        result = 31 * result + (_integers != null ? _integers.hashCode() : 0);
+        result = 31 * result + Arrays.hashCode(_ints);
+        result = 31 * result + (_test2Dbos != null ? _test2Dbos.hashCode() : 0);
+        result = 31 * result + Arrays.hashCode(_dbos);
+        result = 31 * result + (_hashMap != null ? _hashMap.hashCode() : 0);
+        result = 31 * result + (_hashMap2 != null ? _hashMap2.hashCode() : 0);
+        return result;
+    }
 }

luticateutils/src/test/java/com/luticate/utils/TestDboTest.java

@@ -1,6 +1,6 @@
 package com.luticate.utils;
 
-import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -11,72 +11,72 @@ import static org.junit.Assert.*;
 
 public class TestDboTest {
 
-    @Test
-    public void deserializeTest() throws Exception {
-        TestDbo test = new TestDbo();
-        test.fromString("{" +
-                "\"byte\": 42," +
-                "\"char\": \"h\"," +
-                "\"short\": 4200," +
-                "\"int\": 420042," +
-                "\"long\": 42004200," +
-                "\"float\": 42.24," +
-                "\"double\": 4200.0024," +
-                "\"boolean\": true," +
-
-                "\"byteObject\": 24," +
-                "\"charObject\": \"w\"," +
-                "\"shortObject\": 2400," +
-                "\"intObject\": 240024," +
-                "\"longObject\": 24002400," +
-                "\"floatObject\": 24.42," +
-                "\"doubleObject\": 2400.0042," +
-                "\"booleanObject\": false," +
-
-                "\"string\": \"Hello World!\"," +
-
-                "\"test2Dbo\": {" +
-                "\"aString\": \"a string\"," +
-                "\"aInt\": 4242" +
-                "}," +
-
-                "\"integers\": [" +
-                "0," +
-                "42," +
-                "24" +
-                "]," +
-                "ints: [" +
-                "24," +
-                "42," +
-                "0" +
-                "]," +
-
-                "test2Dbos: [" +
-                "{" +
-                "\"aString\": \"42 42\"," +
-                "\"aInt\": 4242" +
-                "}" +
-                "]," +
-                "dbos: [" +
-                "{" +
-                "\"aString\": \"24 24\"," +
-                "\"aInt\": 2424" +
-                "}" +
-                "]," +
-
-                "\"hashMap\": {" +
-                "\"forty-two\": 42," +
-                "\"twenty-four\": 24" +
-                "}," +
-
-                "\"hashMap2\": {" +
-                "\"an object\": {" +
-                "\"aString\": \"42 24\"," +
-                "\"aInt\": 4224" +
-                "}" +
-                "}" +
-
-                "}");
+    public static String TEST_DBO_JSON =  "{" +
+            "\"byte\": 42," +
+            "\"char\": \"h\"," +
+            "\"short\": 4200," +
+            "\"int\": 420042," +
+            "\"long\": 42004200," +
+            "\"float\": 42.24," +
+            "\"double\": 4200.0024," +
+            "\"boolean\": true," +
+
+            "\"byteObject\": 24," +
+            "\"charObject\": \"w\"," +
+            "\"shortObject\": 2400," +
+            "\"intObject\": 240024," +
+            "\"longObject\": 24002400," +
+            "\"floatObject\": 24.42," +
+            "\"doubleObject\": 2400.0042," +
+            "\"booleanObject\": false," +
+
+            "\"string\": \"Hello World!\"," +
+
+            "\"test2Dbo\": {" +
+            "\"aString\": \"a string\"," +
+            "\"aInt\": 4242" +
+            "}," +
+
+            "\"integers\": [" +
+            "0," +
+            "42," +
+            "24" +
+            "]," +
+            "ints: [" +
+            "24," +
+            "42," +
+            "0" +
+            "]," +
+
+            "test2Dbos: [" +
+            "{" +
+            "\"aString\": \"42 42\"," +
+            "\"aInt\": 4242" +
+            "}" +
+            "]," +
+            "dbos: [" +
+            "{" +
+            "\"aString\": \"24 24\"," +
+            "\"aInt\": 2424" +
+            "}" +
+            "]," +
+
+            "\"hashMap\": {" +
+            "\"forty-two\": 42," +
+            "\"twenty-four\": 24" +
+            "}," +
+
+            "\"hashMap2\": {" +
+            "\"an object\": {" +
+            "\"aString\": \"42 24\"," +
+            "\"aInt\": 4224" +
+            "}" +
+            "}" +
+
+            "}";
+
+    public void testTestDbo(TestDbo test)
+    {
         assertEquals(42, test.getByte());
         assertEquals(24, test.getByteObject().byteValue());
         assertEquals('h', test.getChar());
@@ -137,14 +137,40 @@ public class TestDboTest {
         assertNotNull(test.getHashMap2().get("an object"));
         assertEquals("42 24", test.getHashMap2().get("an object").getaString());
         assertEquals(4224, test.getHashMap2().get("an object").getaInt());
+
+        assertEquals(test, test);
+    }
+
+    @Test
+    public void deserializeTest() throws Exception {
+        TestDbo test = new TestDbo();
+        test.fromString(TEST_DBO_JSON);
+        testTestDbo(test);
     }
 
     @Test
-    public void serializeTest()
+    public void serializeTest() throws Exception
     {
-        Test2Dbo dbo = new Test2Dbo();
-        dbo.setaInt(2442);
-        dbo.setaString("24 42");
+        TestDbo test = new TestDbo();
+        test.fromString(TEST_DBO_JSON);
+        JSONObject json = test.toJson();
+
+        TestDbo test2 = new TestDbo();
+        test2.fromJson(json);
+
+        testTestDbo(test2);
+    }
+
+    @Test
+    public void serializeStringTest() throws Exception
+    {
+        TestDbo test = new TestDbo();
+        test.fromString(TEST_DBO_JSON);
+        JSONObject json = test.toJson();
+
+        TestDbo test2 = new TestDbo();
+        test2.fromString(json.toString());
 
+        testTestDbo(test2);
     }
 }