From d1a7285924143a2430c65edbc9455b67f5fae926 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 10 May 2014 01:00:45 +0200
Subject: user.time_zone can be null too

---
 src/data/User.java                            | 1 +
 test/data/ValidatingJsonDeserializerTest.java | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/data/User.java b/src/data/User.java
index 97061bc..91b5e07 100644
--- a/src/data/User.java
+++ b/src/data/User.java
@@ -7,6 +7,7 @@ public class User {
 
     public long id;
     public String name;
+    @ValidatingJsonDeserializer.Nullable
     public String time_zone;
     public long statuses_count;
     public long followers_count;
diff --git a/test/data/ValidatingJsonDeserializerTest.java b/test/data/ValidatingJsonDeserializerTest.java
index e258be2..2d3ffd1 100644
--- a/test/data/ValidatingJsonDeserializerTest.java
+++ b/test/data/ValidatingJsonDeserializerTest.java
@@ -478,7 +478,6 @@ public class ValidatingJsonDeserializerTest {
     public void testUser() {
         checkImpairedUser("id");
         checkImpairedUser("name");
-        checkImpairedUser("time_zone");
         checkImpairedUser("statuses_count");
         checkImpairedUser("followers_count");
         checkImpairedUser("friends_count");
@@ -494,6 +493,10 @@ public class ValidatingJsonDeserializerTest {
         JsonObject tweet = buildMinimalTweet(buildMinimalUser());
         removeProperty(tweet, "user", "entities");
         checkTweetPass(tweet);
+
+        tweet = buildMinimalTweet(buildMinimalUser());
+        removeProperty(tweet, "user", "time_zone");
+        checkTweetPass(tweet);
     }
 
     @Test
-- 
cgit v1.2.1