Merge branch '0.4-instagram'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/006234fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/006234fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/006234fb Branch: refs/heads/master Commit: 006234fb83adba6c12c745c0a0e0859e196392bf Parents: 91a70a8 3c19c0f Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Wed Oct 19 14:55:40 2016 -0500 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Wed Oct 19 14:55:40 2016 -0500 ---------------------------------------------------------------------- .../streams-provider-instagram/pom.xml | 22 ++- .../processor/InstagramTypeConverter.java | 58 +++---- .../instagram/provider/InstagramOauthToken.java | 2 +- .../InstagramRecentMediaCollector.java | 2 +- .../InstagramRecentMediaProvider.java | 76 ++++++++ .../userinfo/InstagramUserInfoCollector.java | 4 +- .../userinfo/InstagramUserInfoProvider.java | 82 +++++++++ .../InstagramJsonActivitySerializer.java | 78 --------- .../InstagramMediaFeedDataConverter.java | 83 +++++++++ .../InstagramUserInfoDataConverter.java | 95 ++++++++++ .../serializer/InstagramUserInfoSerializer.java | 101 ----------- .../serializer/util/InstagramActivityUtil.java | 7 +- .../serializer/util/InstagramDeserializer.java | 33 ---- .../src/main/resources/reference.conf | 2 - .../src/site/markdown/index.md | 27 +++ .../InstagramRecentMediaCollectorTest.java | 156 ----------------- .../InstagramRecentMediaProviderTest.java | 174 ------------------- .../InstagramUserInfoCollectorTest.java | 120 ------------- .../test/data/InstagramActivitySerDeIT.java | 131 -------------- .../data/InstagramMediaFeedDataConverterIT.java | 109 ++++++++++++ .../data/InstagramUserInfoDataConverterIT.java | 119 +++++++++++++ .../InstagramRecentMediaProviderIT.java | 60 +++++++ .../providers/InstagramUserInfoProviderIT.java | 60 +++++++ .../InstagramRecentMediaProviderIT.conf | 25 +++ .../resources/InstagramUserInfoProviderIT.conf | 25 +++ 25 files changed, 812 insertions(+), 839 deletions(-) ----------------------------------------------------------------------
