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/10/13 20:54:24 UTC
[1/2] git commit: STREAMS-192 | Including post (media) count whenever
we serialize an Instagram User's profile
Repository: incubator-streams
Updated Branches:
refs/heads/master fb9f10786 -> faf6d19d1
STREAMS-192 | Including post (media) count whenever we serialize an Instagram User's profile
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/94e6bc6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/94e6bc6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/94e6bc6f
Branch: refs/heads/master
Commit: 94e6bc6f3db0f5ea54a636e2034a625cd234c6e8
Parents: a7a4012
Author: Robert Douglas <rd...@w2ogroup.com>
Authored: Fri Oct 10 11:08:50 2014 -0500
Committer: Robert Douglas <rd...@w2ogroup.com>
Committed: Fri Oct 10 11:08:50 2014 -0500
----------------------------------------------------------------------
.../instagram/serializer/util/InstagramActivityUtil.java | 5 +++--
.../streams/twitter/test/InstagramActivitySerDeTest.java | 11 +----------
2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94e6bc6f/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
index 87c306f..a7894ae 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
@@ -59,8 +59,8 @@ public class InstagramActivityUtil {
activity.setPublished(new DateTime(Long.parseLong(item.getCreatedTime()) * 1000));
activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- item.getId())
+ Optional.fromNullable(
+ item.getId())
.orNull()));
activity.setProvider(getProvider());
@@ -104,6 +104,7 @@ public class InstagramActivityUtil {
extensions.put("followers", counts.getFollwed_by());
extensions.put("follows", counts.getFollows());
extensions.put("screenName", item.getUsername());
+ extensions.put("posts", counts.getMedia());
actor.setId(formatId(String.valueOf(item.getId())));
actor.setImage(image);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94e6bc6f/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeTest.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeTest.java
index de5e466..df468fa 100644
--- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeTest.java
+++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeTest.java
@@ -18,11 +18,8 @@
package org.apache.streams.twitter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang.StringUtils;
import org.apache.streams.instagram.serializer.util.InstagramDeserializer;
-import org.apache.streams.instagram.serializer.InstagramJsonActivitySerializer;
-import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.jinstagram.entity.users.basicinfo.UserInfoData;
import org.jinstagram.entity.users.feed.MediaFeedData;
@@ -40,13 +37,6 @@ import static org.apache.streams.instagram.serializer.util.InstagramActivityUtil
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
-/**
-* Created with IntelliJ IDEA.
-* User: sblackmon
-* Date: 8/20/13
-* Time: 5:57 PM
-* To change this template use File | Settings | File Templates.
-*/
public class InstagramActivitySerDeTest {
private final static Logger LOGGER = LoggerFactory.getLogger(InstagramActivitySerDeTest.class);
@@ -122,6 +112,7 @@ public class InstagramActivitySerDeTest {
assertThat(extensions.get("follows"), is(not(nullValue())));
assertThat(extensions.get("followers"), is(not(nullValue())));
assertThat(extensions.get("screenName"), is(not(nullValue())));
+ assertThat(extensions.get("posts"), is(not(nullValue())));
assertThat(activity.getActor().getAdditionalProperties().get("handle"), is(not(nullValue())));
assertThat(activity.getActor().getId(), is(not(nullValue())));
[2/2] git commit: Merge branch 'STREAMS-192'
Posted by sb...@apache.org.
Merge branch 'STREAMS-192'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/faf6d19d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/faf6d19d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/faf6d19d
Branch: refs/heads/master
Commit: faf6d19d11fec22ec72485fe4c82f584e0023ac7
Parents: fb9f107 94e6bc6
Author: sblackmon <sb...@apache.org>
Authored: Mon Oct 13 13:54:09 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Mon Oct 13 13:54:09 2014 -0500
----------------------------------------------------------------------
.../instagram/serializer/util/InstagramActivityUtil.java | 5 +++--
.../streams/twitter/test/InstagramActivitySerDeTest.java | 11 +----------
2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------