You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sm...@apache.org on 2016/10/23 03:29:00 UTC
incubator-streams git commit: Trivial fixes,
this closes apache/incubator-streams#315
Repository: incubator-streams
Updated Branches:
refs/heads/master 15379608f -> b13d8d631
Trivial fixes, this closes apache/incubator-streams#315
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b13d8d63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b13d8d63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b13d8d63
Branch: refs/heads/master
Commit: b13d8d6312cb36675699bc7d14a3dc49c2c6e88b
Parents: 1537960
Author: smarthi <sm...@apache.org>
Authored: Sat Oct 22 23:28:32 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Sat Oct 22 23:28:32 2016 -0400
----------------------------------------------------------------------
incubator-streams-master-pom.xml | 8 ++---
.../converter/ActivityConverterUtil.java | 19 ++++++-----
.../converter/BaseDocumentClassifier.java | 13 ++++---
.../test/TypeConverterProcessorTest.java | 7 ++--
.../serializer/FacebookActivityUtil.java | 26 +++++++-------
.../GMailMessageActivitySerializer.java | 12 ++-----
.../serializer/util/GooglePlusActivityUtil.java | 22 ++++++------
.../processor/GooglePlusActivitySerDeIT.java | 10 +++---
.../apache/streams/moreover/MoreoverUtils.java | 27 +++++++++++----
.../SysomosBeatActivityConverter.java | 15 +++++---
.../twitter/converter/StreamsTwitterMapper.java | 9 +++--
.../converter/TwitterDateTimeFormat.java | 3 --
.../converter/TwitterDocumentClassifier.java | 11 +++---
.../converter/util/TwitterActivityUtil.java | 34 +++++++++---------
.../FetchAndReplaceTwitterProcessor.java | 7 ++--
.../provider/TwitterStreamProcessor.java | 16 ++++-----
.../test/data/TwitterObjectMapperIT.java | 11 +++---
.../utils/TwitterActivityConvertersTest.java | 6 ++--
.../TwitterActivityObjectsConvertersTest.java | 3 +-
.../streams/pojo/extensions/ExtensionUtil.java | 36 +++++++++-----------
.../apache/streams/data/util/ActivityUtil.java | 2 +-
.../pojo/test/CustomDateTimeFormatTest.java | 4 ---
22 files changed, 148 insertions(+), 153 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/incubator-streams-master-pom.xml
----------------------------------------------------------------------
diff --git a/incubator-streams-master-pom.xml b/incubator-streams-master-pom.xml
index 5246931..3a9dae1 100644
--- a/incubator-streams-master-pom.xml
+++ b/incubator-streams-master-pom.xml
@@ -163,8 +163,8 @@
<jaxb2.version>0.8.3</jaxb2.version>
<jaxb2-basics.version>0.8.4</jaxb2-basics.version>
<jaxbutil.version>1.2.6</jaxbutil.version>
- <junit.version>4.11</junit.version>
- <slf4j.version>1.7.6</slf4j.version>
+ <junit.version>4.12</junit.version>
+ <slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.16</log4j.version>
<logback.version>1.1.1</logback.version>
<hamcrest.version>1.3</hamcrest.version>
@@ -175,8 +175,8 @@
<typesafe.config.version>1.2.0</typesafe.config.version>
<reflections.version>0.9.9</reflections.version>
<orgjson.version>20140107</orgjson.version>
- <guava.version>17.0</guava.version>
- <scala.version>2.8.0</scala.version>
+ <guava.version>19.0</guava.version>
+ <scala.version>2.11.0</scala.version>
<clojure.version>1.4.0</clojure.version>
<zookeeper.version>3.4.5</zookeeper.version>
<netty.version>3.8.0.Final</netty.version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
index 9f770b5..b42eb71 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
@@ -21,8 +21,7 @@ package org.apache.streams.converter;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.streams.data.ActivityConverter;
import org.apache.streams.data.DocumentClassifier;
import org.apache.streams.data.util.ActivityUtil;
@@ -35,11 +34,13 @@ import org.reflections.util.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
/**
* ActivityConverterUtil converts document into all possible Activity
@@ -70,8 +71,8 @@ public class ActivityConverterUtil {
return new ActivityConverterUtil(configuration);
}
- private List<DocumentClassifier> classifiers = Lists.newLinkedList();
- private List<ActivityConverter> converters = Lists.newLinkedList();
+ private List<DocumentClassifier> classifiers = new LinkedList<>();
+ private List<ActivityConverter> converters = new LinkedList<>();
/*
Use getInstance to get a globally shared thread-safe ActivityConverterUtil,
@@ -90,7 +91,7 @@ public class ActivityConverterUtil {
}
public List<Activity> convert(Object document) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
List<Class> detectedClasses = detectClasses(document);
@@ -128,7 +129,7 @@ public class ActivityConverterUtil {
protected List<Activity> applyConverter(ActivityConverter converter, Object typedDoc) {
- List<Activity> activities = Lists.newArrayList();
+ List<Activity> activities = new ArrayList<>();
// if the document can be typed as the required class
if( typedDoc != null ) {
@@ -145,7 +146,7 @@ public class ActivityConverterUtil {
protected List<Activity> convertToActivity(ActivityConverter converter, Object document) {
- List<Activity> activities = Lists.newArrayList();
+ List<Activity> activities = new ArrayList<>();
try {
activities = converter.toActivityList(document);
} catch (ActivityConversionException e1) {
@@ -197,7 +198,7 @@ public class ActivityConverterUtil {
private Map<Class, Object> convertToDetectedClasses(List<Class> datumClasses, Object document) {
- Map<Class, Object> convertedDocuments = Maps.newHashMap();
+ Map<Class, Object> convertedDocuments = new HashMap<>();
for( Class detectedClass : datumClasses ) {
Object typedDoc;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseDocumentClassifier.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseDocumentClassifier.java
index 4c38a5f..d39c087 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseDocumentClassifier.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseDocumentClassifier.java
@@ -21,19 +21,18 @@ package org.apache.streams.converter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import org.apache.streams.data.DocumentClassifier;
import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
* BaseDocumentClassifier is included by default in all
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * @see org.apache.streams.converter.ActivityConverterProcessor
*
* Ensures generic String and ObjectNode documents can be converted to Activity
*
@@ -46,10 +45,10 @@ public class BaseDocumentClassifier implements DocumentClassifier {
@SuppressWarnings("unchecked")
public List<Class> detectClasses(Object document) {
- Activity activity = null;
+ Activity activity;
ObjectNode node = null;
- List<Class> classes = Lists.newArrayList();
+ List<Class> classes = new ArrayList<>();
// Soon javax.validation will available in jackson
// That will make this simpler and more powerful
if( document instanceof String ) {
@@ -62,11 +61,11 @@ public class BaseDocumentClassifier implements DocumentClassifier {
try {
node = this.mapper.readValue((String)document, ObjectNode.class);
classes.add(ObjectNode.class);
- } catch (IOException e2) { }
+ } catch (IOException ignored) { }
}
} else if( document instanceof ObjectNode ){
classes.add(ObjectNode.class);
- activity = this.mapper.convertValue((ObjectNode)document, Activity.class);
+ activity = this.mapper.convertValue(document, Activity.class);
if(ActivityUtil.isValid(activity))
classes.add(Activity.class);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TypeConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TypeConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TypeConverterProcessorTest.java
index 0abc23e..1a32f01 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TypeConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TypeConverterProcessorTest.java
@@ -32,11 +32,14 @@ import org.junit.Test;
import java.io.IOException;
import java.util.List;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests for
- * @see {@link org.apache.streams.converter.TypeConverterProcessor}
+ * @see org.apache.streams.converter.TypeConverterProcessor
*/
public class TypeConverterProcessorTest {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
index 7c945a7..0cc9d69 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.facebook.Cover;
import org.apache.streams.facebook.Datum;
@@ -42,12 +42,11 @@ import org.apache.streams.pojo.json.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.streams.data.util.ActivityUtil.*;
-
public class FacebookActivityUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(FacebookActivityUtil.class);
@@ -77,7 +76,7 @@ public class FacebookActivityUtil {
activity.setPublished(post.getCreatedTime());
if(post.getLink() != null && post.getLink().length() > 0) {
- List<String> links = Lists.newArrayList();
+ List<String> links = new ArrayList<>();
links.add(post.getLink());
activity.setLinks(links);
}
@@ -90,7 +89,7 @@ public class FacebookActivityUtil {
}
/**
- * Builds out the {@link org.apache.streams.pojo.json.ActivityObject} from the given {@link org.apache.streams.pojo.json.Post}
+ * Builds out the {@link org.apache.streams.pojo.json.ActivityObject} from the given {@link Post}
* @param post
* @return {@link org.apache.streams.pojo.json.ActivityObject}
*/
@@ -165,7 +164,7 @@ public class FacebookActivityUtil {
}
/**
- * Builds an {@link org.apache.streams.pojo.json.Actor} object from the {@link org.apache.streams.pojo.json.Post}
+ * Builds an {@link org.apache.streams.pojo.json.Actor} object from the {@link Post}
* @param post
* @return {@link org.apache.streams.pojo.json.Actor}
*/
@@ -176,7 +175,7 @@ public class FacebookActivityUtil {
actor.setId(formatId(
Optional.fromNullable(
post.getFrom().getId())
- .or(Optional.of(post.getFrom().getId().toString()))
+ .or(Optional.of(post.getFrom().getId()))
.orNull()
));
@@ -195,7 +194,7 @@ public class FacebookActivityUtil {
* @param page
*/
public static void buildExtensions(Actor actor, Page page) {
- Map<String, Object> extensions = new HashMap<String, Object>();
+ Map<String, Object> extensions = new HashMap<>();
Location location = page.getLocation();
if(location != null)
@@ -214,12 +213,13 @@ public class FacebookActivityUtil {
* @param activity
* @param post
*/
+ @SuppressWarnings("unchecked")
public static void buildExtensions(Activity activity, Post post) {
ObjectMapper mapper = StreamsJacksonMapper.getInstance();
Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
if(post.getLikes() != null && post.getLikes().size() > 0) {
- Map<String, Object> likes = Maps.newHashMap();
+ Map<String, Object> likes = new HashMap<>();
org.apache.streams.facebook.Like like = post.getLikes().get(0);
if(like.getAdditionalProperties().containsKey("data")) {
@@ -228,7 +228,7 @@ public class FacebookActivityUtil {
}
if(post.getShares() != null) {
- Map<String, Object> shares = Maps.newHashMap();
+ Map<String, Object> shares = new HashMap<>();
shares.put("count", ((Map<String, Object>)post.getShares()).get("count"));
extensions.put("rebroadcasts", shares);
}
@@ -236,10 +236,10 @@ public class FacebookActivityUtil {
if(post.getTo() != null) {
To to = post.getTo();
List<Datum> data = to.getData();
- extensions.put("user_mentions", Lists.newArrayList());
+ extensions.put("user_mentions", new ArrayList<>());
for(Datum d : data) {
- Map<String, String> mention = Maps.newHashMap();
+ Map<String, String> mention = new HashMap<>();
mention.put("id", d.getId());
mention.put("displayName", d.getName());
@@ -252,7 +252,7 @@ public class FacebookActivityUtil {
if(post.getPlace() != null) {
Place place = post.getPlace();
if(place.getAdditionalProperties().containsKey("location")) {
- extensions.put(LOCATION_EXTENSION, place.getAdditionalProperties().get("location"));
+ extensions.put(ActivityUtil.LOCATION_EXTENSION, place.getAdditionalProperties().get("location"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
index 7592bab..7b624ba 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
@@ -50,25 +50,17 @@ import javax.mail.internet.MimeMultipart;
import java.util.List;
import java.util.Map;
-/**
-* Created with IntelliJ IDEA.
-* User: mdelaet
-* Date: 9/30/13
-* Time: 9:24 AM
-* To change this template use File | Settings | File Templates.
-*/
public class GMailMessageActivitySerializer implements ActivitySerializer<GmailMessage> {
private static final Logger LOGGER = LoggerFactory.getLogger(GMailMessageActivitySerializer.class);
- GMailProvider provider;
-
- ObjectMapper mapper = new ObjectMapper();
+ private GMailProvider provider;
public GMailMessageActivitySerializer(GMailProvider provider) {
this.provider = provider;
+ ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, Boolean.FALSE);
mapper.addMixInAnnotations(IMAPSSLStore.class, MessageMixIn.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
index fb16180..5da7037 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
@@ -22,6 +22,10 @@ package com.google.gplus.serializer.util;
import com.google.api.client.util.Maps;
import com.google.api.services.plus.model.Comment;
import com.google.api.services.plus.model.Person;
+import com.google.common.base.Joiner;
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
@@ -29,17 +33,13 @@ import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
-import org.apache.streams.exceptions.ActivitySerializerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-
-import static org.apache.streams.data.util.ActivityUtil.ensureExtensions;
+import java.util.Map;
public class GooglePlusActivityUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(GooglePlusActivityUtil.class);
@@ -76,7 +76,7 @@ public class GooglePlusActivityUtil {
addComment(activity, comment);
}
- Map<String, Object> extensions = ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
extensions.put("comment_count", comments.size());
}
@@ -189,7 +189,7 @@ public class GooglePlusActivityUtil {
activityObject.setContent(object.getContent());
activityObject.setObjectType(object.getObjectType());
- java.util.List<ActivityObject> attachmentsList = Lists.newArrayList();
+ java.util.List<ActivityObject> attachmentsList = new ArrayList<>();
for (com.google.api.services.plus.model.Activity.PlusObject.Attachments attachments : object.getAttachments()) {
ActivityObject attach = new ActivityObject();
@@ -220,7 +220,7 @@ public class GooglePlusActivityUtil {
* out {@link org.apache.streams.pojo.json.Actor} object
*
* @param gPlusActor
- * @return
+ * @return {@link Actor}
*/
private static Actor buildActor(com.google.api.services.plus.model.Activity.Actor gPlusActor) {
Actor actor = new Actor();
@@ -267,7 +267,7 @@ public class GooglePlusActivityUtil {
}
actor.setImage(image);
- Map<String, Object> extensions = new HashMap<String, Object>();
+ Map<String, Object> extensions = new HashMap<>();
extensions.put("followers", person.getCircledByCount());
extensions.put("googleplus", person);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
index 7edce7d..1c67802 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
@@ -19,7 +19,8 @@
package com.google.gplus.processor;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
@@ -30,7 +31,6 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,6 @@ import static org.junit.Assert.assertNotNull;
public class GooglePlusActivitySerDeIT {
private final static Logger LOGGER = LoggerFactory.getLogger(GooglePlusActivitySerDeIT.class);
private ObjectMapper objectMapper;
- private GooglePlusActivityUtil googlePlusActivityUtil;
@Before
public void setup() {
@@ -58,11 +57,10 @@ public class GooglePlusActivitySerDeIT {
simpleModule.addDeserializer(com.google.api.services.plus.model.Activity.class, new GPlusActivityDeserializer());
objectMapper.registerModule(simpleModule);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
- googlePlusActivityUtil = new GooglePlusActivityUtil();
}
@Test
+ @SuppressWarnings("unchecked")
public void TestActivityObjects() {
InputStream is = GooglePlusActivitySerDeIT.class.getResourceAsStream("/google_plus_activity_jsons.txt");
InputStreamReader isr = new InputStreamReader(is);
@@ -77,7 +75,7 @@ public class GooglePlusActivitySerDeIT {
com.google.api.services.plus.model.Activity gPlusActivity = objectMapper.readValue(line, com.google.api.services.plus.model.Activity.class);
- googlePlusActivityUtil.updateActivity(gPlusActivity, activity);
+ GooglePlusActivityUtil.updateActivity(gPlusActivity, activity);
LOGGER.info("activity: {}", activity);
assertNotNull(activity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
index 45d26df..3940a7c 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
@@ -18,7 +18,12 @@
package org.apache.streams.moreover;
-import com.moreover.api.*;
+import com.moreover.api.Article;
+import com.moreover.api.Author;
+import com.moreover.api.AuthorPublishingPlatform;
+import com.moreover.api.Feed;
+import com.moreover.api.Source;
+import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
@@ -29,9 +34,17 @@ import org.joda.time.DateTime;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static org.apache.streams.data.util.ActivityUtil.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.streams.data.util.ActivityUtil.LANGUAGE_EXTENSION;
+import static org.apache.streams.data.util.ActivityUtil.LOCATION_EXTENSION;
+import static org.apache.streams.data.util.ActivityUtil.LOCATION_EXTENSION_COUNTRY;
+import static org.apache.streams.data.util.ActivityUtil.getObjectId;
+import static org.apache.streams.data.util.ActivityUtil.getProviderId;
/**
* Provides utilities for Moroever data
@@ -67,7 +80,7 @@ public class MoreoverUtils {
}
private static List convertLinks(Article article) {
- List list = new LinkedList();
+ List<String> list = new LinkedList<>();
Article.OutboundUrls outboundUrls = article.getOutboundUrls();
if (outboundUrls != null) {
for (String url : outboundUrls.getOutboundUrl()) {
@@ -110,7 +123,7 @@ public class MoreoverUtils {
Actor actor = new Actor();
AuthorPublishingPlatform platform = author.getPublishingPlatform();
String userId = platform.getUserId();
- if (userId != null) actor.setId(getPersonId(getProviderID(platformName), userId));
+ if (userId != null) actor.setId(ActivityUtil.getPersonId(getProviderID(platformName), userId));
actor.setDisplayName(author.getName());
actor.setUrl(author.getHomeUrl());
actor.setSummary(author.getDescription());
@@ -122,7 +135,7 @@ public class MoreoverUtils {
Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
String country = value.getLocation().getCountryCode() == null ? value.getLocation().getCountry() : value.getLocation().getCountryCode();
if (country != null) {
- Map<String, Object> location = new HashMap<String, Object>();
+ Map<String, Object> location = new HashMap<>();
location.put(LOCATION_EXTENSION_COUNTRY, country);
extensions.put(LOCATION_EXTENSION, location);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
index a86259e..66beaed 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
@@ -19,7 +19,6 @@
package org.apache.streams.sysomos.conversion;
-import com.google.common.collect.Maps;
import com.sysomos.xml.BeatApi;
import org.apache.commons.lang.StringUtils;
import org.apache.streams.pojo.extensions.ExtensionUtil;
@@ -29,16 +28,22 @@ import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
+import java.util.HashMap;
import java.util.Map;
-import static org.apache.streams.data.util.ActivityUtil.*;
+import static org.apache.streams.data.util.ActivityUtil.LANGUAGE_EXTENSION;
+import static org.apache.streams.data.util.ActivityUtil.LOCATION_EXTENSION;
+import static org.apache.streams.data.util.ActivityUtil.LOCATION_EXTENSION_COUNTRY;
+import static org.apache.streams.data.util.ActivityUtil.getObjectId;
+import static org.apache.streams.data.util.ActivityUtil.getPersonId;
+import static org.apache.streams.data.util.ActivityUtil.getProviderId;
/**
* Converts an instance of a {@link com.sysomos.xml.BeatApi.BeatResponse.Beat} to an {@link org.apache.streams.pojo.json.Activity}
*/
public class SysomosBeatActivityConverter {
- public static final String LANGUAGE_KEY = "LANGUAGE";
+ private static final String LANGUAGE_KEY = "LANGUAGE";
public Activity convert(BeatApi.BeatResponse.Beat beat) {
Activity converted = new Activity();
@@ -111,7 +116,7 @@ public class SysomosBeatActivityConverter {
if (extensions.containsKey(LOCATION_EXTENSION)) {
location = (Map<String, Object>) extensions.get(LOCATION_EXTENSION);
} else {
- location = Maps.newHashMap();
+ location = new HashMap<>();
extensions.put(LOCATION_EXTENSION, location);
}
location.put(LOCATION_EXTENSION_COUNTRY, country);
@@ -127,7 +132,7 @@ public class SysomosBeatActivityConverter {
}
protected Map<String, BeatApi.BeatResponse.Beat.Tag> mapTags(BeatApi.BeatResponse.Beat beat) {
- Map<String, BeatApi.BeatResponse.Beat.Tag> tags = Maps.newHashMap();
+ Map<String, BeatApi.BeatResponse.Beat.Tag> tags = new HashMap<>();
for(BeatApi.BeatResponse.Beat.Tag tag : beat.getTag()) {
if(tag.getSystemType() != null) {
tags.put(tag.getSystemType().trim(), tag);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/StreamsTwitterMapper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/StreamsTwitterMapper.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/StreamsTwitterMapper.java
index 2662b69..aca185c 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/StreamsTwitterMapper.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/StreamsTwitterMapper.java
@@ -43,12 +43,11 @@ public class StreamsTwitterMapper extends StreamsJacksonMapper {
public static final DateTimeFormatter TWITTER_FORMATTER = DateTimeFormat.forPattern(TWITTER_FORMAT);
- public static final Long getMillis(String dateTime) {
+ public static Long getMillis(String dateTime) {
// this function is for pig which doesn't handle exceptions well
try {
- Long result = TWITTER_FORMATTER.parseMillis(dateTime);
- return result;
+ return TWITTER_FORMATTER.parseMillis(dateTime);
} catch( Exception e ) {
return null;
}
@@ -72,10 +71,10 @@ public class StreamsTwitterMapper extends StreamsJacksonMapper {
DateTime result = null;
try {
result = TWITTER_FORMATTER.parseDateTime(jpar.getValueAsString());
- } catch( Exception e ) { }
+ } catch( Exception ignored ) { }
try {
result = RFC3339Utils.getInstance().parseToUTC(jpar.getValueAsString());
- } catch( Exception e ) { }
+ } catch( Exception ignored ) { }
return result;
}
});
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDateTimeFormat.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDateTimeFormat.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDateTimeFormat.java
index 133db32..5a34868 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDateTimeFormat.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDateTimeFormat.java
@@ -20,9 +20,6 @@ package org.apache.streams.twitter.converter;
import org.apache.streams.jackson.StreamsDateTimeFormat;
-/**
- * Created by sblackmon on 2/10/15.
- */
public class TwitterDateTimeFormat implements StreamsDateTimeFormat {
public static final String TWITTER_FORMAT = "EEE MMM dd HH:mm:ss Z yyyy";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
index 8af3470..3c71f9a 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
@@ -33,20 +33,21 @@ import org.apache.streams.twitter.pojo.User;
import org.apache.streams.twitter.pojo.UserstreamEvent;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
+import static org.apache.streams.twitter.converter.TwitterDateTimeFormat.TWITTER_FORMAT;
+
/**
* Ensures twitter documents can be converted to Activity
*/
public class TwitterDocumentClassifier implements DocumentClassifier {
- private static ObjectMapper mapper;
-
public List<Class> detectClasses(Object document) {
Preconditions.checkNotNull(document);
- mapper = new StreamsJacksonMapper(Lists.newArrayList(StreamsTwitterMapper.TWITTER_FORMAT));
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TWITTER_FORMAT));
ObjectNode objectNode;
try {
@@ -57,10 +58,10 @@ public class TwitterDocumentClassifier implements DocumentClassifier {
else
objectNode = mapper.convertValue(document, ObjectNode.class);
} catch (IOException e) {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
- List<Class> classList = Lists.newArrayList();
+ List<Class> classList = new ArrayList<>();
if( objectNode.findValue("retweeted_status") != null && objectNode.get("retweeted_status") != null)
classList.add(Retweet.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
index bed8aff..08873c9 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
@@ -26,6 +26,7 @@ import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.apache.streams.exceptions.ActivityConversionException;
+import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
@@ -41,7 +42,6 @@ import org.apache.streams.twitter.pojo.Retweet;
import org.apache.streams.twitter.pojo.Tweet;
import org.apache.streams.twitter.pojo.User;
import org.apache.streams.twitter.pojo.UserMentions;
-import org.apache.streams.twitter.converter.StreamsTwitterMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +51,6 @@ import java.util.List;
import java.util.Map;
import static com.google.common.math.DoubleMath.mean;
-import static org.apache.streams.data.util.ActivityUtil.ensureExtensions;
/**
* Provides utilities for working with Activity objects within the context of Twitter
@@ -67,7 +66,7 @@ public class TwitterActivityUtil {
* @throws org.apache.streams.exceptions.ActivityConversionException
*/
public static void updateActivity(Tweet tweet, Activity activity) throws ActivityConversionException {
- ObjectMapper mapper = StreamsTwitterMapper.getInstance();
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance();
activity.setActor(buildActor(tweet));
activity.setId(formatId(activity.getVerb(),
Optional.fromNullable(
@@ -99,7 +98,6 @@ public class TwitterActivityUtil {
* Updates the given Activity object with the values from the User
* @param user the object to use as the source
* @param activity the target of the updates. Will receive all values from the tweet.
- * @throws org.apache.streams.exceptions.ActivityConversionException
*/
public static void updateActivity(User user, Activity activity) {
activity.setActor(buildActor(user));
@@ -121,7 +119,7 @@ public class TwitterActivityUtil {
if(Strings.isNullOrEmpty(activity.getId()))
throw new ActivityConversionException("Unable to determine activity id");
activity.setProvider(getProvider());
- addTwitterExtension(activity, StreamsTwitterMapper.getInstance().convertValue(delete, ObjectNode.class));
+ addTwitterExtension(activity, StreamsJacksonMapper.getInstance().convertValue(delete, ObjectNode.class));
}
/**
@@ -219,7 +217,7 @@ public class TwitterActivityUtil {
actor.setUrl(user.getUrl());
}
- Map<String, Object> extensions = new HashMap<String, Object>();
+ Map<String, Object> extensions = new HashMap<>();
extensions.put("location", user.getLocation());
extensions.put("posts", user.getStatusesCount());
extensions.put("favorites", user.getFavouritesCount());
@@ -241,7 +239,7 @@ public class TwitterActivityUtil {
* @return a list of links corresponding to the expanded URL (no t.co)
*/
public static List<String> getLinks(Tweet tweet) {
- List<String> links = Lists.newArrayList();
+ List<String> links = new ArrayList<>();
if( tweet.getEntities().getUrls() != null ) {
for (Url url : tweet.getEntities().getUrls()) {
links.add(url.getExpandedUrl());
@@ -267,8 +265,8 @@ public class TwitterActivityUtil {
* @param tweet the object to use as the source
*/
public static void addLocationExtension(Activity activity, Tweet tweet) {
- Map<String, Object> extensions = ensureExtensions(activity);
- Map<String, Object> location = new HashMap<String, Object>();
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
+ Map<String, Object> location = new HashMap<>();
location.put("id", formatId(
Optional.fromNullable(
tweet.getIdStr())
@@ -296,7 +294,7 @@ public class TwitterActivityUtil {
* @param event the Twitter event to add as the extension
*/
public static void addTwitterExtension(Activity activity, ObjectNode event) {
- Map<String, Object> extensions = org.apache.streams.data.util.ActivityUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
extensions.put("twitter", event);
}
/**
@@ -315,32 +313,32 @@ public class TwitterActivityUtil {
* @param tweet
*/
public static void addTwitterExtensions(Activity activity, Tweet tweet) {
- Map<String, Object> extensions = ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
- List<String> hashtags = new ArrayList<String>();
+ List<String> hashtags = new ArrayList<>();
for(Hashtag hashtag : tweet.getEntities().getHashtags()) {
hashtags.add(hashtag.getText());
}
extensions.put("hashtags", hashtags);
- Map<String, Object> likes = new HashMap<String, Object>();
+ Map<String, Object> likes = new HashMap<>();
likes.put("perspectival", tweet.getFavorited());
likes.put("count", tweet.getAdditionalProperties().get("favorite_count"));
extensions.put("likes", likes);
- Map<String, Object> rebroadcasts = new HashMap<String, Object>();
+ Map<String, Object> rebroadcasts = new HashMap<>();
rebroadcasts.put("perspectival", tweet.getRetweeted());
rebroadcasts.put("count", tweet.getRetweetCount());
extensions.put("rebroadcasts", rebroadcasts);
- List<Map<String, Object>> userMentions = new ArrayList<Map<String, Object>>();
+ List<Map<String, Object>> userMentions = new ArrayList<>();
Entities entities = tweet.getEntities();
for(UserMentions user : entities.getUserMentions()) {
//Map the twitter user object into an actor
- Map<String, Object> actor = new HashMap<String, Object>();
+ Map<String, Object> actor = new HashMap<>();
actor.put("id", "id:twitter:" + user.getIdStr());
actor.put("displayName", user.getName());
actor.put("handle", user.getScreenName());
@@ -369,8 +367,8 @@ public class TwitterActivityUtil {
lons.add(point.get(1));
}
List<Double> result = new ArrayList<>();
- result.add(new Double(mean(lats)));
- result.add(new Double(mean(lons)));
+ result.add(mean(lats));
+ result.add(mean(lons));
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
index d191449..046cb76 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/FetchAndReplaceTwitterProcessor.java
@@ -21,15 +21,16 @@ package org.apache.streams.twitter.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
+import java.util.List;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.exceptions.ActivityConversionException;
+import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.twitter.TwitterConfiguration;
import org.apache.streams.twitter.TwitterStreamConfiguration;
-import org.apache.streams.twitter.converter.StreamsTwitterMapper;
import org.apache.streams.twitter.pojo.Delete;
import org.apache.streams.twitter.pojo.Retweet;
import org.apache.streams.twitter.pojo.Tweet;
@@ -44,8 +45,6 @@ import twitter4j.TwitterFactory;
import twitter4j.TwitterObjectFactory;
import twitter4j.conf.ConfigurationBuilder;
-import java.util.List;
-
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.getProvider;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
@@ -99,7 +98,7 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
@Override
public void prepare(Object configurationObject) {
this.client = getTwitterClient();
- this.mapper = StreamsTwitterMapper.getInstance();
+ this.mapper = StreamsJacksonMapper.getInstance();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
index 8ea65eb..a64e597 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
@@ -19,20 +19,18 @@
package org.apache.streams.twitter.provider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Lists;
import com.twitter.hbc.core.processor.StringDelimitedProcessor;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.twitter.converter.StreamsTwitterMapper;
-import org.apache.streams.util.ComponentUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.IOException;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.apache.streams.core.StreamsDatum;
+import org.apache.streams.jackson.StreamsJacksonMapper;
+import org.apache.streams.util.ComponentUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -59,7 +57,7 @@ public class TwitterStreamProcessor extends StringDelimitedProcessor {
@Override
public boolean process() throws IOException, InterruptedException {
- String msg = null;
+ String msg;
do {
msg = this.processNextMessage();
if(msg == null) {
@@ -77,7 +75,7 @@ public class TwitterStreamProcessor extends StringDelimitedProcessor {
protected static class StreamDeserializer implements Callable<List<StreamsDatum>> {
- protected static final ObjectMapper mapper = StreamsTwitterMapper.getInstance();
+ protected static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
protected String item;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/data/TwitterObjectMapperIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/data/TwitterObjectMapperIT.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/data/TwitterObjectMapperIT.java
index 4d6a3de..42f0fba 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/data/TwitterObjectMapperIT.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/data/TwitterObjectMapperIT.java
@@ -23,9 +23,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import org.apache.commons.lang.StringUtils;
import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.twitter.converter.StreamsTwitterMapper;
import org.apache.streams.twitter.converter.TwitterDocumentClassifier;
import org.apache.streams.twitter.pojo.Delete;
import org.apache.streams.twitter.pojo.Retweet;
@@ -35,10 +37,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
+import static org.apache.streams.twitter.converter.TwitterDateTimeFormat.TWITTER_FORMAT;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -52,7 +51,7 @@ public class TwitterObjectMapperIT {
private final static Logger LOGGER = LoggerFactory.getLogger(TwitterObjectMapperIT.class);
- private ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsTwitterMapper.TWITTER_FORMAT));
+ private ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TWITTER_FORMAT));
@Test
public void Tests()
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
index 2bd3fa9..51f6294 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityConvertersTest.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
import java.util.List;
/**
- * Tests {@link: org.apache.streams.twitter.converter.*}
+ * Tests {org.apache.streams.twitter.converter.*}
*/
public class TwitterActivityConvertersTest {
@@ -49,8 +49,6 @@ public class TwitterActivityConvertersTest {
private String tweetJson = "{\"created_at\":\"Wed Dec 11 22:27:34 +0000 2013\",\"id\":12345,\"id_str\":\"12345\",\"text\":\"text\",\"source\":\"source\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"user\":{\"id\":91407775,\"id_str\":\"12345\",\"name\":\"name\",\"screen_name\":\"screen_name\",\"location\":\"\",\"url\":null,\"description\":null,\"protected\":false,\"followers_count\":136,\"friends_count\":0,\"listed_count\":1,\"created_at\":\"Fri Nov 20 19:29:02 +0000 2009\",\"favourites_count\":0,\"utc_offset\":null,\"time_zone\":null,\"geo_enabled\":false,\"verified\":false,\"statuses_count\":1793,\"lang\":\"en\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"C0DEED\",\"profile_background_image_url\":\"http:\\/\\/profile_background_image_url.png\",\"profile_background_image_url_https\":\"https:\\/\\/profi
le_background_image_url_https.png\",\"profile_background_tile\":false,\"profile_image_url\":\"http:\\/\\/profile_image_url.jpg\",\"profile_image_url_https\":\"https:\\/\\/profile_image_url_https.jpg\",\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"default_profile\":true,\"default_profile_image\":false,\"following\":null,\"follow_request_sent\":null,\"notifications\":null},\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":0,\"favorite_count\":0,\"entities\":{\"hashtags\":[],\"symbols\":[],\"urls\":[{\"url\":\"http:\\/\\/url\",\"expanded_url\":\"http:\\/\\/expanded_url\",\"display_url\":\"display_url\",\"indices\":[118,140]}],\"user_mentions\":[]},\"favorited\":false,\"retweeted\":false,\"possibly_sensitive\":false,\"filter_level\":\"medium\",\"lang\":\"en\"}\n";
private String retweetJson = "{\"created_at\":\"Wed Dec 11 22:27:34 +0000 2013\",\"id\":23456,\"id_str\":\"23456\",\"text\":\"text\",\"source\":\"web\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"user\":{\"id\":163149656,\"id_str\":\"34567\",\"name\":\"name\",\"screen_name\":\"screen_name\",\"location\":\"location\",\"url\":\"http:\\/\\/www.youtube.com\\/watch?v=url\",\"description\":\"description\\u00ed\",\"protected\":false,\"followers_count\":41,\"friends_count\":75,\"listed_count\":2,\"created_at\":\"Mon Jul 05 17:35:49 +0000 2010\",\"favourites_count\":4697,\"utc_offset\":-10800,\"time_zone\":\"Buenos Aires\",\"geo_enabled\":false,\"verified\":false,\"statuses_count\":5257,\"lang\":\"es\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"C4A64B\",\"profile_background_image_url\":\"http:\\/\\/a0.twimg.c
om\\/profile_background_images\\/12345\\/12345.jpeg\",\"profile_background_image_url_https\":\"https:\\/\\/si0.twimg.com\\/profile_background_images\\/12345\\/12345.jpeg\",\"profile_background_tile\":true,\"profile_image_url\":\"http:\\/\\/pbs.twimg.com\\/profile_images\\/12345\\/12345.jpeg\",\"profile_image_url_https\":\"https:\\/\\/pbs.twimg.com\\/profile_images\\/12345\\/12345.jpeg\",\"profile_banner_url\":\"https:\\/\\/pbs.twimg.com\\/profile_banners\\/12345\\/12345\",\"profile_link_color\":\"BF415A\",\"profile_sidebar_border_color\":\"000000\",\"profile_sidebar_fill_color\":\"B17CED\",\"profile_text_color\":\"3D1957\",\"profile_use_background_image\":true,\"default_profile\":false,\"default_profile_image\":false,\"following\":null,\"follow_request_sent\":null,\"notifications\":null},\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweeted_status\":{\"created_at\":\"Wed Dec 11 22:25:06 +0000 2013\",\"id\":34567,\"id_str\":\"34567\",\"text\":\"text\",\"s
ource\":\"source\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"user\":{\"id\":34567,\"id_str\":\"34567\",\"name\":\"name\",\"screen_name\":\"screen_name\",\"location\":\"\",\"url\":\"http:\\/\\/www.web.com\",\"description\":\"description\",\"protected\":false,\"followers_count\":34307,\"friends_count\":325,\"listed_count\":361,\"created_at\":\"Fri Apr 13 19:00:11 +0000 2012\",\"favourites_count\":44956,\"utc_offset\":3600,\"time_zone\":\"Madrid\",\"geo_enabled\":false,\"verified\":false,\"statuses_count\":24011,\"lang\":\"es\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"000000\",\"profile_background_image_url\":\"http:\\/\\/profile_background_image_url.jpeg\",\"profile_background_image_url_https\":\"https:\\/\\/si0.twimg.com\\/profile_background_images\\/34567\\/34567.jpeg\",\"profile_background_tile\":fa
lse,\"profile_image_url\":\"http:\\/\\/pbs.twimg.com\\/profile_images\\/34567\\/34567.gif\",\"profile_image_url_https\":\"https:\\/\\/pbs.twimg.com\\/profile_images\\/34567\\/34567.gif\",\"profile_banner_url\":\"https:\\/\\/pbs.twimg.com\\/profile_banners\\/34567\\/34567\",\"profile_link_color\":\"FF00E1\",\"profile_sidebar_border_color\":\"FFFFFF\",\"profile_sidebar_fill_color\":\"F3F3F3\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"default_profile\":false,\"default_profile_image\":false,\"following\":null,\"follow_request_sent\":null,\"notifications\":null},\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":9,\"favorite_count\":6,\"entities\":{\"hashtags\":[],\"symbols\":[],\"urls\":[],\"user_mentions\":[]},\"favorited\":false,\"retweeted\":false,\"lang\":\"es\"},\"retweet_count\":0,\"favorite_count\":0,\"entities\":{\"hashtags\":[],\"symbols\":[],\"urls\":[],\"user_mentions\":[{\"screen_name\":\"screen_name\",\"n
ame\":\"name emocional\",\"id\":45678,\"id_str\":\"45678\",\"indices\":[3,14]}]},\"favorited\":false,\"retweeted\":false,\"filter_level\":\"medium\",\"lang\":\"es\"}\n";
- private String deleteJson = "{\"delete\":{\"status\":{\"id\":56789,\"user_id\":67890,\"id_str\":\"56789\",\"user_id_str\":\"67890\"}}}\n";
- private String followJson = "{\"follower\":{\"id\":12345},\"followee\":{\"id\":56789}}\n";
@Test
public void testConvertTweet() throws Exception {
@@ -112,6 +110,7 @@ public class TwitterActivityConvertersTest {
@Test
public void testConvertDeleteString() {
+ String deleteJson = "{\"delete\":{\"status\":{\"id\":56789,\"user_id\":67890,\"id_str\":\"56789\",\"user_id_str\":\"67890\"}}}\n";
List<Activity> activityList = activityConverterUtil.convert(deleteJson);
Assert.assertTrue(activityList.size() == 1);
Activity activity = activityList.get(0);
@@ -121,6 +120,7 @@ public class TwitterActivityConvertersTest {
@Test
public void testConvertFollowString() {
+ String followJson = "{\"follower\":{\"id\":12345},\"followee\":{\"id\":56789}}\n";
List<Activity> activityList = activityConverterUtil.convert(followJson);
Assert.assertTrue(activityList.size() == 1);
Activity activity = activityList.get(0);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
index 07dbbd2..a455754 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
@@ -25,7 +25,6 @@ import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.twitter.converter.TwitterDateTimeFormat;
-import org.apache.streams.twitter.pojo.Retweet;
import org.apache.streams.twitter.pojo.User;
import org.junit.Assert;
import org.junit.Test;
@@ -33,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Tests {@link: org.apache.streams.twitter.converter.*}
+ * Tests {org.apache.streams.twitter.converter.*}
*/
public class TwitterActivityObjectsConvertersTest {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
----------------------------------------------------------------------
diff --git a/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java b/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
index df33ee9..7fe2c28 100644
--- a/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
+++ b/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
@@ -20,11 +20,11 @@ package org.apache.streams.pojo.extensions;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -57,8 +57,7 @@ public class ExtensionUtil {
private static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
public Map<String, Object> getExtensions(Activity activity) {
- Map<String,Object> extensions = ensureExtensions(activity);
- return extensions;
+ return ensureExtensions(activity);
}
public Object getExtension(Activity activity, String key) {
@@ -68,27 +67,26 @@ public class ExtensionUtil {
public void setExtensions(Activity activity, Map<String, Object> extensions) {
activity.setAdditionalProperty(extensionProperty, extensions);
- };
+ }
public void addExtension(Activity activity, String key, Object extension) {
Map<String,Object> extensions = ensureExtensions(activity);
extensions.put(key, extension);
- };
+ }
public void addExtensions(Activity activity, Map<String, Object> extensions) {
for( Map.Entry<String, Object> item : extensions.entrySet())
addExtension(activity, item.getKey(), item.getValue());
- };
+ }
public void removeExtension(Activity activity, String key) {
Map<String,Object> extensions = ensureExtensions(activity);
extensions.remove(key);
- };
+ }
public Map<String, Object> getExtensions(ActivityObject object) {
ActivityObject activityObject = mapper.convertValue(object, ActivityObject.class);
- Map<String,Object> extensions = ensureExtensions(object);
- return extensions;
+ return ensureExtensions(activityObject);
}
public Object getExtension(ActivityObject object, String key) {
@@ -98,22 +96,22 @@ public class ExtensionUtil {
public void setExtensions(ActivityObject object, Map<String, Object> extensions) {
object.setAdditionalProperty(extensionProperty, extensions);
- };
+ }
public void addExtension(ActivityObject object, String key, Object extension) {
Map<String,Object> extensions = ensureExtensions(object);
extensions.put(key, extension);
- };
+ }
public void addExtensions(ActivityObject object, Map<String, Object> extensions) {
for( Map.Entry<String, Object> item : extensions.entrySet())
addExtension(object, item.getKey(), item.getValue());
- };
+ }
public void removeExtension(ActivityObject object, String key) {
Map<String,Object> extensions = ensureExtensions(object);
extensions.remove(key);
- };
+ }
/**
* Creates a standard extension property
@@ -125,12 +123,12 @@ public class ExtensionUtil {
Map<String,Object> additionalProperties = activity.getAdditionalProperties();
Map<String,Object> extensions;
if(additionalProperties == null) {
- additionalProperties = Maps.newHashMap();
+ additionalProperties = new HashMap<>();
}
if( !Strings.isNullOrEmpty(extensionProperty) ) {
extensions = (Map<String, Object>) additionalProperties.get(extensionProperty);
if(extensions == null) {
- extensions = Maps.newHashMap();
+ extensions = new HashMap<>();
additionalProperties.put(extensionProperty, extensions);
}
return extensions;
@@ -141,20 +139,20 @@ public class ExtensionUtil {
/**
* Creates a standard extension property
- * @param object objectnode to create the property in
- * @return the Map representing the extensions property
+ * @param object object node to create the property in
+ * @return {@link Map} representing the extensions property
*/
@SuppressWarnings("unchecked")
public Map<String, Object> ensureExtensions(ActivityObject object) {
Map<String,Object> additionalProperties = object.getAdditionalProperties();
Map<String,Object> extensions;
if(additionalProperties == null) {
- additionalProperties = Maps.newHashMap();
+ additionalProperties = new HashMap<>();
}
if( !Strings.isNullOrEmpty(extensionProperty) ) {
extensions = (Map<String, Object>) additionalProperties.get(extensionProperty);
if(extensions == null) {
- extensions = Maps.newHashMap();
+ extensions = new HashMap<>();
additionalProperties.put(extensionProperty, extensions);
}
return extensions;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java b/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
index 1234d73..dc10df1 100644
--- a/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
+++ b/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
@@ -78,7 +78,7 @@ public class ActivityUtil {
public static Map<String, Object> ensureExtensions(Activity activity) {
Map<String, Object> extensions = (Map)activity.getAdditionalProperties().get(EXTENSION_PROPERTY);
if(extensions == null) {
- extensions = new HashMap<String, Object>();
+ extensions = new HashMap<>();
activity.setAdditionalProperty(EXTENSION_PROPERTY, extensions);
}
return extensions;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b13d8d63/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java
index edaa085..eabde96 100644
--- a/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java
+++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java
@@ -19,10 +19,8 @@
package org.apache.streams.pojo.test;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Test;
@@ -40,7 +38,6 @@ public class CustomDateTimeFormatTest {
String input = "Tue Jan 17 21:21:46 Z 2012";
Long outputMillis = 1326835306000L;
ObjectMapper mapper = StreamsJacksonMapper.getInstance(format);
- DateTime time;
try {
String json = "{\"published\":\"" + input + "\"}";
Activity activity = mapper.readValue(json, Activity.class);
@@ -60,7 +57,6 @@ public class CustomDateTimeFormatTest {
String input = "Tue Jan 17 21:21:46 Z 2012";
Long outputMillis = 1326835306000L;
ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- DateTime time;
try {
String json = "{\"published\":\"" + input + "\"}";
Activity activity = mapper.readValue(json, Activity.class);