Entities can be missing, user.place is not a string

* User: place is not a string but a Place object.
* User: entities is nullable.
* Tweet: in_reply_to_user_id, coordinates is nullable.
* ValidatingJsonDeserializer: Treat null values as missing fields.
* ValidatingJsonDeserializerTest: Test for null values.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/database/QueryUtils.java b/src/database/QueryUtils.java
index f87ba47..228ccc8 100644
--- a/src/database/QueryUtils.java
+++ b/src/database/QueryUtils.java
@@ -103,7 +103,11 @@ public class QueryUtils {
         }
         tweetStatement.setLong("replyid", tweet.in_reply_to_user_id);
         // TODO: place is not a string...
-        tweetStatement.setString("place", tweet.place);
+        if (tweet.place != null) {
+            tweetStatement.setString("place", tweet.place.full_name + " " + tweet.place.country);
+        } else {
+            tweetStatement.setString("place", null);
+        }
 
         User twuser = tweet.user;
         tweetStatement.setLong("userid", twuser.id);