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/02/07 18:26:35 UTC

svn commit: r1565735 - in /incubator/streams/branches/sblackmon/streams-contrib: streams-provider-facebook/src/main/java/com/facebook/api/ streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/ streams-provider-gnip/gnip-edc-reddit/src/...

Author: sblackmon
Date: Fri Feb  7 17:26:34 2014
New Revision: 1565735

URL: http://svn.apache.org/r1565735
Log:
updated bc ActivitySerializer is now a typed interface

Modified:
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-facebook/src/main/java/com/facebook/api/FacebookPostActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/ActivityXMLActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/PowerTrackActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/pom.xml
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverXmlActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonEventActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
    incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-facebook/src/main/java/com/facebook/api/FacebookPostActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-facebook/src/main/java/com/facebook/api/FacebookPostActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-facebook/src/main/java/com/facebook/api/FacebookPostActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-facebook/src/main/java/com/facebook/api/FacebookPostActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.Js
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.streams.data.ActivitySerializer;
 import org.apache.streams.pojo.json.*;
-import org.joda.time.DateTime;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -36,7 +35,7 @@ import static org.apache.streams.data.ut
 /**
  * Serializes activity posts
  */
-public class FacebookPostActivitySerializer implements ActivitySerializer {
+public class FacebookPostActivitySerializer implements ActivitySerializer<String> {
 
     public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
     public static final String PROVIDER_NAME = "facebook";

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -20,7 +20,7 @@ import java.util.Map;
  * Time: 10:48 AM
  * To change this template use File | Settings | File Templates.
  */
-public class GPlusActivitySerializer implements ActivitySerializer {
+public class GPlusActivitySerializer implements ActivitySerializer<String> {
     private final static Logger LOGGER = LoggerFactory.getLogger(GPlusActivitySerializer.class);
 
     @Override

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -21,7 +21,7 @@ import java.util.Map;
  * Time: 8:32 AM
  * To change this template use File | Settings | File Templates.
  */
-public class RedditActivitySerializer implements ActivitySerializer{
+public class RedditActivitySerializer implements ActivitySerializer<String> {
     private final static Logger LOGGER = LoggerFactory.getLogger(RedditActivitySerializer.class);
 
     public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/ActivityXMLActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/ActivityXMLActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/ActivityXMLActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/ActivityXMLActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -35,7 +35,7 @@ import java.util.List;
  * Time: 3:07 PM
  * To change this template use File | Settings | File Templates.
  */
-public class ActivityXMLActivitySerializer implements ActivitySerializer {
+public class ActivityXMLActivitySerializer implements ActivitySerializer<String> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ActivityXMLActivitySerializer.class);
 

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/PowerTrackActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/PowerTrackActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/PowerTrackActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-gnip/gnip-powertrack/src/main/java/org/apache/streams/gnip/powertrack/PowerTrackActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -19,7 +19,7 @@ import java.util.List;
  * Time: 2:29 PM
  * To change this template use File | Settings | File Templates.
  */
-public class PowerTrackActivitySerializer implements ActivitySerializer {
+public class PowerTrackActivitySerializer implements ActivitySerializer<String> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PowerTrackActivitySerializer.class);
 

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/pom.xml?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/pom.xml (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/pom.xml Fri Feb  7 17:26:34 2014
@@ -12,7 +12,15 @@
     <artifactId>streams-provider-moreover</artifactId>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.streams</groupId>
+            <artifactId>streams-config</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -2,7 +2,6 @@ package org.apache.streams.data;
 
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
@@ -17,7 +16,7 @@ import java.util.List;
 /**
  * Deserializes Moreover JSON format into Activities
  */
-public class MoreoverJsonActivitySerializer implements ActivitySerializer {
+public class MoreoverJsonActivitySerializer implements ActivitySerializer<String> {
     @Override
     public String serializationFormat() {
         return "application/json+vnd.moreover.com.v1";

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverXmlActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverXmlActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverXmlActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverXmlActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -12,14 +12,13 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import java.io.StringReader;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 /**
  * Deserializes the Moreover Article XML and converts it to an instance of {@link Activity}
  */
-public class MoreoverXmlActivitySerializer implements ActivitySerializer {
+public class MoreoverXmlActivitySerializer implements ActivitySerializer<String> {
 
     //JAXBContext is threadsafe (supposedly)
     private final JAXBContext articleContext;

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonEventActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonEventActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonEventActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonEventActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -13,7 +13,6 @@ import org.apache.streams.pojo.json.Acti
 import org.apache.streams.pojo.json.Generator;
 import org.apache.streams.pojo.json.Icon;
 import org.apache.streams.pojo.json.Provider;
-import org.joda.time.DateTime;
 
 import java.io.IOException;
 import java.text.DateFormat;
@@ -32,7 +31,7 @@ import static org.apache.streams.data.ut
 * Time: 9:24 AM
 * To change this template use File | Settings | File Templates.
 */
-public abstract class TwitterJsonEventActivitySerializer implements ActivitySerializer {
+public abstract class TwitterJsonEventActivitySerializer implements ActivitySerializer<String> {
 
     public static final String DATE_FORMAT = "EEE MMM dd HH:mm:ss Z yyyy";
 

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonRetweetActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -22,7 +22,7 @@ import static org.apache.streams.data.ut
 * Time: 9:24 AM
 * To change this template use File | Settings | File Templates.
 */
-public class TwitterJsonRetweetActivitySerializer extends TwitterJsonEventActivitySerializer implements ActivitySerializer {
+public class TwitterJsonRetweetActivitySerializer extends TwitterJsonEventActivitySerializer implements ActivitySerializer<String> {
 
     public Activity convert(ObjectNode event) {
 

Modified: incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java?rev=1565735&r1=1565734&r2=1565735&view=diff
==============================================================================
--- incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java (original)
+++ incubator/streams/branches/sblackmon/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/serializer/TwitterJsonTweetActivitySerializer.java Fri Feb  7 17:26:34 2014
@@ -21,7 +21,7 @@ import static org.apache.streams.data.ut
 * Time: 9:24 AM
 * To change this template use File | Settings | File Templates.
 */
-public class TwitterJsonTweetActivitySerializer extends TwitterJsonEventActivitySerializer implements ActivitySerializer {
+public class TwitterJsonTweetActivitySerializer extends TwitterJsonEventActivitySerializer implements ActivitySerializer<String> {
 
     public Activity convert(ObjectNode event) {