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:51 UTC
[1/3] git commit: Created DatasiftTwitterUser object
Repository: incubator-streams
Updated Branches:
refs/heads/master 38ed41aeb -> 853ae3c7a
Created DatasiftTwitterUser object
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b7bf172a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b7bf172a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b7bf172a
Branch: refs/heads/master
Commit: b7bf172a623fa484e8068abe46ca0d39ed693593
Parents: c50ce91
Author: rebanks <re...@w2odigital.com>
Authored: Tue Jul 8 14:33:25 2014 -0500
Committer: rebanks <re...@w2odigital.com>
Committed: Tue Jul 8 14:33:25 2014 -0500
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 92 +++++-----
.../main/jsonschema/com/datasift/Datasift.json | 179 +------------------
.../com/datasift/DatasiftTwitterUser.json | 61 +++++++
3 files changed, 113 insertions(+), 219 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b7bf172a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git 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
index 3406eb4..269f12a 100644
--- 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
@@ -25,7 +25,7 @@ import com.google.common.collect.Maps;
import org.apache.streams.data.util.RFC3339Utils;
import org.apache.streams.datasift.Datasift;
import org.apache.streams.datasift.interaction.Interaction;
-import org.apache.streams.datasift.interaction.User;
+import org.apache.streams.datasift.twitter.DatasiftTwitterUser;
import org.apache.streams.datasift.twitter.Retweet;
import org.apache.streams.datasift.twitter.Twitter;
import org.apache.streams.pojo.json.Activity;
@@ -80,10 +80,10 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
}
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());
@@ -130,49 +130,49 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
}
//Need to make retweet user and tweet user the same object.
- public Actor retweetBuildActor(Actor actor, org.apache.streams.datasift.twitter.User user) {
-
- actor.setDisplayName(user.getName());
- actor.setId(formatId(Optional.fromNullable(
- user.getIdStr())
- .or(Optional.of(user.getId().toString()))
- .orNull()));
- actor.setSummary(user.getDescription());
- try {
- actor.setPublished(RFC3339Utils.parseToUTC(user.getCreatedAt()));
- } catch (Exception e) {
- LOGGER.warn("Exception trying to parse date : {}", e);
- }
-
- if(user.getUrl() != null) {
- actor.setUrl(user.getUrl());
- }
-
- Map<String, Object> extensions = new HashMap<String,Object>();
- extensions.put("location", user.getLocation());
- extensions.put("posts", user.getStatusesCount());
- extensions.put("followers", user.getFollowersCount());
- extensions.put("screenName", user.getScreenName());
- if(user.getAdditionalProperties() != null) {
- extensions.put("favorites", user.getAdditionalProperties().get("favourites_count"));
- }
-
- Image profileImage = new Image();
- String profileUrl = null;
- if(actor.getImage() == null && user.getAdditionalProperties() != null) {
- Object url = user.getAdditionalProperties().get("profile_image_url_https");
- if(url instanceof String)
- profileUrl = (String) url;
- }
- if(actor.getImage() == null && profileUrl == null) {
- profileUrl = user.getProfileImageUrl();
- }
- profileImage.setUrl(profileUrl);
- actor.setImage(profileImage);
-
- actor.setAdditionalProperty("extensions", extensions);
- return actor;
- }
+// public Actor retweetBuildActor(Actor actor, org.apache.streams.datasift.twitter.User user) {
+//
+// actor.setDisplayName(user.getName());
+// actor.setId(formatId(Optional.fromNullable(
+// user.getIdStr())
+// .or(Optional.of(user.getId().toString()))
+// .orNull()));
+// actor.setSummary(user.getDescription());
+// try {
+// actor.setPublished(RFC3339Utils.parseToUTC(user.getCreatedAt()));
+// } catch (Exception e) {
+// LOGGER.warn("Exception trying to parse date : {}", e);
+// }
+//
+// if(user.getUrl() != null) {
+// actor.setUrl(user.getUrl());
+// }
+//
+// Map<String, Object> extensions = new HashMap<String,Object>();
+// extensions.put("location", user.getLocation());
+// extensions.put("posts", user.getStatusesCount());
+// extensions.put("followers", user.getFollowersCount());
+// extensions.put("screenName", user.getScreenName());
+// if(user.getAdditionalProperties() != null) {
+// extensions.put("favorites", user.getAdditionalProperties().get("favourites_count"));
+// }
+//
+// Image profileImage = new Image();
+// String profileUrl = null;
+// if(actor.getImage() == null && user.getAdditionalProperties() != null) {
+// Object url = user.getAdditionalProperties().get("profile_image_url_https");
+// if(url instanceof String)
+// profileUrl = (String) url;
+// }
+// if(actor.getImage() == null && profileUrl == null) {
+// profileUrl = user.getProfileImageUrl();
+// }
+// profileImage.setUrl(profileUrl);
+// actor.setImage(profileImage);
+//
+// actor.setAdditionalProperty("extensions", extensions);
+// return actor;
+// }
public void addLocationExtension(Activity activity, Twitter twitter) {
Map<String, Object> extensions = ensureExtensions(activity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b7bf172a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
index e7b664a..8d7ff3a 100644
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
+++ b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
@@ -947,62 +947,8 @@
"type": "string"
},
"user": {
- "javaType": "org.apache.streams.datasift.twitter.User",
- "type": "object",
- "dynamic": "true",
- "properties": {
- "created_at": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "followers_count": {
- "type": "integer"
- },
- "friends_count": {
- "type": "integer"
- },
- "geo_enabled": {
- "type": "boolean"
- },
- "id": {
- "type": "integer"
- },
- "id_str": {
- "type": "string"
- },
- "lang": {
- "type": "string"
- },
- "listed_count": {
- "type": "integer"
- },
- "location": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "profile_image_url": {
- "type": "string"
- },
- "screen_name": {
- "type": "string"
- },
- "statuses_count": {
- "type": "integer"
- },
- "time_zone": {
- "type": "string"
- },
- "url": {
- "type": "string"
- },
- "utc_offset": {
- "type": "integer"
- }
- }
+ "type": "DatasiftTwitterUser",
+ "$ref": "./DatasiftTwitterUser.json"
}
}
},
@@ -1062,64 +1008,8 @@
"type": "string"
},
"user": {
- "javaType": "org.apache.streams.datasift.twitter.User",
- "dynamic": "true",
- "properties": {
- "created_at": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "followers_count": {
- "type": "integer"
- },
- "friends_count": {
- "type": "integer"
- },
- "geo_enabled": {
- "type": "boolean"
- },
- "id": {
- "type": "integer"
- },
- "id_str": {
- "type": "string"
- },
- "lang": {
- "type": "string"
- },
- "listed_count": {
- "type": "integer"
- },
- "location": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "profile_image_url": {
- "type": "string"
- },
- "screen_name": {
- "type": "string"
- },
- "statuses_count": {
- "type": "integer"
- },
- "time_zone": {
- "type": "string"
- },
- "url": {
- "type": "string"
- },
- "utc_offset": {
- "type": "integer"
- },
- "verified": {
- "type": "boolean"
- }
- }
+ "type": "DatasiftTwitterUser",
+ "$ref": "./DatasiftTwitterUser.json"
}
}
},
@@ -1130,65 +1020,8 @@
"type": "string"
},
"user": {
- "javaType": "org.apache.streams.datasift.interaction.User",
- "type": "object",
- "dynamic": "true",
- "properties": {
- "created_at": {
- "type": "string"
- },
- "description": {
- "type": "string"
- },
- "followers_count": {
- "type": "integer"
- },
- "friends_count": {
- "type": "integer"
- },
- "geo_enabled": {
- "type": "boolean"
- },
- "id": {
- "type": "integer"
- },
- "id_str": {
- "type": "string"
- },
- "lang": {
- "type": "string"
- },
- "listed_count": {
- "type": "integer"
- },
- "location": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "profile_image_url": {
- "type": "string"
- },
- "screen_name": {
- "type": "string"
- },
- "statuses_count": {
- "type": "integer"
- },
- "time_zone": {
- "type": "string"
- },
- "url": {
- "type": "string"
- },
- "utc_offset": {
- "type": "integer"
- },
- "verified": {
- "type": "boolean"
- }
- }
+ "type": "DatasiftTwitterUser",
+ "$ref": "./DatasiftTwitterUser.json"
}
}
},
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b7bf172a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
new file mode 100644
index 0000000..97d93fe
--- /dev/null
+++ b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
@@ -0,0 +1,61 @@
+{
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "javaType": "org.apache.streams.datasift.twitter.DatasiftTwitterUser",
+ "properties": {
+ "created_at": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ },
+ "followers_count": {
+ "type": "integer"
+ },
+ "friends_count": {
+ "type": "integer"
+ },
+ "geo_enabled": {
+ "type": "boolean"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "id_str": {
+ "type": "string"
+ },
+ "lang": {
+ "type": "string"
+ },
+ "listed_count": {
+ "type": "integer"
+ },
+ "location": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "profile_image_url": {
+ "type": "string"
+ },
+ "screen_name": {
+ "type": "string"
+ },
+ "statuses_count": {
+ "type": "integer"
+ },
+ "time_zone": {
+ "type": "string"
+ },
+ "url": {
+ "type": "string"
+ },
+ "utc_offset": {
+ "type": "integer"
+ },
+ "verified": {
+ "type": "boolean"
+ }
+ }
+}
\ No newline at end of file
[3/3] git commit: Merge PR50 for 'rbnks/STREAMS-127'
Posted by mf...@apache.org.
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());
[2/3] git commit: Removed commented out duplicate code
Posted by mf...@apache.org.
Removed commented out duplicate code
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/62aab459
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/62aab459
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/62aab459
Branch: refs/heads/master
Commit: 62aab4593027904adce63c1c7cc17d468d141e18
Parents: b7bf172
Author: rebanks <re...@w2odigital.com>
Authored: Tue Jul 8 14:34:46 2014 -0500
Committer: rebanks <re...@w2odigital.com>
Committed: Tue Jul 8 14:34:46 2014 -0500
----------------------------------------------------------------------
.../DatasiftTweetActivitySerializer.java | 45 --------------------
1 file changed, 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/62aab459/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
----------------------------------------------------------------------
diff --git 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
index 269f12a..7b9ccb3 100644
--- 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
@@ -129,51 +129,6 @@ public class DatasiftTweetActivitySerializer extends DatasiftDefaultActivitySeri
return actor;
}
- //Need to make retweet user and tweet user the same object.
-// public Actor retweetBuildActor(Actor actor, org.apache.streams.datasift.twitter.User user) {
-//
-// actor.setDisplayName(user.getName());
-// actor.setId(formatId(Optional.fromNullable(
-// user.getIdStr())
-// .or(Optional.of(user.getId().toString()))
-// .orNull()));
-// actor.setSummary(user.getDescription());
-// try {
-// actor.setPublished(RFC3339Utils.parseToUTC(user.getCreatedAt()));
-// } catch (Exception e) {
-// LOGGER.warn("Exception trying to parse date : {}", e);
-// }
-//
-// if(user.getUrl() != null) {
-// actor.setUrl(user.getUrl());
-// }
-//
-// Map<String, Object> extensions = new HashMap<String,Object>();
-// extensions.put("location", user.getLocation());
-// extensions.put("posts", user.getStatusesCount());
-// extensions.put("followers", user.getFollowersCount());
-// extensions.put("screenName", user.getScreenName());
-// if(user.getAdditionalProperties() != null) {
-// extensions.put("favorites", user.getAdditionalProperties().get("favourites_count"));
-// }
-//
-// Image profileImage = new Image();
-// String profileUrl = null;
-// if(actor.getImage() == null && user.getAdditionalProperties() != null) {
-// Object url = user.getAdditionalProperties().get("profile_image_url_https");
-// if(url instanceof String)
-// profileUrl = (String) url;
-// }
-// if(actor.getImage() == null && profileUrl == null) {
-// profileUrl = user.getProfileImageUrl();
-// }
-// profileImage.setUrl(profileUrl);
-// actor.setImage(profileImage);
-//
-// actor.setAdditionalProperty("extensions", extensions);
-// return actor;
-// }
-
public void addLocationExtension(Activity activity, Twitter twitter) {
Map<String, Object> extensions = ensureExtensions(activity);
Map<String, Object> location = Maps.newHashMap();