You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by re...@apache.org on 2015/01/07 18:30:53 UTC

[1/2] incubator-streams git commit: STREAMS-263 | Can now support Pages, in addition to Facebook Posts

Repository: incubator-streams
Updated Branches:
  refs/heads/master 3b0d65ba8 -> 0b612118a


STREAMS-263 | Can now support Pages, in addition to Facebook Posts


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

Branch: refs/heads/master
Commit: 0da739b55216424430b58ca80dbd8f85df719f50
Parents: 7f69bd4
Author: Robert Douglas <rd...@w2ogroup.com>
Authored: Tue Jan 6 15:40:22 2015 -0600
Committer: Robert Douglas <rd...@w2ogroup.com>
Committed: Tue Jan 6 15:40:22 2015 -0600

----------------------------------------------------------------------
 .../apache/streams/facebook/processor/FacebookTypeConverter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0da739b5/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/processor/FacebookTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/processor/FacebookTypeConverter.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/processor/FacebookTypeConverter.java
index d247e51..362ec10 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/processor/FacebookTypeConverter.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/processor/FacebookTypeConverter.java
@@ -24,10 +24,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
-import org.apache.streams.facebook.Page;
 import org.apache.streams.core.StreamsDatum;
 import org.apache.streams.core.StreamsProcessor;
 import org.apache.streams.exceptions.ActivitySerializerException;
+import org.apache.streams.facebook.Page;
 import org.apache.streams.facebook.Post;
 import org.apache.streams.facebook.api.FacebookPageActivitySerializer;
 import org.apache.streams.facebook.api.FacebookPostActivitySerializer;
@@ -175,7 +175,7 @@ public class FacebookTypeConverter implements StreamsProcessor {
 
                 if( out != null && validate(out, outClass))
                     result = new StreamsDatum(out);
-            } else if(item instanceof Post) {
+            } else if(item instanceof Post || item instanceof Page) {
                 Object out = convert(mapper.convertValue(item, ObjectNode.class), inClass, outClass);
 
                 if( out != null && validate(out, outClass))


[2/2] incubator-streams git commit: Merge remote-tracking branch 'robdouglas/STREAMS-263'

Posted by re...@apache.org.
Merge remote-tracking branch 'robdouglas/STREAMS-263'


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

Branch: refs/heads/master
Commit: 0b612118a2aa718c0f7cd92c814b83b2f025599b
Parents: 3b0d65b 0da739b
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Wed Jan 7 11:15:44 2015 -0600
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Wed Jan 7 11:15:44 2015 -0600

----------------------------------------------------------------------
 .../apache/streams/facebook/processor/FacebookTypeConverter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------