streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reba...@apache.org
Subject [3/4] incubator-streams git commit: Merge branch 'master' into STREAMS-220
Date Fri, 14 Nov 2014 17:52:10 GMT
Merge branch 'master' into STREAMS-220


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/5611aa74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/5611aa74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/5611aa74

Branch: refs/heads/master
Commit: 5611aa74c52e4bea77e6e536815ae59974359396
Parents: 3fa79f1 0ffc40e
Author: Robert Douglas <rdouglas@w2ogroup.com>
Authored: Thu Nov 13 09:49:11 2014 -0600
Committer: Robert Douglas <rdouglas@w2ogroup.com>
Committed: Thu Nov 13 09:49:11 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(-)
----------------------------------------------------------------------



Mime
View raw message