stream event add

madhavcoder · Jun 2, 2015 · 812b8ca · 812b8ca
1 parent fb51685
commit 812b8ca
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 6 deletions.
diff --git a/twitter4j-async/src/main/java/twitter4j/TwitterMethod.java b/twitter4j-async/src/main/java/twitter4j/TwitterMethod.java
@@ -26,7 +26,7 @@ public enum TwitterMethod {
     USER_TIMELINE,
     HOME_TIMELINE,
     RETWEETS_OF_ME,
-    RETWEETED_RETWEET,
+
 
     /* Tweets Resources */
     RETWEETS,

diff --git a/twitter4j-core/src/main/java/twitter4j/JSONObjectType.java b/twitter4j-core/src/main/java/twitter4j/JSONObjectType.java
@@ -48,6 +48,7 @@ public enum Type {
         UNBLOCK,
         DISCONNECTION,
         RETWEETED_RETWEET,
+        FAVORITED_RETWEET,
         UNKNOWN
     }
 
@@ -124,6 +125,8 @@ public static Type determine(JSONObject json) {
                     return Type.UNBLOCK;
                 } else if("retweeted_retweet".equals(event)){
                     return Type.RETWEETED_RETWEET;
+                } else if("favorited_retweet".equals(event)){
+                    return Type.FAVORITED_RETWEET;
                 }
             } catch (JSONException jsone) {
                 try {

diff --git a/twitter4j-stream/src/main/java/twitter4j/SiteStreamsAdapter.java b/twitter4j-stream/src/main/java/twitter4j/SiteStreamsAdapter.java
@@ -94,6 +94,10 @@ public void onUnblock(long forUser, User source, User unblockedUser) {
     public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
     }
 
+    @Override
+    public void onFavoritedRetweet(User source, User target, Status favoritedStatus) {
+    }
+
     @Override
     public void onDisconnectionNotice(String screenName) {
     }

diff --git a/twitter4j-stream/src/main/java/twitter4j/SiteStreamsImpl.java b/twitter4j-stream/src/main/java/twitter4j/SiteStreamsImpl.java
@@ -260,6 +260,13 @@ void onRetweetedRetweet(JSONObject source, JSONObject target, JSONObject targetO
         }
     }
 
+    @Override
+    void onFavoritedRetweet(JSONObject source, JSONObject target, JSONObject targetObject, StreamListener[] listeners) throws TwitterException {
+        for (StreamListener listener : listeners) {
+            ((SiteStreamsListener) listener).onFavoritedRetweet(asUser(source), asUser(target), asStatus(targetObject));
+        }
+    }
+
     @Override
     public void onException(final Exception ex, StreamListener[] listeners) {
         for (StreamListener listener : listeners) {

diff --git a/twitter4j-stream/src/main/java/twitter4j/SiteStreamsListener.java b/twitter4j-stream/src/main/java/twitter4j/SiteStreamsListener.java
@@ -166,6 +166,14 @@ public interface SiteStreamsListener extends StreamListener {
      */
     void onRetweetedRetweet(User source,User target, Status retweetedStatus);
 
+    /**
+     * @param source          source user of the event
+     * @param target          target user of the event
+     * @param favoritedStatus status favorited retweet
+     * @since Twitter4J 4.0.x
+     */
+    void onFavoritedRetweet(User source,User target, Status favoritedStatus);
+
     /**
      * callback method for {@link StreamController#removeUsers(long[])}
      */

diff --git a/twitter4j-stream/src/main/java/twitter4j/StatusStreamBase.java b/twitter4j-stream/src/main/java/twitter4j/StatusStreamBase.java
@@ -171,7 +171,10 @@ public void run() {
                                         onUnblock(json.getJSONObject("source"), json.getJSONObject("target"), listeners);
                                         break;
                                     case RETWEETED_RETWEET:
-                                        onRetweetedRetweet(json.getJSONObject("source"),json.getJSONObject("target"),json.getJSONObject("target_object"),listeners);
+                                        onRetweetedRetweet(json.getJSONObject("source"), json.getJSONObject("target"), json.getJSONObject("target_object"), listeners);
+                                        break;
+                                    case FAVORITED_RETWEET:
+                                        onFavoritedRetweet(json.getJSONObject("source"), json.getJSONObject("target"), json.getJSONObject("target_object"), listeners);
                                         break;
                                     case DISCONNECTION:
                                         onDisconnectionNotice(line, listeners);
@@ -305,6 +308,9 @@ void onUnblock(JSONObject source, JSONObject target, StreamListener[] listeners)
     void onRetweetedRetweet(JSONObject source, JSONObject target, JSONObject targetObject,StreamListener[] listeners) throws TwitterException {
         logger.warn("Unhandled event: onRetweetedRetweet");
     }
+    void onFavoritedRetweet(JSONObject source, JSONObject target, JSONObject targetObject,StreamListener[] listeners) throws TwitterException {
+        logger.warn("Unhandled event: onFavoritedRetweet");
+    }
 
     void onDisconnectionNotice(String line, StreamListener[] listeners) {
         logger.warn("Unhandled event: ", line);

diff --git a/twitter4j-stream/src/main/java/twitter4j/UserStreamAdapter.java b/twitter4j-stream/src/main/java/twitter4j/UserStreamAdapter.java
@@ -99,7 +99,10 @@ public void onUnblock(User source, User unblockedUser) {
 
     @Override
     public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
+    }
 
+    @Override
+    public void onFavoritedRetweet(User source, User target, Status favoritedStatus) {
     }
 
     @Override

diff --git a/twitter4j-stream/src/main/java/twitter4j/UserStreamImpl.java b/twitter4j-stream/src/main/java/twitter4j/UserStreamImpl.java
@@ -187,4 +187,11 @@ void onRetweetedRetweet(JSONObject source, JSONObject target, JSONObject targetO
             ((UserStreamListener) listener).onRetweetedRetweet(asUser(source), asUser(target), asStatus(targetObject));
         }
     }
+
+    @Override
+    void onFavoritedRetweet(JSONObject source, JSONObject target, JSONObject targetObject, StreamListener[] listeners) throws TwitterException {
+        for (StreamListener listener : listeners) {
+            ((UserStreamListener) listener).onFavoritedRetweet(asUser(source), asUser(target), asStatus(targetObject));
+        }
+    }
 }
diff --git a/twitter4j-stream/src/main/java/twitter4j/UserStreamListener.java b/twitter4j-stream/src/main/java/twitter4j/UserStreamListener.java
@@ -157,4 +157,12 @@ public interface UserStreamListener extends StatusListener {
      * @since Twitter4J 4.0.x
      */
     void onRetweetedRetweet(User source,User target, Status retweetedStatus);
+
+    /**
+     * @param source          source user of the event
+     * @param target          target user of the event
+     * @param retweetedStatus status favorited retweet
+     * @since Twitter4J 4.0.x
+     */
+    void onFavoritedRetweet(User source,User target, Status retweetedStatus);
 }
diff --git a/twitter4j-stream/src/test/java/twitter4j/SiteStreamsTest.java b/twitter4j-stream/src/test/java/twitter4j/SiteStreamsTest.java
@@ -407,15 +407,22 @@ public void onUnblock(long forUser, User source, User unblockedUser) {
 
     @Override
     public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
-
-        System.out.println("onRetweetedRetweet");
-        received.add(new Object[]{TwitterMethod.RETWEETED_RETWEET, source, target, retweetedStatus});
+        received.add(new Object[]{"retweeted_retweet", source, target, retweetedStatus});
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(source));
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(target));
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(retweetedStatus));
         notifyResponse();
     }
 
+    @Override
+    public void onFavoritedRetweet(User source, User target, Status favoritedStatus) {
+        received.add(new Object[]{"favorited_retweet", source, target, favoritedStatus});
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(source));
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(target));
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(favoritedStatus));
+        notifyResponse();
+    }
+
     @Override
     public void onDisconnectionNotice(String screenName) {
         received.add(new Object[]{"Disconnect"});

diff --git a/twitter4j-stream/src/test/java/twitter4j/UserStreamTest.java b/twitter4j-stream/src/test/java/twitter4j/UserStreamTest.java
@@ -428,13 +428,22 @@ public void onUnblock(User source, User unblockedUser) {
     @Override
     public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
         System.out.println("onRetweetedRetweet");
-        received.add(new Object[]{RETWEETED_RETWEET, source, target, retweetedStatus});
+        received.add(new Object[]{"retweeted_retweet", source, target, retweetedStatus});
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(source));
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(target));
         Assert.assertNotNull(TwitterObjectFactory.getRawJSON(retweetedStatus));
         notifyResponse();
     }
 
+    @Override
+    public void onFavoritedRetweet(User source, User target, Status favoritedStatus) {
+        received.add(new Object[]{"favorited_retweet", source, target, favoritedStatus});
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(source));
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(target));
+        Assert.assertNotNull(TwitterObjectFactory.getRawJSON(favoritedStatus));
+        notifyResponse();
+    }
+
     @Override
     public void onException(Exception ex) {
         System.out.println("onException");