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/27 15:07:52 UTC

git commit: these changes should go in a separate PR ensure ObjectType is set

Repository: incubator-streams
Updated Branches:
  refs/heads/blueprints 5f133579d -> 40fa8c015


these changes should go in a separate PR
ensure ObjectType is set


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/40fa8c01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/40fa8c01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/40fa8c01

Branch: refs/heads/blueprints
Commit: 40fa8c0158732ad59ee6fe62493f6fed328f4125
Parents: 5f13357
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Mon Oct 27 09:07:40 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Mon Oct 27 09:07:40 2014 -0500

----------------------------------------------------------------------
 .../twitter/processor/TwitterTypeConverter.java   | 18 +++++++++++++-----
 .../serializer/util/TwitterActivityUtil.java      |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40fa8c01/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
index 804aa14..5495174 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterTypeConverter.java
@@ -28,12 +28,10 @@ import org.apache.streams.core.StreamsDatum;
 import org.apache.streams.core.StreamsProcessor;
 import org.apache.streams.exceptions.ActivitySerializerException;
 import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.twitter.pojo.Delete;
-import org.apache.streams.twitter.pojo.Retweet;
-import org.apache.streams.twitter.pojo.Tweet;
-import org.apache.streams.twitter.pojo.UserstreamEvent;
+import org.apache.streams.twitter.pojo.*;
 import org.apache.streams.twitter.provider.TwitterEventClassifier;
-import org.apache.streams.twitter.serializer.*;
+import org.apache.streams.twitter.serializer.StreamsTwitterMapper;
+import org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,6 +79,16 @@ public class TwitterTypeConverter implements StreamsProcessor {
 
         Object result = null;
 
+        if ( inClass.equals( FriendList.class )) {
+            LOGGER.debug("FRIENDLIST");
+            return null;
+        }
+
+        if ( inClass.equals( UserstreamEvent.class )) {
+            LOGGER.debug("USERSTREAMEVENT");
+            return null;
+        }
+
         if( outClass.equals( Activity.class )) {
             LOGGER.debug("ACTIVITY");
             result = twitterJsonActivitySerializer.deserialize(

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/40fa8c01/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
index 56b7005..470f201 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/util/TwitterActivityUtil.java
@@ -191,7 +191,7 @@ public class TwitterActivityUtil {
                         .or(Optional.of(user.getId().toString()))
                         .orNull()
         ));
-
+        actor.setObjectType("page");
         actor.setDisplayName(user.getName());
         actor.setAdditionalProperty("handle", user.getScreenName());
         actor.setSummary(user.getDescription());