fixed some json issues; added yoda time support; swtiched dbo to automatic de/serialization

app/build.gradle

@@ -46,7 +46,6 @@ dependencies {
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
     compile project(path: ':luticateutils')
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'net.danlew:android.joda:2.9.4.2'
     compile 'com.google.firebase:firebase-ads:9.6.1'
     compile 'com.facebook.android:facebook-android-sdk:4.5.0'
     compile 'com.github.simbiose:Encryption:1.4.0'

app/src/main/java/com/rthoni/stssaguenay/business/STSBusiness.java

@@ -52,7 +52,7 @@ public class STSBusiness {
                 dbo.fromJson(json.getJSONObject(i));
                 dbos.add(dbo);
             }
-        } catch (JSONException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return dbos;
@@ -73,9 +73,9 @@ public class STSBusiness {
         if (str != null) {
             UserDbo user = new UserDbo();
             try {
-                user.fromJson(new JSONObject(str));
+                user.fromString(str);
                 return user;
-            } catch (JSONException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }

app/src/main/java/com/rthoni/stssaguenay/business/UsersSettingsBusiness.java

@@ -29,8 +29,8 @@ public class UsersSettingsBusiness {
 
         UsersSettingsDbo settings = new UsersSettingsDbo();
         try {
-            settings.fromJson(new JSONObject(data));
-        } catch (JSONException e) {
+            settings.fromString(data);
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }

app/src/main/java/com/rthoni/stssaguenay/dataaccess/SchedulesDataAccess.java

@@ -3,6 +3,7 @@ package com.rthoni.stssaguenay.dataaccess;
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.dataaccess.LuDataAccess;
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.luticate.utils.dbo.LuDbo;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
@@ -25,7 +26,7 @@ public class SchedulesDataAccess extends LuDataAccess {
     {
         HashMap<String, String> map = new HashMap<>();
         map.put("count", Integer.toString(count));
-        map.put("date", JSONObject.quote(date.toString("y-M-d HH:mm:ss")));
+        map.put("date", JSONObject.quote(date.toString(LuDbo.DEFAULT_DATE_TIME_FORMAT)));
 
         JSONArray stops = new JSONArray();
         for (UserFavouriteStopsDbo dbo : favouriteStopDbos) {

app/src/main/java/com/rthoni/stssaguenay/dbo/RoutesDbo.java

@@ -26,23 +26,23 @@ public class RoutesDbo extends LuDbo {
 
     protected String _fgColor;
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _id = json.getString("id");
-        _name = json.getString("name");
-        _bgColor = json.getString("bgColor");
-        _fgColor = json.getString("fgColor");
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id", _id);
-        map.put("name", _name);
-        map.put("bgColor", _bgColor);
-        map.put("fgColor", _fgColor);
-        return map;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _id = json.getString("id");
+//        _name = json.getString("name");
+//        _bgColor = json.getString("bgColor");
+//        _fgColor = json.getString("fgColor");
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("id", _id);
+//        map.put("name", _name);
+//        map.put("bgColor", _bgColor);
+//        map.put("fgColor", _fgColor);
+//        return map;
+//    }
 
     public String getId() {
         return _id;

app/src/main/java/com/rthoni/stssaguenay/dbo/SchedulesDbo.java

@@ -31,21 +31,21 @@ public class SchedulesDbo extends LuDbo {
 
     protected List<LocalDateTime> _schedules;
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _stopId = json.getString("stopId");
-        _routeId = json.getString("routeId");
-        _schedules = new Vector<>();
-        JSONArray schedules = json.getJSONArray("schedules");
-        for (int i = 0; i < schedules.length(); ++i) {
-            _schedules.add(LocalDateTime.parse(schedules.getString(i), DateTimeFormat.forPattern("y-M-d H:m:s")));
-        }
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        return null;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _stopId = json.getString("stopId");
+//        _routeId = json.getString("routeId");
+//        _schedules = new Vector<>();
+//        JSONArray schedules = json.getJSONArray("schedules");
+//        for (int i = 0; i < schedules.length(); ++i) {
+//            _schedules.add(LocalDateTime.parse(schedules.getString(i), DateTimeFormat.forPattern("y-M-d H:m:s")));
+//        }
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        return null;
+//    }
 
     public String getStopId() {
         return _stopId;

app/src/main/java/com/rthoni/stssaguenay/dbo/StopsDbo.java

@@ -22,29 +22,29 @@ public class StopsDbo extends LuDbo {
     {
     }
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _name = json.getString("name");
-        _routes = new Vector<>();
-        JSONArray routes = json.getJSONArray("routes");
-        for (int i = 0; i < routes.length(); ++i) {
-            _routes.add(routes.getString(i));
-        }
-        _id = json.getString("id");
-        _posX = json.getDouble("posX");
-        _posY = json.getDouble("posY");
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("name", _name);
-        map.put("routes", _routes);
-        map.put("id", _id);
-        map.put("posX", _posX);
-        map.put("posY", _posY);
-        return map;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _name = json.getString("name");
+//        _routes = new Vector<>();
+//        JSONArray routes = json.getJSONArray("routes");
+//        for (int i = 0; i < routes.length(); ++i) {
+//            _routes.add(routes.getString(i));
+//        }
+//        _id = json.getString("id");
+//        _posX = json.getDouble("posX");
+//        _posY = json.getDouble("posY");
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("name", _name);
+//        map.put("routes", _routes);
+//        map.put("id", _id);
+//        map.put("posX", _posX);
+//        map.put("posY", _posY);
+//        return map;
+//    }
 
     protected String _name;
 

app/src/main/java/com/rthoni/stssaguenay/dbo/UserDbo.java

@@ -19,21 +19,21 @@ public class UserDbo extends LuDbo {
 
     protected String _email;
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _id = json.getString("id");
-        _name = json.getString("name");
-        _email = json.getString("email");
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id", _id);
-        map.put("name", _name);
-        map.put("email", _email);
-        return map;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _id = json.getString("id");
+//        _name = json.getString("name");
+//        _email = json.getString("email");
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("id", _id);
+//        map.put("name", _name);
+//        map.put("email", _email);
+//        return map;
+//    }
 
     public String getId() {
         return _id;

app/src/main/java/com/rthoni/stssaguenay/dbo/UserFavouriteStopsDbo.java

@@ -22,32 +22,32 @@ public class UserFavouriteStopsDbo extends LuDbo {
 
     protected String _name;
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _stop = new StopsDbo();
-        _stop.fromJson(json.getJSONObject("stop"));
-        _routes = new Vector<>();
-        JSONArray routes = json.getJSONArray("routes");
-        for (int i = 0; i < routes.length(); ++i) {
-            RoutesDbo route = new RoutesDbo();
-            route.fromJson(routes.getJSONObject(i));
-            _routes.add(route);
-        }
-        _name = json.getString("name");
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("stop", _stop.toArray());
-        List<Object> routes = new Vector<>();
-        for (RoutesDbo route : _routes) {
-            routes.add(route.toArray());
-        }
-        map.put("routes", routes);
-        map.put("name", _name);
-        return map;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _stop = new StopsDbo();
+//        _stop.fromJson(json.getJSONObject("stop"));
+//        _routes = new Vector<>();
+//        JSONArray routes = json.getJSONArray("routes");
+//        for (int i = 0; i < routes.length(); ++i) {
+//            RoutesDbo route = new RoutesDbo();
+//            route.fromJson(routes.getJSONObject(i));
+//            _routes.add(route);
+//        }
+//        _name = json.getString("name");
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("stop", _stop.toArray());
+//        List<Object> routes = new Vector<>();
+//        for (RoutesDbo route : _routes) {
+//            routes.add(route.toArray());
+//        }
+//        map.put("routes", routes);
+//        map.put("name", _name);
+//        return map;
+//    }
 
     public StopsDbo getStop() {
         return _stop;

app/src/main/java/com/rthoni/stssaguenay/dbo/UsersSettingsDbo.java

@@ -17,27 +17,27 @@ import java.util.Vector;
 public class UsersSettingsDbo extends LuDbo {
     protected List<UserFavouriteStopsDbo> _favouriteStops;
 
-    @Override
-    public void fromJson(JSONObject json) throws JSONException {
-        _favouriteStops = new Vector<>();
-        JSONArray stops = json.getJSONArray("favouriteStops");
-        for (int i = 0; i < stops.length(); ++i) {
-            UserFavouriteStopsDbo stop = new UserFavouriteStopsDbo();
-            stop.fromJson(stops.getJSONObject(i));
-            _favouriteStops.add(stop);
-        }
-    }
-
-    @Override
-    public HashMap<String, Object> toArray() {
-        HashMap<String, Object> map = new HashMap<>();
-        List<HashMap<String, Object>> stops = new Vector<>();
-        for (UserFavouriteStopsDbo stop : _favouriteStops) {
-            stops.add(stop.toArray());
-        }
-        map.put("favouriteStops", stops);
-        return map;
-    }
+//    @Override
+//    public void fromJson(JSONObject json) throws JSONException {
+//        _favouriteStops = new Vector<>();
+//        JSONArray stops = json.getJSONArray("favouriteStops");
+//        for (int i = 0; i < stops.length(); ++i) {
+//            UserFavouriteStopsDbo stop = new UserFavouriteStopsDbo();
+//            stop.fromJson(stops.getJSONObject(i));
+//            _favouriteStops.add(stop);
+//        }
+//    }
+//
+//    @Override
+//    public HashMap<String, Object> toArray() {
+//        HashMap<String, Object> map = new HashMap<>();
+//        List<HashMap<String, Object>> stops = new Vector<>();
+//        for (UserFavouriteStopsDbo stop : _favouriteStops) {
+//            stops.add(stop.toArray());
+//        }
+//        map.put("favouriteStops", stops);
+//        return map;
+//    }
 
     public List<UserFavouriteStopsDbo> getFavouriteStops() {
         return _favouriteStops;

app/src/main/java/com/rthoni/stssaguenay/ui/activities/MainActivity.java

@@ -150,7 +150,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                                     UserDbo userDbo = new UserDbo();
                                     userDbo.fromJson(object);
                                     onUserLogged(userDbo);
-                                } catch (JSONException e) {
+                                } catch (Exception e) {
                                     e.printStackTrace();
                                 }
                             }

build.gradle

@@ -15,6 +15,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'de.mobilej.unmock:UnMockPlugin:0.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

luticateutils/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'de.mobilej.unmock'
 
 android {
     compileSdkVersion 22
@@ -18,9 +19,16 @@ android {
     }
 }
 
+unMock {
+    // URI to download the android-all.jar from. e.g. https://oss.sonatype.org/content/groups/public/org/robolectric/android-all/
+    downloadFrom 'https://oss.sonatype.org/content/groups/public/org/robolectric/android-all/4.3_r2-robolectric-0/android-all-4.3_r2-robolectric-0.jar'
+
+    keepStartingWith "org.json."
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    testCompile 'org.json:json:20160810'
     compile 'com.android.volley:volley:1.0.0'
+    compile 'net.danlew:android.joda:2.9.4.2'
 }

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

@@ -4,7 +4,12 @@ import com.luticate.utils.dbo.JSONContainer.LuAbstractJsonContainer;
 import com.luticate.utils.dbo.JSONContainer.LuJSONArrayContainer;
 import com.luticate.utils.dbo.JSONContainer.LuJSONObjectContainer;
 
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.DateTimeFormat;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.lang.reflect.Array;
@@ -21,11 +26,11 @@ import java.util.Vector;
  */
 public abstract class LuDbo {
 
-    public void fromString(String data) throws Exception
-    {
-        JSONObject json = new JSONObject(data);
-        fromJson(json);
-    }
+    public static String DEFAULT_DATE_FORMAT = "yy-MM-dd";
+
+    public static String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+
+    public static String DEFAULT_DATE_TIME_FORMAT = DEFAULT_DATE_FORMAT + " " + DEFAULT_TIME_FORMAT;
 
     public String getFieldFromJson(String jsonName)
     {
@@ -75,6 +80,12 @@ public abstract class LuDbo {
         if (clazz == String.class) {
             return json.getString(key);
         }
+        if (clazz == LocalDateTime.class) {
+            return LocalDateTime.parse(json.getString(key), DateTimeFormat.forPattern(DEFAULT_DATE_TIME_FORMAT));
+        }
+        if (clazz == DateTime.class) {
+            return DateTime.parse(json.getString(key), DateTimeFormat.forPattern(DEFAULT_DATE_TIME_FORMAT));
+        }
         if (LuDbo.class.isAssignableFrom(clazz)) {
             LuDbo dbo = (LuDbo) getInstance(clazz);
             dbo.fromJson(json.getJSONObject(key));
@@ -97,38 +108,47 @@ public abstract class LuDbo {
                 || clazz == String.class) {
             return obj;
         }
+        if (clazz == LocalDateTime.class) {
+            return ((LocalDateTime)obj).toString(DateTimeFormat.forPattern(DEFAULT_DATE_TIME_FORMAT));
+        }
+        if (clazz == DateTime.class) {
+            return ((DateTime)obj).toString(DateTimeFormat.forPattern(DEFAULT_DATE_TIME_FORMAT));
+        }
         if (LuDbo.class.isAssignableFrom(clazz)) {
-            return ((LuDbo)obj).toArray();
+            return ((LuDbo)obj).toJson();
         }
         if (List.class.isAssignableFrom(clazz)) {
             List objList = (List) obj;
-            List list = new Vector();
+            JSONArray list = new JSONArray();
 
             for (Object item : objList) {
-                list.add(getJsonFromObject(getClazz(item), item));
+                list.put(getJsonFromObject(getClazz(item), item));
             }
 
             return list;
         }
         if (AbstractMap.class.isAssignableFrom(clazz)) {
             HashMap objMap = (HashMap) obj;
-            HashMap map = new HashMap();
+            JSONObject map = new JSONObject();
 
             for (Object k : objMap.keySet()) {
                 if (k.getClass() == String.class) {
                     Object item = objMap.get(k);
-                    map.put(k, getJsonFromObject(getClazz(item), item));
+                    try {
+                        map.put((String) k, getJsonFromObject(getClazz(item), item));
+                    } catch (JSONException ignored) {
+                    }
                 }
             }
 
             return map;
         }
         if (clazz.isArray()) {
-            List list = new Vector();
+            JSONArray list = new JSONArray();
 
             for (int i = 0; i < Array.getLength(obj); ++i) {
                 Object item = Array.get(obj, i);
-                list.add(getJsonFromObject(item == null ? null : item.getClass(), item));
+                list.put(getJsonFromObject(item == null ? null : item.getClass(), item));
             }
 
             return list;
@@ -151,6 +171,12 @@ public abstract class LuDbo {
         return obj == null ? null : obj.getClass();
     }
 
+    public void fromString(String data) throws Exception
+    {
+        JSONObject json = new JSONObject(data);
+        fromJson(json);
+    }
+
     public void fromJson(JSONObject json) throws Exception
     {
         for (Field field : getClass().getDeclaredFields()) {
@@ -214,8 +240,7 @@ public abstract class LuDbo {
             Object obj = null;
             try {
                 obj = field.get(this);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
+            } catch (IllegalAccessException ignored) {
             }
             field.setAccessible(false);
             map.put(key, getJsonFromObject(clazz, obj));
@@ -226,7 +251,9 @@ public abstract class LuDbo {
 
     public JSONObject toJson()
     {
-        return new JSONObject(toArray());
+        HashMap<String, Object> array = toArray();
+        JSONObject json = new JSONObject(array);
+        return json;
     }
 
     @Override
@@ -234,4 +261,5 @@ public abstract class LuDbo {
     {
         return toJson().toString();
     }
+
 }

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

@@ -45,6 +45,9 @@ public class TestDbo extends LuDbo implements Serializable {
     protected HashMap<String, Integer> _hashMap;
     protected AbstractMap<String, Test2Dbo> _hashMap2;
 
+    protected String _aNullString;
+    protected Class _object = TestDbo.class;
+
     public byte getByte() {
         return _byte;
     }
@@ -245,6 +248,22 @@ public class TestDbo extends LuDbo implements Serializable {
         _hashMap2 = hashMap2;
     }
 
+    public String getaNullString() {
+        return _aNullString;
+    }
+
+    public void setaNullString(String aNullString) {
+        _aNullString = aNullString;
+    }
+
+    public Class getObject() {
+        return _object;
+    }
+
+    public void setObject(Class object) {
+        _object = object;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -291,7 +310,11 @@ public class TestDbo extends LuDbo implements Serializable {
         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;
+        if (_hashMap2 != null ? !_hashMap2.equals(testDbo._hashMap2) : testDbo._hashMap2 != null)
+            return false;
+        if (_aNullString != null ? !_aNullString.equals(testDbo._aNullString) : testDbo._aNullString != null)
+            return false;
+        return _object != null ? _object.equals(testDbo._object) : testDbo._object == null;
 
     }
 
@@ -325,6 +348,8 @@ public class TestDbo extends LuDbo implements Serializable {
         result = 31 * result + Arrays.hashCode(_dbos);
         result = 31 * result + (_hashMap != null ? _hashMap.hashCode() : 0);
         result = 31 * result + (_hashMap2 != null ? _hashMap2.hashCode() : 0);
+        result = 31 * result + (_aNullString != null ? _aNullString.hashCode() : 0);
+        result = 31 * result + (_object != null ? _object.hashCode() : 0);
         return result;
     }
 }

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

@@ -71,7 +71,11 @@ public class TestDboTest {
             "\"aString\": \"42 24\"," +
             "\"aInt\": 4224" +
             "}" +
-            "}" +
+            "}," +
+
+            "\"aNullString\": null," +
+
+            "\"object\": {}" +
 
             "}";
 
@@ -138,6 +142,9 @@ public class TestDboTest {
         assertEquals("42 24", test.getHashMap2().get("an object").getaString());
         assertEquals(4224, test.getHashMap2().get("an object").getaInt());
 
+        assertNull(test.getaNullString());
+        assertNull(test.getObject());
+
         assertEquals(test, test);
     }
 
@@ -166,10 +173,9 @@ public class TestDboTest {
     {
         TestDbo test = new TestDbo();
         test.fromString(TEST_DBO_JSON);
-        JSONObject json = test.toJson();
 
         TestDbo test2 = new TestDbo();
-        test2.fromString(json.toString());
+        test2.fromString(test.toString());
 
         testTestDbo(test2);
     }