You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/08 21:13:28 UTC
[37/38] incubator-streams git commit: Merge branch 'STREAMS-208' into
STREAMS-49
Merge branch 'STREAMS-208' into STREAMS-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/073b0830
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/073b0830
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/073b0830
Branch: refs/heads/STREAMS-49
Commit: 073b083000b365da2b850ea5b6d9da3f29a06770
Parents: 409b448 adbb1b8
Author: sblackmon <sb...@apache.org>
Authored: Fri Nov 7 11:54:02 2014 -0800
Committer: sblackmon <sb...@apache.org>
Committed: Fri Nov 7 11:54:02 2014 -0800
----------------------------------------------------------------------
pom.xml | 56 +++++
streams-contrib/streams-amazon-aws/pom.xml | 2 +-
.../org/apache/streams/s3/S3Configurator.java | 55 ++---
.../org/apache/streams/s3/S3PersistReader.java | 11 +-
.../org/apache/streams/s3/S3PersistWriter.java | 10 +-
.../org/apache/streams/s3/S3Configuration.json | 18 +-
streams-contrib/streams-persist-console/pom.xml | 34 +++
.../streams/console/ConsolePersistReader.java | 11 +-
.../streams/console/ConsolePersistWriter.java | 11 +-
.../processor/PercolateTagProcessor.java | 10 +-
.../ElasticsearchWriterConfiguration.json | 10 +
.../google-gplus/pom.xml | 2 +-
.../processor/GooglePlusTypeConverter.java | 94 +++++++
.../gplus/provider/GPlusActivitySerializer.java | 77 +-----
.../gplus/provider/GPlusEventProcessor.java | 3 -
.../util/GPlusActivityDeserializer.java | 162 +++++++++++++
.../util/GPlusPersonDeserializer.java | 107 ++++++++
.../serializer/util/GooglePlusActivityUtil.java | 242 +++++++++++++++++++
.../google/gplus/GooglePlusPersonSerDeTest.java | 97 ++++++++
.../processor/GooglePlusActivitySerDeTest.java | 112 +++++++++
.../processor/GooglePlusTypeConverterTest.java | 125 ++++++++++
.../resources/google_plus_activity_jsons.txt | 5 +
.../test/resources/google_plus_person_jsons.txt | 2 +
23 files changed, 1125 insertions(+), 131 deletions(-)
----------------------------------------------------------------------