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 15:27:52 UTC

[2/7] git commit: Updated serializers to use new utility class

Updated serializers to use new utility class


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

Branch: refs/heads/master
Commit: 37967fb095b66b8bf04c56a1b9122175c38f9551
Parents: cb46da2
Author: mfranklin <mf...@apache.org>
Authored: Mon May 26 20:45:46 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon May 26 20:45:46 2014 -0400

----------------------------------------------------------------------
 .../serializer/TwitterJsonActivitySerializer.java    | 15 ---------------
 .../TwitterJsonDeleteActivitySerializer.java         |  5 +++--
 .../TwitterJsonRetweetActivitySerializer.java        | 10 ++++------
 .../TwitterJsonTweetActivitySerializer.java          |  3 +--
 ...TwitterJsonUserstreameventActivitySerializer.java |  7 +++----
 5 files changed, 11 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/37967fb0/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 0ab3448..a236899 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
@@ -80,19 +80,4 @@ public class TwitterJsonActivitySerializer implements ActivitySerializer<String>
     public List<Activity> deserializeAll(List<String> serializedList) {
         throw new NotImplementedException();
     }
-
-    public static Provider getProvider() {
-        Provider provider = new Provider();
-        provider.setId("id:providers:twitter");
-        return provider;
-    }
-
-    public static void addTwitterExtension(Activity activity, ObjectNode event) {
-        Map<String, Object> extensions = org.apache.streams.data.util.ActivityUtil.ensureExtensions(activity);
-        extensions.put("twitter", event);
-    }
-
-    public static String formatId(String... idparts) {
-        return Joiner.on(":").join(Lists.asList("id:twitter", idparts));
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/37967fb0/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonDeleteActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonDeleteActivitySerializer.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonDeleteActivitySerializer.java
index 4a0f348..c98ed4b 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonDeleteActivitySerializer.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonDeleteActivitySerializer.java
@@ -16,7 +16,8 @@ import org.apache.streams.twitter.pojo.Tweet;
 import java.io.Serializable;
 import java.util.List;
 
-import static org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer.*;
+import static org.apache.streams.twitter.serializer.util.TwitterActivityUtil.*;
+
 
 /**
 * Created with IntelliJ IDEA.
@@ -61,7 +62,7 @@ public class TwitterJsonDeleteActivitySerializer implements ActivitySerializer<S
         activity.setActor(buildActor(delete));
         activity.setVerb("delete");
         activity.setObject(buildActivityObject(delete));
-        activity.setId(TwitterJsonActivitySerializer.formatId(activity.getVerb(), delete.getDelete().getStatus().getIdStr()));
+        activity.setId(formatId(activity.getVerb(), delete.getDelete().getStatus().getIdStr()));
         if(Strings.isNullOrEmpty(activity.getId()))
             throw new ActivitySerializerException("Unable to determine activity id");
         activity.setProvider(getProvider());

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/37967fb0/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 f8ade3f..f97650e 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
@@ -5,13 +5,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import org.apache.streams.data.ActivitySerializer;
 import org.apache.streams.exceptions.ActivitySerializerException;
 import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.ActivityObject;
 import org.apache.streams.pojo.json.Actor;
-import org.apache.streams.twitter.Url;
 import org.apache.streams.twitter.pojo.Retweet;
 import org.apache.streams.twitter.pojo.Tweet;
 import org.apache.streams.twitter.pojo.User;
@@ -22,8 +20,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer.*;
 import static org.apache.streams.data.util.ActivityUtil.ensureExtensions;
+import static org.apache.streams.twitter.serializer.util.TwitterActivityUtil.*;
 
 /**
 * Created with IntelliJ IDEA.
@@ -66,7 +64,7 @@ public class TwitterJsonRetweetActivitySerializer implements ActivitySerializer<
         activity.setVerb("share");
         if( retweet.getRetweetedStatus() != null )
             activity.setObject(buildActivityObject(retweet.getRetweetedStatus()));
-        activity.setId(TwitterJsonActivitySerializer.formatId(activity.getVerb(),
+        activity.setId(formatId(activity.getVerb(),
                 Optional.fromNullable(
                         retweet.getIdStr())
                         .or(Optional.of(retweet.getId().toString()))
@@ -81,7 +79,7 @@ public class TwitterJsonRetweetActivitySerializer implements ActivitySerializer<
         }
         //activity.setGenerator(buildGenerator(mapper));
         //activity.setIcon(getIcon(event));
-        activity.setProvider(TwitterJsonActivitySerializer.getProvider());
+        activity.setProvider(getProvider());
         activity.setTitle("");
         try {
             activity.setContent(retweet.getRetweetedStatus().getText());
@@ -131,7 +129,7 @@ public class TwitterJsonRetweetActivitySerializer implements ActivitySerializer<
     public static void addLocationExtension(Activity activity, Retweet retweet) {
         Map<String, Object> extensions = ensureExtensions(activity);
         Map<String, Object> location = new HashMap<String, Object>();
-        location.put("id", TwitterJsonActivitySerializer.formatId(retweet.getIdStr()));
+        location.put("id", formatId(retweet.getIdStr()));
         location.put("coordinates", retweet.getCoordinates());
         extensions.put("location", location);
     }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/37967fb0/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 1d00b7a..a5dc2de 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
@@ -9,7 +9,6 @@ import com.google.common.collect.Lists;
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.streams.data.ActivitySerializer;
 import org.apache.streams.exceptions.ActivitySerializerException;
-import org.apache.streams.jackson.StreamsJacksonMapper;
 import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.ActivityObject;
 import org.apache.streams.pojo.json.Actor;
@@ -23,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer.*;
 import static org.apache.streams.data.util.ActivityUtil.ensureExtensions;
+import static org.apache.streams.twitter.serializer.util.TwitterActivityUtil.*;
 
 /**
 * Created with IntelliJ IDEA.

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/37967fb0/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonUserstreameventActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonUserstreameventActivitySerializer.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonUserstreameventActivitySerializer.java
index c0768e3..359364a 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonUserstreameventActivitySerializer.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonUserstreameventActivitySerializer.java
@@ -10,13 +10,12 @@ import org.apache.streams.exceptions.ActivitySerializerException;
 import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.ActivityObject;
 import org.apache.streams.pojo.json.Actor;
-import org.apache.streams.twitter.pojo.Delete;
-import org.apache.streams.twitter.pojo.Tweet;
 import org.apache.streams.twitter.pojo.UserstreamEvent;
 
 import java.util.List;
 
-import static org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer.*;
+import static org.apache.streams.twitter.serializer.util.TwitterActivityUtil.*;
+
 
 /**
 * Created with IntelliJ IDEA.
@@ -61,7 +60,7 @@ public class TwitterJsonUserstreameventActivitySerializer implements ActivitySer
         activity.setActor(buildActor(event));
         activity.setVerb(detectVerb(event));
         activity.setObject(buildActivityObject(event));
-        activity.setId(TwitterJsonActivitySerializer.formatId(activity.getVerb()));
+        activity.setId(formatId(activity.getVerb()));
         if(Strings.isNullOrEmpty(activity.getId()))
             throw new ActivitySerializerException("Unable to determine activity id");
         activity.setProvider(getProvider());