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/11/14 01:29:01 UTC
[8/9] incubator-streams git commit: fixed pig runtime test
fixed pig runtime test
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/7a067ce1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/7a067ce1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/7a067ce1
Branch: refs/heads/STREAMS-68,218
Commit: 7a067ce133288fb79e41aed2fcc7ccd389ff1284
Parents: aad0e88
Author: sblackmon <sb...@apache.org>
Authored: Thu Nov 13 17:35:41 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Thu Nov 13 17:35:41 2014 -0600
----------------------------------------------------------------------
.../com/google/gplus/processor/GooglePlusCommentProcessor.java | 3 +++
.../com/google/gplus/processor/GooglePlusTypeConverter.java | 4 ++++
.../streams/instagram/processor/InstagramTypeConverter.java | 4 ++++
.../twitter/serializer/TwitterJsonActivityConverter.java | 6 ++++--
.../src/test/resources/pigserializertest.pig | 2 +-
5 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7a067ce1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java
index 583c741..8f0f491 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusCommentProcessor.java
@@ -32,6 +32,9 @@ import org.slf4j.LoggerFactory;
import java.util.List;
+/**
+ * Consider replacing this with a simpler Processer which extends SimpleHTTPGetProcessor
+ */
public class GooglePlusCommentProcessor implements StreamsProcessor {
private final static String STREAMS_ID = "GooglePlusCommentProcessor";
private final static Logger LOGGER = LoggerFactory.getLogger(GooglePlusCommentProcessor.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7a067ce1/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
index b4cf21d..472c145 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
@@ -30,6 +30,10 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Queue;
+@Deprecated
+/*
+ * Modules and streams should adopt TypeConverterProcessor and ActivityConverterProcessor
+ */
public class GooglePlusTypeConverter implements StreamsProcessor {
public final static String STREAMS_ID = "GooglePlusTypeConverter";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7a067ce1/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/processor/InstagramTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/processor/InstagramTypeConverter.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/processor/InstagramTypeConverter.java
index 7d3c4e9..6acbbdb 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/processor/InstagramTypeConverter.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/processor/InstagramTypeConverter.java
@@ -32,6 +32,10 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Queue;
+@Deprecated
+/*
+ * Modules and streams should adopt TypeConverterProcessor and ActivityConverterProcessor
+ */
public class InstagramTypeConverter implements StreamsProcessor {
public final static String STREAMS_ID = "InstagramTypeConverter";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7a067ce1/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivityConverter.java
index 3e123b6..5206b08 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonActivityConverter.java
@@ -58,11 +58,13 @@ public class TwitterJsonActivityConverter implements ActivityConverter<String>,
@Override
public Activity deserialize(String serialized) throws ActivitySerializerException {
- Class converterClass = TwitterDocumentClassifier.getInstance().detectClass(serialized);
+ Class documentClass = TwitterDocumentClassifier.getInstance().detectClass(serialized);
+
+ Class converterClass = TwitterConverterResolver.getInstance().bestSerializer(documentClass);
ActivityConverter converter = ActivityConverterFactory.getInstance(converterClass);
- Object typedObject = TypeConverterUtil.convert(serialized, converterClass);
+ Object typedObject = TypeConverterUtil.convert(serialized, documentClass);
Activity activity = converter.deserialize(typedObject);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/7a067ce1/streams-runtimes/streams-runtime-pig/src/test/resources/pigserializertest.pig
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/test/resources/pigserializertest.pig b/streams-runtimes/streams-runtime-pig/src/test/resources/pigserializertest.pig
index 8ea91d8..d388269 100644
--- a/streams-runtimes/streams-runtime-pig/src/test/resources/pigserializertest.pig
+++ b/streams-runtimes/streams-runtime-pig/src/test/resources/pigserializertest.pig
@@ -1,4 +1,4 @@
-DEFINE SERIALIZER org.apache.streams.pig.StreamsSerializerExec('org.apache.streams.twitter.serializer.TwitterJsonActivitySerializer');
+DEFINE SERIALIZER org.apache.streams.pig.StreamsSerializerExec('org.apache.streams.twitter.serializer.TwitterJsonActivityConverter');
in = LOAD '*' USING PigStorage('\t') AS (activityid: chararray, source: chararray, timestamp: long, object: chararray);
out = FOREACH in {
result = SERIALIZER(object);