Fixed merge error for PR#26
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8d7cf5c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8d7cf5c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8d7cf5c0 Branch: refs/heads/master Commit: 8d7cf5c0a4ea7accd5d4e1f59c8daf2b9c4dd484 Parents: 2fa748e Author: mfranklin <[email protected]> Authored: Tue May 27 12:53:12 2014 -0400 Committer: mfranklin <[email protected]> Committed: Tue May 27 12:53:12 2014 -0400 ---------------------------------------------------------------------- .../streams/twitter/serializer/util/TwitterActivityUtil.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8d7cf5c0/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java index 8ead14c..feb6978 100644 --- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java +++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java @@ -75,13 +75,7 @@ public class TwitterActivityUtil { activity.setProvider(getProvider()); activity.setUrl(String.format("http://twitter.com/%s/%s/%s";, tweet.getUser().getScreenName(),"/status/",tweet.getIdStr())); - activity.setTitle(""); - activity.setContent(tweet.getText()); - activity.setLinks(getLinks(tweet)); - addTwitterExtension(activity, mapper.convertValue(tweet, ObjectNode.class)); - addLocationExtension(activity, tweet); - addTwitterExtensions(activity, tweet); } /** @@ -138,6 +132,8 @@ public class TwitterActivityUtil { activity.setObject(buildActivityObject(tweet)); activity.setLinks(getLinks(tweet)); activity.setContent(tweet.getText()); + addLocationExtension(activity, tweet); + addTwitterExtensions(activity, tweet); } }
