You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/05/27 18:37:28 UTC

[2/8] git commit: STREAMS-93 | Moved duplicated addExtensions() function up to TwitterJsonActivitySerializer class as a utility function

STREAMS-93 | Moved duplicated addExtensions() function up to TwitterJsonActivitySerializer class as a utility function


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2446c98d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2446c98d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2446c98d

Branch: refs/heads/master
Commit: 2446c98def7eceb5c7b747bf73242ccea03ce280
Parents: e29eadc
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Thu May 22 12:17:27 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Thu May 22 12:17:27 2014 -0500

----------------------------------------------------------------------
 .../TwitterJsonActivitySerializer.java          | 50 ++++++++++++++++++++
 .../TwitterJsonRetweetActivitySerializer.java   | 50 --------------------
 .../TwitterJsonTweetActivitySerializer.java     | 50 --------------------
 3 files changed, 50 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2446c98d/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java
index 766aaa6..9685af5 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivitySerializer.java
@@ -129,6 +129,56 @@ public class TwitterJsonActivitySerializer implements ActivitySerializer<String>
         return actor;
     }
 
+    public static void addTwitterExtensions(Activity activity, Tweet tweet) {
+        Map<String, Object> extensions = ensureExtensions(activity);
+
+        List<String> hashtags = new ArrayList<String>();
+        for(Hashtag hashtag : tweet.getEntities().getHashtags()) {
+            hashtags.add(hashtag.getText());
+        }
+        extensions.put("hashtags", hashtags);
+
+        Map<String, Object> likes = new HashMap<String, Object>();
+        likes.put("perspectival", tweet.getFavorited());
+        likes.put("count", tweet.getAdditionalProperties().get("favorite_count"));
+
+        extensions.put("likes", likes);
+
+        Map<String, Object> rebroadcasts = new HashMap<String, Object>();
+        rebroadcasts.put("perspectival", tweet.getRetweeted());
+        rebroadcasts.put("count", tweet.getRetweetCount());
+
+        extensions.put("rebroadcasts", rebroadcasts);
+
+        List<Map<String, Object>> userMentions = new ArrayList<Map<String, Object>>();
+        Entities entities = tweet.getEntities();
+
+        for(UserMentions user : entities.getUserMentions()) {
+            //Map the twitter user object into an actor
+            Map<String, Object> actor = new HashMap<String, Object>();
+            actor.put("id", "id:twitter:" + user.getIdStr());
+            actor.put("displayName", user.getScreenName());
+
+            userMentions.add(actor);
+        }
+
+        extensions.put("user_mentions", userMentions);
+
+        List<LinkDetails> urls = new ArrayList<LinkDetails>();
+        for(Url url : entities.getUrls()) {
+            LinkDetails linkDetails = new LinkDetails();
+
+            linkDetails.setFinalURL(url.getExpandedUrl());
+            linkDetails.setNormalizedURL(url.getDisplayUrl());
+            linkDetails.setOriginalURL(url.getUrl());
+
+            urls.add(linkDetails);
+        }
+        extensions.put("urls", urls);
+
+        extensions.put("keywords", tweet.getText());
+    }
+
     public static Provider getProvider() {
         Provider provider = new Provider();
         provider.setId("id:providers:twitter");

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2446c98d/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
index da086a6..a86c252 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
@@ -104,56 +104,6 @@ public class TwitterJsonRetweetActivitySerializer implements ActivitySerializer<
         return activity;
     }
 
