Merge branch '0.4-gplus'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/dd58c877 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/dd58c877 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/dd58c877 Branch: refs/heads/master Commit: dd58c877b89a00882e960e37e89259de6ebba4ce Parents: 104f29b ee1d3c0 Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Wed Oct 19 15:33:50 2016 -0500 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Wed Oct 19 15:33:50 2016 -0500 ---------------------------------------------------------------------- .../google-gplus/pom.xml | 9 ++- .../gplus/provider/AbstractGPlusProvider.java | 71 +++++++++++-------- .../provider/GPlusUserActivityCollector.java | 3 +- .../provider/GPlusUserActivityProvider.java | 68 ++++++++++++++++++ .../gplus/provider/GPlusUserDataCollector.java | 3 +- .../gplus/provider/GPlusUserDataProvider.java | 72 ++++++++++++++++++++ .../util/GPlusActivityDeserializer.java | 29 ++++---- .../util/GPlusPersonDeserializer.java | 12 ++-- .../serializer/util/GooglePlusActivityUtil.java | 4 +- .../google-gplus/src/site/markdown/index.md | 25 ++++++- .../processor/GooglePlusActivitySerDeIT.java | 4 +- .../providers/GPlusUserActivityProviderIT.java | 52 ++++++++++++++ .../test/providers/GPlusUserDataProviderIT.java | 52 ++++++++++++++ .../resources/GPlusUserActivityProviderIT.conf | 22 ++++++ .../test/resources/GPlusUserDataProviderIT.conf | 22 ++++++ 15 files changed, 392 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
