From 71cdb034f1f1218874d46cb57adac02d60793050 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Mon, 2 Jun 2014 11:32:39 +0200
Subject: Replace reply(user)id by replytweetid

---
 src/data/Tweet.java                           | 2 +-
 src/database/QueryUtils.java                  | 8 ++++----
 test/data/ValidatingJsonDeserializerTest.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/data/Tweet.java b/src/data/Tweet.java
index 2e1a1f1..d9b1de0 100644
--- a/src/data/Tweet.java
+++ b/src/data/Tweet.java
@@ -11,7 +11,7 @@ public class Tweet {
     @ValidatingJsonDeserializer.Nullable
     public String lang;
     @ValidatingJsonDeserializer.Nullable
-    public Long in_reply_to_user_id;
+    public Long in_reply_to_status_id;
     public DateTime created_at;
     public int favorite_count;
     @ValidatingJsonDeserializer.Nullable
diff --git a/src/database/QueryUtils.java b/src/database/QueryUtils.java
index dac3ffc..4af6c09 100644
--- a/src/database/QueryUtils.java
+++ b/src/database/QueryUtils.java
@@ -22,7 +22,7 @@ public class QueryUtils {
             = buildQuery("tweet", new String[]{"tweetid"},
             "tweetid", "createdat::timestamptz", "favcount", "retweetcount",
             "text", "coordinates::point",
-            "language", "retweetid", "replyid", "place",
+            "language", "retweetid", "replytweetid", "place",
             "userid");
 
     public final static String insertHash
@@ -113,10 +113,10 @@ public class QueryUtils {
         } else {
             tweetStatement.setLong("retweetid", null);
         }
-        if (tweet.in_reply_to_user_id != null) {
-            tweetStatement.setLong("replyid", tweet.in_reply_to_user_id);
+        if (tweet.in_reply_to_status_id != null) {
+            tweetStatement.setLong("replytweetid", tweet.in_reply_to_status_id);
         } else {
-            tweetStatement.setLong("replyid", null);
+            tweetStatement.setLong("replytweetid", null);
         }
         // TODO: place is not a string...
         if (tweet.place != null) {
diff --git a/test/data/ValidatingJsonDeserializerTest.java b/test/data/ValidatingJsonDeserializerTest.java
index fdaf27f..0e9ffba 100644
--- a/test/data/ValidatingJsonDeserializerTest.java
+++ b/test/data/ValidatingJsonDeserializerTest.java
@@ -364,7 +364,7 @@ public class ValidatingJsonDeserializerTest {
         JsonObject tweet = new JsonObject();
         tweet.addProperty("id", 4);
         tweet.addProperty("lang", "X");
-        tweet.addProperty("in_reply_to_user_id", 4);
+        tweet.addProperty("in_reply_to_status_id", 4);
         tweet.addProperty("created_at", "Wed Apr 30 09:46:02 +0300 2014");
         tweet.addProperty("favorite_count", 4);
         tweet.add("place", JsonNull.INSTANCE);
@@ -465,7 +465,7 @@ public class ValidatingJsonDeserializerTest {
         checkTweetPass(tweet);
 
         tweet = buildMinimalTweet(buildMinimalUser());
-        removeProperty(tweet, "in_reply_to_user_id");
+        removeProperty(tweet, "in_reply_to_status_id");
         checkTweetPass(tweet);
 
         tweet = buildMinimalTweet(buildMinimalUser());
-- 
cgit v1.2.1