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/07/14 18:55:53 UTC
[3/3] git commit: Merge PR50 for 'rbnks/STREAMS-127'
Merge PR50 for 'rbnks/STREAMS-127'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/853ae3c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/853ae3c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/853ae3c7
Branch: refs/heads/master
Commit: 853ae3c7ae708fecea790556ac3bfb6bc7078117
Parents: 38ed41a 62aab45
Author: mfranklin <mf...@apache.org>
Authored: Mon Jul 14 12:35:28 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Jul 14 12:35:28 2014 -0400
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 51 +-----
.../main/jsonschema/com/datasift/Datasift.json | 179 +------------------
.../com/datasift/DatasiftTwitterUser.json | 61 +++++++
3 files changed, 70 insertions(+), 221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/853ae3c7/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
index 05b579b,7b9ccb3..443aeec
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
@@@ -82,48 -79,11 +82,48 @@@ public class DatasiftTweetActivitySeria
return activity;
}
+ /**
+ * Get the links from this tweet as a list
+ * @param twitter
+ * @return the links from the tweet
+ */
+ public List<String> getLinks(Twitter twitter) {
+ return getLinks(twitter.getLinks());
+ }
+
+ /**
+ * Get the links from this tweet as a list
+ * @param retweet
+ * @return the links from the tweet
+ */
+ public List<String> getLinks(Retweet retweet) {
+ return getLinks(retweet.getLinks());
+ }
+
+ /**
+ * Converts the list of objects to a list of strings
+ * @param links
+ * @return
+ */
+ private List<String> getLinks(List<Object> links) {
+ if(links == null)
+ return Lists.newArrayList();
+ List<String> result = Lists.newLinkedList();
+ for(Object obj : links) {
+ if(obj instanceof String) {
+ result.add((String) obj);
+ } else {
+ LOGGER.warn("Links is not instance of String : {}", obj.getClass().getName());
+ }
+ }
+ return result;
+ }
+
public Actor buildActor(Datasift event, Twitter twitter) {
- User user = twitter.getUser();
+ DatasiftTwitterUser user = twitter.getUser();
Actor actor = super.buildActor(event.getInteraction());
if(user == null) {
- return retweetBuildActor(actor, twitter.getRetweet().getUser());
+ user = twitter.getRetweet().getUser();
}
actor.setDisplayName(user.getName());