Merge branch 'STREAMS-212' of https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-212
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/612676d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/612676d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/612676d4 Branch: refs/heads/STREAMS-212 Commit: 612676d4e56a0011d5b402585745887849fcb349 Parents: aefa064 9bfaaa5 Author: sblackmon <[email protected]> Authored: Thu Nov 6 16:57:55 2014 -0800 Committer: sblackmon <[email protected]> Committed: Thu Nov 6 16:57:55 2014 -0800 ---------------------------------------------------------------------- .../DatasiftTypeConverterProcessor.java | 7 +- .../serializer/DatasiftActivitySerializer.java | 12 +- .../DatasiftDefaultActivitySerializer.java | 214 ------------------- .../DatasiftInstagramActivitySerializer.java | 8 +- .../DatasiftTweetActivitySerializer.java | 8 +- .../datasift/util/StreamsDatasiftMapper.java | 11 +- .../com/datasift/test/DatasiftSerDeTest.java | 18 +- .../DatasiftTypeConverterProcessorTest.java | 72 ------- .../DatasiftActivitySerializerTest.java | 6 +- .../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 +++ 24 files changed, 185 insertions(+), 760 deletions(-) ----------------------------------------------------------------------
