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:16 UTC
[25/38] incubator-streams git commit: Merge remote-tracking branch
'robdouglas/STREAMS-203'
Merge remote-tracking branch 'robdouglas/STREAMS-203'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/9aebd0b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/9aebd0b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/9aebd0b1
Branch: refs/heads/STREAMS-49
Commit: 9aebd0b1a49dccdf31365ac2f0d3043ffd45c762
Parents: 3341415 48b8b71
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Mon Nov 3 10:25:10 2014 -0600
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Mon Nov 3 10:25:10 2014 -0600
----------------------------------------------------------------------
.../processor/GooglePlusTypeConverter.java | 5 +-
.../gplus/provider/GPlusActivitySerializer.java | 77 +--------
.../gplus/provider/GPlusEventProcessor.java | 3 -
.../util/GPlusActivityDeserializer.java | 162 +++++++++++++++++++
.../serializer/util/GooglePlusActivityUtil.java | 143 +++++++++++++++-
.../processor/GooglePlusActivitySerDeTest.java | 112 +++++++++++++
.../processor/GooglePlusTypeConverterTest.java | 63 +++++---
.../resources/google_plus_activity_jsons.txt | 5 +
8 files changed, 467 insertions(+), 103 deletions(-)
----------------------------------------------------------------------