Merge branch 'STREAMS-228'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e6794803 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e6794803 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e6794803 Branch: refs/heads/STREAMS-212 Commit: e679480308d67a3e9c2cc95fcb498bb173872748 Parents: efb9437 0e0d939 Author: sblackmon <[email protected]> Authored: Mon Dec 1 10:26:14 2014 -0600 Committer: sblackmon <[email protected]> Committed: Mon Dec 1 10:26:14 2014 -0600 ---------------------------------------------------------------------- .../http/processor/SimpleHTTPGetProcessor.java | 2 +- streams-contrib/pom.xml | 5 + .../streams-persist-elasticsearch/pom.xml | 5 + .../processor/PercolateTagProcessor.java | 3 +- .../peoplepattern/AccountTypeProcessor.java | 2 +- .../peoplepattern/DemographicsProcessor.java | 2 +- streams-contrib/streams-processor-regex/pom.xml | 6 +- .../regex/AbstractRegexExtensionExtractor.java | 5 +- .../regex/RegexHashtagExtractorTest.java | 4 +- .../regex/RegexMentionExtractorTest.java | 4 +- .../DatasiftInstagramActivitySerializer.java | 3 +- .../DatasiftInteractionActivitySerializer.java | 5 +- .../DatasiftTwitterActivitySerializer.java | 5 +- .../streams-provider-facebook/pom.xml | 5 + .../serializer/FacebookActivityUtil.java | 3 +- .../gnip-edc-googleplus/pom.xml | 6 + .../com/gplus/api/GPlusActivitySerializer.java | 4 +- .../gnip-edc-reddit/pom.xml | 6 + .../reddit/api/RedditActivitySerializer.java | 4 +- .../google-gmail/pom.xml | 4 + .../GMailMessageActivitySerializer.java | 15 +- .../google-gplus/pom.xml | 4 + .../serializer/util/GooglePlusActivityUtil.java | 3 +- .../streams-provider-instagram/pom.xml | 4 + .../serializer/util/InstagramActivityUtil.java | 5 +- .../streams-provider-moreover/pom.xml | 4 + .../apache/streams/data/util/MoreoverUtils.java | 5 +- streams-contrib/streams-provider-rss/pom.xml | 4 + .../serializer/SyndEntryActivitySerializer.java | 2 - .../streams-provider-sysomos/pom.xml | 4 + .../SysomosBeatActivityConverter.java | 3 +- .../streams-provider-twitter/README.markdown | 48 ------ .../streams-provider-twitter/README.md | 38 +++++ .../apache/streams/data/util/ExtensionUtil.java | 108 ------------- .../streams/pojo/extensions/ExtensionUtil.java | 154 +++++++++++++++++++ .../apache/streams/data/util/ActivityUtil.java | 3 + 36 files changed, 288 insertions(+), 199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e6794803/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java ---------------------------------------------------------------------- diff --cc streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java index 84bb9df,68ef3e7..62743af --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java @@@ -206,9 -207,9 +207,9 @@@ public class FacebookActivityUtil */ public static void buildExtensions(Activity activity, Post post) { ObjectMapper mapper = StreamsJacksonMapper.getInstance(); - Map<String, Object> extensions = ensureExtensions(activity); + Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity); - if(post.getLikes() != null) { + if(post.getLikes() != null && post.getLikes().size() > 0) { Map<String, Object> likes = Maps.newHashMap(); org.apache.streams.facebook.Like like = post.getLikes().get(0);
