Merge branch 'master' into STREAMS-216
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/966b12b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/966b12b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/966b12b3 Branch: refs/heads/master Commit: 966b12b388b2a95a143a89094a7298bceb3539a4 Parents: b9f3519 0ffc40e Author: Robert Douglas <[email protected]> Authored: Thu Nov 13 10:14:17 2014 -0600 Committer: Robert Douglas <[email protected]> Committed: Thu Nov 13 10:14:17 2014 -0600 ---------------------------------------------------------------------- .../streams/jackson/TypeConverterProcessor.java | 112 ++++++++ .../test/TypeConverterProcessorTest.java | 95 +++++++ .../DatasiftActivitySerializerProcessor.java | 89 ++++++ .../DatasiftTypeConverterProcessor.java | 7 +- .../serializer/DatasiftActivitySerializer.java | 12 +- .../DatasiftDefaultActivitySerializer.java | 214 --------------- .../serializer/DatasiftEventClassifier.java | 53 ++++ .../DatasiftInstagramActivitySerializer.java | 8 +- .../DatasiftInteractionActivitySerializer.java | 222 +++++++++++++++ .../DatasiftTweetActivitySerializer.java | 266 ------------------ .../DatasiftTwitterActivitySerializer.java | 272 +++++++++++++++++++ .../datasift/util/StreamsDatasiftMapper.java | 11 +- .../apache/streams/datasift/DatasiftPush.json | 30 ++ .../com/datasift/test/DatasiftSerDeTest.java | 18 +- .../DatasiftTypeConverterProcessorTest.java | 72 ----- .../DatasiftActivitySerializerTest.java | 82 +++--- .../serializer/DatasiftEventClassifierTest.java | 64 +++++ ...DatasiftInstagramActivitySerializerTest.java | 43 +++ ...tasiftInteractionActivitySerializerTest.java | 48 ++++ .../DatasiftTwitterActivitySerializerTest.java | 43 +++ .../streams-provider-twitter/pom.xml | 6 + .../processor/TwitterEventProcessor.java | 194 ------------- .../twitter/processor/TwitterTypeConverter.java | 209 -------------- .../provider/TwitterEventClassifier.java | 58 ++-- .../serializer/StreamsTwitterMapper.java | 11 +- .../TwitterJsonActivitySerializer.java | 24 +- .../TwitterJsonDeleteActivitySerializer.java | 6 + .../TwitterJsonRetweetActivitySerializer.java | 6 + .../TwitterJsonTweetActivitySerializer.java | 6 + .../TwitterJsonUserActivitySerializer.java | 6 + ...erJsonUserstreameventActivitySerializer.java | 6 + .../streams/twitter/test/SimpleTweetTest.java | 11 +- .../twitter/test/TweetActivitySerDeTest.java | 6 +- .../streams/twitter/test/TweetSerDeTest.java | 6 +- .../test/TwitterEventClassifierTest.java | 34 +++ .../streams/pig/test/PigProcessDatumTest.java | 2 - .../pig/test/PigProcessDocumentTest.java | 2 - .../streams/pig/test/PigSerializerTest.java | 3 +- 38 files changed, 1278 insertions(+), 1079 deletions(-) ----------------------------------------------------------------------