-    public static void addTwitterExtensions(Activity activity, Tweet tweet) {
-        Map<String, Object> extensions = ensureExtensions(activity);
-
-        List<String> hashtags = new ArrayList<String>();
-        for(Hashtag hashtag : tweet.getEntities().getHashtags()) {
-            hashtags.add(hashtag.getText());
-        }
-        extensions.put("hashtags", hashtags);
-
-        Map<String, Object> likes = new HashMap<String, Object>();
-        likes.put("perspectival", tweet.getFavorited());
-        likes.put("count", tweet.getAdditionalProperties().get("favorite_count"));
-
-        extensions.put("likes", likes);
-
-        Map<String, Object> rebroadcasts = new HashMap<String, Object>();
-        rebroadcasts.put("perspectival", tweet.getRetweeted());
-        rebroadcasts.put("count", tweet.getRetweetCount());
-
-        extensions.put("rebroadcasts", rebroadcasts);
-
-        List<Map<String, Object>> userMentions = new ArrayList<Map<String, Object>>();
-        Entities entities = tweet.getEntities();
-
-        for(UserMentions user : entities.getUserMentions()) {
-            //Map the twitter user object into an actor
-            Map<String, Object> actor = new HashMap<String, Object>();
-            actor.put("id", "id:twitter:" + user.getIdStr());
-            actor.put("displayName", user.getScreenName());
-
-            userMentions.add(actor);
-        }
-
-        extensions.put("user_mentions", userMentions);
-
-        List<LinkDetails> urls = new ArrayList<LinkDetails>();
-        for(Url url : entities.getUrls()) {
-            LinkDetails linkDetails = new LinkDetails();
-
-            linkDetails.setFinalURL(url.getExpandedUrl());
-            linkDetails.setNormalizedURL(url.getDisplayUrl());
-            linkDetails.setOriginalURL(url.getUrl());
-
-            urls.add(linkDetails);
-        }
-        extensions.put("urls", urls);
-
-        extensions.put("keywords", tweet.getText());
-    }
-
     @Override
     public List<Activity> deserializeAll(List<String> serializedList) {
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2446c98d/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java
index b8de327..4e58694 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java
@@ -90,56 +90,6 @@ public class TwitterJsonTweetActivitySerializer implements ActivitySerializer<St
         return activity;
     }
 
-    public static void addTwitterExtensions(Activity activity, Tweet tweet) {
-        Map<String, Object> extensions = ensureExtensions(activity);
-
-        List<String> hashtags = new ArrayList<String>();
-        for(Hashtag hashtag : tweet.getEntities().getHashtags()) {
-            hashtags.add(hashtag.getText());
-        }
-        extensions.put("hashtags", hashtags);
-
-        Map<String, Object> likes = new HashMap<String, Object>();
-        likes.put("perspectival", tweet.getFavorited());
-        likes.put("count", tweet.getAdditionalProperties().get("favorite_count"));
-
-        extensions.put("likes", likes);
-
-        Map<String, Object> rebroadcasts = new HashMap<String, Object>();
-        rebroadcasts.put("perspectival", tweet.getRetweeted());
-        rebroadcasts.put("count", tweet.getRetweetCount());
-
-        extensions.put("rebroadcasts", rebroadcasts);
-
-        List<Map<String, Object>> userMentions = new ArrayList<Map<String, Object>>();
-        Entities entities = tweet.getEntities();
-
-        for(UserMentions user : entities.getUserMentions()) {
-            //Map the twitter user object into an actor
-            Map<String, Object> actor = new HashMap<String, Object>();
-            actor.put("id", "id:twitter:" + user.getIdStr());
-            actor.put("displayName", user.getScreenName());
-
-            userMentions.add(actor);
-        }
-
-        extensions.put("user_mentions", userMentions);
-
-        List<LinkDetails> urls = new ArrayList<LinkDetails>();
-        for(Url url : entities.getUrls()) {
-            LinkDetails linkDetails = new LinkDetails();
-
-            linkDetails.setFinalURL(url.getExpandedUrl());
-            linkDetails.setNormalizedURL(url.getDisplayUrl());
-            linkDetails.setOriginalURL(url.getUrl());
-
-            urls.add(linkDetails);
-        }
-        extensions.put("urls", urls);
-
-        extensions.put("keywords", tweet.getText());
-    }
-
     @Override
     public List<Activity> deserializeAll(List<String> serializedList) {
         return null;