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/07/21 06:49:20 UTC
[05/18] git commit: Merge branch 'instagram' into STREAMS-122
Merge branch 'instagram' into STREAMS-122
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/7b301cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/7b301cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/7b301cea
Branch: refs/heads/master
Commit: 7b301ceaa358e6c572b95a0eff754a87cf9f6064
Parents: 3b98df8 a3f443f
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Tue Jul 1 17:11:28 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Tue Jul 1 17:11:28 2014 -0500
----------------------------------------------------------------------
.../streams-provider-instagram/README.md | 17 +
.../InstagramMediaDataActivitySerializer.mup | 894 +++++++++++++++++++
.../metadata/instagram_to_activity_mapping.png | Bin 0 -> 1123684 bytes
.../streams-provider-instagram/pom.xml | 139 +++
.../instagram/InstagramConfigurator.java | 78 ++
.../processor/InstagramTypeConverter.java | 190 ++++
.../provider/InstagramTimelineProvider.java | 409 +++++++++
.../InstagramJsonActivitySerializer.java | 60 ++
.../serializer/util/InstagramActivityUtil.java | 142 +++
.../serializer/util/InstagramDeserializer.java | 18 +
.../jsonschema/com/instagram/Instagram.json | 0
.../com/instagram/InstagramConfiguration.json | 20 +
.../InstagramUserInformationConfiguration.json | 17 +
.../src/main/resources/reference.conf | 5 +
.../test/InstagramActivitySerDeTest.java | 92 ++
.../src/test/resources/testMediaFeedObjects.txt | 0
.../src/test/resources/testtweets.txt | 695 ++++++++++++++
17 files changed, 2776 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7b301cea/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramDeserializer.java
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramDeserializer.java
index 0000000,0000000..b4aee2d
new file mode 100644
--- /dev/null
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramDeserializer.java
@@@ -1,0 -1,0 +1,18 @@@
++package org.apache.streams.instagram.serializer.util;
++
++import org.jinstagram.Instagram;
++import org.jinstagram.exceptions.InstagramException;
++
++/**
++ * Created by rdouglas on 7/1/14.
++ */
++public class InstagramDeserializer extends Instagram{
++ public InstagramDeserializer(String test) {
++ super(test);
++ }
++
++ @Override
++ public <T> T createObjectFromResponse(Class<T> clazz, String response) throws InstagramException {
++ return super.createObjectFromResponse(clazz, response);
++ }
++}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7b301cea/streams-contrib/streams-provider-instagram/src/main/jsonschema/com/instagram/Instagram.json
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-instagram/src/main/jsonschema/com/instagram/Instagram.json
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/streams-contrib/streams-provider-instagram/src/main/jsonschema/com/instagram/Instagram.json
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7b301cea/streams-contrib/streams-provider-instagram/src/test/resources/testMediaFeedObjects.txt
----------------------------------------------------------------------
diff --cc streams-contrib/streams-provider-instagram/src/test/resources/testMediaFeedObjects.txt
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/streams-contrib/streams-provider-instagram/src/test/resources/testMediaFeedObjects.txt