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 2016/12/17 19:56:48 UTC
[3/4] incubator-streams git commit: Replace Guava API calls with Java
8 API
Replace Guava API calls with Java 8 API
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/db897a21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/db897a21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/db897a21
Branch: refs/heads/master
Commit: db897a21283aecc1c0e26211c00e4b9c3657c0f8
Parents: fb0b51c
Author: smarthi <sm...@apache.org>
Authored: Wed Dec 14 02:23:33 2016 -0500
Committer: smarthi <sm...@apache.org>
Committed: Sat Dec 17 11:59:22 2016 -0500
----------------------------------------------------------------------
.../converter/ActivityConverterUtil.java | 3 +-
.../converter/ActivityObjectConverterUtil.java | 4 +-
.../BaseObjectNodeActivityConverter.java | 8 +--
streams-config/pom.xml | 4 --
.../kinesis/KinesisPersistReaderTask.java | 4 +-
.../org/apache/streams/s3/S3PersistWriter.java | 4 +-
streams-contrib/streams-persist-console/pom.xml | 4 --
.../streams-persist-elasticsearch/pom.xml | 4 --
.../MetadataFromDocumentProcessor.java | 14 ++--
.../streams/mongo/MongoPersistReader.java | 9 +--
.../streams/mongo/MongoPersistWriter.java | 16 ++---
.../apache/streams/json/JsonPathExtractor.java | 4 +-
.../streams/regex/RegexMentionsExtractor.java | 4 +-
.../org/apache/streams/regex/RegexUtils.java | 11 +--
.../streams/urls/LinkResolverProcessor.java | 17 ++---
.../streams-provider-facebook/pom.xml | 5 --
.../processor/FacebookTypeConverter.java | 10 +--
.../serializer/FacebookActivityUtil.java | 7 +-
.../providers/page/FacebookPageProviderIT.java | 4 +-
.../google-gmail/pom.xml | 4 --
.../GMailMessageActivitySerializer.java | 21 ++----
.../google-gplus/pom.xml | 4 --
.../processor/GooglePlusCommentProcessor.java | 6 +-
.../processor/GooglePlusTypeConverter.java | 8 ++-
.../util/GPlusActivityDeserializer.java | 4 +-
.../util/GPlusCommentDeserializer.java | 4 +-
.../util/GPlusPersonDeserializer.java | 10 ++-
.../serializer/util/GooglePlusActivityUtil.java | 8 ++-
.../google/gplus/GooglePlusCommentSerDeIT.java | 3 +-
.../test/providers/GPlusUserDataProviderIT.java | 7 +-
.../streams-provider-instagram/pom.xml | 4 --
.../processor/InstagramTypeConverter.java | 10 +--
.../userinfo/InstagramUserInfoCollector.java | 4 +-
.../serializer/util/InstagramActivityUtil.java | 6 +-
.../streams-provider-moreover/pom.xml | 4 --
.../test/provider/MoreoverProviderIT.java | 3 +-
streams-contrib/streams-provider-rss/pom.xml | 4 --
.../streams-provider-sysomos/pom.xml | 4 --
.../sysomos/processor/SysomosTypeConverter.java | 8 ++-
.../test/provider/SysomosProviderIT.java | 3 +-
.../streams-provider-twitter/pom.xml | 4 --
.../TwitterFollowActivityConverter.java | 5 +-
.../TwitterJsonDeleteActivityConverter.java | 5 +-
.../TwitterJsonRetweetActivityConverter.java | 8 ++-
.../TwitterJsonTweetActivityConverter.java | 8 ++-
...terJsonUserstreameventActivityConverter.java | 18 ++---
.../converter/util/TwitterActivityUtil.java | 6 +-
.../FetchAndReplaceTwitterProcessor.java | 5 +-
.../processor/TwitterUrlApiProcessor.java | 5 +-
.../provider/TwitterTimelineProvider.java | 20 +++---
.../provider/TwitterTimelineProviderTask.java | 8 +--
.../test/data/TwitterObjectMapperIT.java | 12 ++--
.../utils/TwitterActivityConvertersTest.java | 9 +--
.../TwitterActivityObjectsConvertersTest.java | 11 +--
.../provider/YoutubeUserActivityCollector.java | 6 +-
.../youtube/serializer/YoutubeActivityUtil.java | 7 +-
.../persist/impl/BroadcastMessagePersister.java | 6 +-
.../impl/BroadcastMessagePersisterTest.java | 6 +-
.../impl/LogstashUdpMessagePersisterTest.java | 14 ++--
.../streams-plugin-cassandra/pom.xml | 5 --
...treamsCassandraResourceGeneratorCLITest.java | 30 +++-----
...StreamsCassandraResourceGeneratorMojoIT.java | 28 +++-----
.../StreamsCassandraResourceGeneratorTest.java | 41 ++++-------
.../streams-plugin-elasticsearch/pom.xml | 5 --
...msElasticsearchResourceGeneratorCLITest.java | 22 +++---
...amsElasticsearchResourceGeneratorMojoIT.java | 11 ++-
...reamsElasticsearchResourceGeneratorTest.java | 75 +++-----------------
streams-plugins/streams-plugin-hbase/pom.xml | 5 --
.../hbase/StreamsHbaseGenerationConfig.java | 6 +-
.../StreamsHbaseResourceGeneratorCLITest.java | 15 ++--
.../StreamsHbaseResourceGeneratorMojoIT.java | 17 ++---
.../test/StreamsHbaseResourceGeneratorTest.java | 45 ++----------
streams-plugins/streams-plugin-hive/pom.xml | 5 --
.../StreamsHiveResourceGeneratorCLITest.java | 22 +++---
.../StreamsHiveResourceGeneratorMojoIT.java | 19 ++---
.../test/StreamsHiveResourceGeneratorTest.java | 66 ++++-------------
streams-plugins/streams-plugin-pig/pom.xml | 5 --
.../StreamsPigResourceGeneratorCLITest.java | 22 +++---
.../test/StreamsPigResourceGeneratorMojoIT.java | 19 ++---
.../test/StreamsPigResourceGeneratorTest.java | 65 ++++-------------
.../plugins/StreamsPojoGenerationConfig.java | 2 +-
.../test/StreamsPojoSourceGeneratorCLITest.java | 24 +++----
.../test/StreamsPojoSourceGeneratorMojoIT.java | 20 +++---
.../test/StreamsPojoSourceGeneratorTest.java | 37 ++++------
.../plugins/StreamsScalaSourceGenerator.java | 58 +++++++--------
.../StreamsScalaSourceGeneratorCLITest.java | 18 ++---
.../test/StreamsScalaSourceGeneratorMojoIT.java | 19 ++---
.../test/StreamsScalaSourceGeneratorTest.java | 8 +--
streams-pojo-extensions/pom.xml | 5 --
streams-pojo/pom.xml | 5 --
.../dropwizard/GenericWebhookResource.java | 6 +-
.../test/GenericWebhookResourceTest.java | 4 +-
.../dropwizard/test/StreamsApplicationIT.java | 5 +-
.../streams/local/builders/StreamComponent.java | 4 +-
.../streams/local/tasks/BaseStreamsTask.java | 11 ++-
.../local/builders/LocalStreamBuilderTest.java | 29 ++++----
.../local/test/processors/SlowProcessor.java | 6 +-
.../local/test/writer/DatumCounterWriter.java | 7 +-
.../java/org/apache/streams/util/GuidUtils.java | 1 -
.../streams/util/schema/SchemaStoreImpl.java | 12 ++--
streams-verbs/pom.xml | 5 --
.../streams/verbs/VerbDefinitionResolver.java | 10 +--
.../verbs/VerbDefinitionResolverTest.java | 34 ++++-----
103 files changed, 459 insertions(+), 827 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 1be527b..c535710 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
@@ -26,7 +26,6 @@ import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
@@ -205,7 +204,7 @@ public class ActivityConverterUtil {
}
}
- return Lists.newArrayList(detectedClasses);
+ return new ArrayList<>(detectedClasses);
}
private Map<Class, Object> convertToDetectedClasses(List<Class> datumClasses, Object document) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
index 2fba65e..49cdfcb 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
@@ -25,7 +25,6 @@ import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.ActivityObject;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
@@ -33,6 +32,7 @@ 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;
@@ -184,7 +184,7 @@ public class ActivityObjectConverterUtil {
}
}
- return Lists.newArrayList(detectedClasses);
+ return new ArrayList<>(detectedClasses);
}
private Map<Class, Object> convertToDetectedClasses(List<Class> datumClasses, Object document) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseObjectNodeActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseObjectNodeActivityConverter.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseObjectNodeActivityConverter.java
index 1048b4d..6808256 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseObjectNodeActivityConverter.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseObjectNodeActivityConverter.java
@@ -26,11 +26,11 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -38,7 +38,7 @@ import java.util.List;
*
* <p/>
* BaseObjectNodeActivityConverter is included by default in all
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * @see org.apache.streams.converter.ActivityConverterProcessor
*
*
*/
@@ -76,7 +76,7 @@ public class BaseObjectNodeActivityConverter implements ActivityConverter<Object
@Override
public List<Activity> toActivityList(ObjectNode serialized) throws ActivityConversionException {
- List<Activity> activityList = Lists.newArrayList();
+ List<Activity> activityList = new ArrayList<>();
try {
activityList.add(mapper.convertValue(serialized, Activity.class));
} catch (Exception ex) {
@@ -87,7 +87,7 @@ public class BaseObjectNodeActivityConverter implements ActivityConverter<Object
@Override
public List<Activity> toActivityList(List<ObjectNode> list) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
for ( ObjectNode item : list ) {
try {
result.addAll(toActivityList(item));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-config/pom.xml
----------------------------------------------------------------------
diff --git a/streams-config/pom.xml b/streams-config/pom.xml
index fb5b3e6..0cace1b 100644
--- a/streams-config/pom.xml
+++ b/streams-config/pom.xml
@@ -37,10 +37,6 @@
<artifactId>config</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReaderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReaderTask.java b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReaderTask.java
index 37891be..eb21c00 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReaderTask.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReaderTask.java
@@ -26,13 +26,13 @@ import com.amazonaws.services.kinesis.model.GetRecordsResult;
import com.amazonaws.services.kinesis.model.GetShardIteratorRequest;
import com.amazonaws.services.kinesis.model.GetShardIteratorResult;
import com.amazonaws.services.kinesis.model.Record;
-import com.google.common.collect.Maps;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigInteger;
import java.nio.charset.Charset;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -73,7 +73,7 @@ public class KinesisPersistReaderTask implements Runnable {
shardIteratorId = shardIteratorResult.getShardIterator();
- Map<String,Object> metadata = Maps.newHashMap();
+ Map<String,Object> metadata = new HashMap<>();
metadata.put("streamName", streamName);
metadata.put("shardId", shardId);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistWriter.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistWriter.java
index 34e4b67..97dfa56 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistWriter.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistWriter.java
@@ -38,7 +38,7 @@ import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.S3ClientOptions;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,7 +283,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
clientOptions.setPathStyleAccess(false);
this.amazonS3Client = new AmazonS3Client(credentials, clientConfig);
- if (!Strings.isNullOrEmpty(s3WriterConfiguration.getRegion())) {
+ if (StringUtils.isNotEmpty(s3WriterConfiguration.getRegion())) {
this.amazonS3Client.setRegion(Region.getRegion(Regions.fromName(s3WriterConfiguration.getRegion())));
}
this.amazonS3Client.setS3ClientOptions(clientOptions);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-persist-console/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-console/pom.xml b/streams-contrib/streams-persist-console/pom.xml
index e9a3e1b..8332f69 100644
--- a/streams-contrib/streams-persist-console/pom.xml
+++ b/streams-contrib/streams-persist-console/pom.xml
@@ -40,10 +40,6 @@
<artifactId>streams-pojo</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.streams</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index dd2bd05..45aa862 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -35,10 +35,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
<!-- Test includes -->
<dependency>
<groupId>org.apache.lucene</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java
index e5efbb9..1260d20 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java
@@ -25,14 +25,14 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,11 +66,11 @@ public class MetadataFromDocumentProcessor implements StreamsProcessor, Serializ
mapper = StreamsJacksonMapper.getInstance();
}
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
Map<String, Object> metadata = entry.getMetadata();
if ( metadata == null ) {
- metadata = Maps.newHashMap();
+ metadata = new HashMap<>();
}
String id = null;
@@ -103,10 +103,10 @@ public class MetadataFromDocumentProcessor implements StreamsProcessor, Serializ
}
}
- if ( !Strings.isNullOrEmpty(id) ) {
+ if (StringUtils.isNotEmpty(id) ) {
metadata.put("id", id);
}
- if ( !Strings.isNullOrEmpty(type) ) {
+ if (StringUtils.isNotEmpty(type) ) {
metadata.put("type", type);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java b/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java
index 30ecfbf..2fdd821 100644
--- a/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java
+++ b/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistReader.java
@@ -28,8 +28,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.mongodb.DB;
import com.mongodb.DBCollection;
@@ -38,6 +36,7 @@ import com.mongodb.DBObject;
import com.mongodb.MongoClient;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
+import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +51,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* MongoPersistReader reads documents from mongo.
@@ -169,10 +170,10 @@ public class MongoPersistReader implements StreamsPersistReader {
ServerAddress serverAddress = new ServerAddress(config.getHost(), config.getPort().intValue());
- if (!Strings.isNullOrEmpty(config.getUser()) && !Strings.isNullOrEmpty(config.getPassword())) {
+ if (StringUtils.isNotEmpty(config.getUser()) && StringUtils.isNotEmpty(config.getPassword())) {
MongoCredential credential =
MongoCredential.createCredential(config.getUser(), config.getDb(), config.getPassword().toCharArray());
- client = new MongoClient(serverAddress, Lists.newArrayList(credential));
+ client = new MongoClient(serverAddress, Stream.of(credential).collect(Collectors.toList()));
} else {
client = new MongoClient(serverAddress);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistWriter.java b/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistWriter.java
index 8f33648..dd3faa2 100644
--- a/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistWriter.java
+++ b/streams-contrib/streams-persist-mongo/src/main/java/org/apache/streams/mongo/MongoPersistWriter.java
@@ -26,8 +26,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
@@ -35,6 +33,7 @@ import com.mongodb.MongoClient;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
import com.mongodb.util.JSON;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +51,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
public class MongoPersistWriter implements StreamsPersistWriter, Runnable, Flushable, Closeable {
@@ -133,12 +134,7 @@ public class MongoPersistWriter implements StreamsPersistWriter, Runnable, Flush
*/
public void start() {
connectToMongo();
- backgroundFlushTask.scheduleAtFixedRate(new Runnable() {
- @Override
- public void run() {
- flushIfNecessary();
- }
- }, 0, MAX_WRITE_LATENCY * 2, TimeUnit.MILLISECONDS);
+ backgroundFlushTask.scheduleAtFixedRate(this::flushIfNecessary, 0, MAX_WRITE_LATENCY * 2, TimeUnit.MILLISECONDS);
}
/**
@@ -248,10 +244,10 @@ public class MongoPersistWriter implements StreamsPersistWriter, Runnable, Flush
ServerAddress serverAddress = new ServerAddress(config.getHost(), config.getPort().intValue());
- if (!Strings.isNullOrEmpty(config.getUser()) && !Strings.isNullOrEmpty(config.getPassword())) {
+ if (StringUtils.isNotEmpty(config.getUser()) && StringUtils.isNotEmpty(config.getPassword())) {
MongoCredential credential =
MongoCredential.createCredential(config.getUser(), config.getDb(), config.getPassword().toCharArray());
- client = new MongoClient(serverAddress, Lists.newArrayList(credential));
+ client = new MongoClient(serverAddress, Stream.of(credential).collect(Collectors.toList()));
} else {
client = new MongoClient(serverAddress);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java
index b1024bd..cbe2424 100644
--- a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java
+++ b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
-import com.google.common.collect.Lists;
import com.jayway.jsonpath.JsonPath;
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
@@ -34,6 +33,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -68,7 +68,7 @@ public class JsonPathExtractor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
String json = null;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexMentionsExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexMentionsExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexMentionsExtractor.java
index ddd3ed5..093a88d 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexMentionsExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexMentionsExtractor.java
@@ -21,8 +21,6 @@ package org.apache.streams.regex;
import org.apache.streams.core.StreamsProcessor;
-import com.google.common.collect.Maps;
-
import java.util.HashMap;
import java.util.Map;
@@ -50,7 +48,7 @@ public class RegexMentionsExtractor extends AbstractRegexExtensionExtractor<Map<
@Override
protected Map<String, Object> prepareObject(String extracted) {
- HashMap<String, Object> mention = Maps.newHashMap();
+ Map<String, Object> mention = new HashMap<>();
mention.put(DISPLAY_KEY, extracted.substring(1));
return mention;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
index d46c2af..d3d5c89 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/RegexUtils.java
@@ -19,13 +19,14 @@
package org.apache.streams.regex;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
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 java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ import java.util.regex.Pattern;
*/
public class RegexUtils {
- private static final Map<String, Pattern> patternCache = Maps.newConcurrentMap();
+ private static final Map<String, Pattern> patternCache = new ConcurrentHashMap<>();
private static final Logger LOGGER = LoggerFactory.getLogger(RegexUtils.class);
private RegexUtils() {}
@@ -62,7 +63,7 @@ public class RegexUtils {
protected static Map<String, List<Integer>> getMatches(String pattern, String content, int capture) {
try {
- Map<String, List<Integer>> matches = Maps.newHashMap();
+ Map<String, List<Integer>> matches = new HashMap<>();
if (content == null) {
return matches;
}
@@ -75,7 +76,7 @@ public class RegexUtils {
if (matches.containsKey(group)) {
indices = matches.get(group);
} else {
- indices = Lists.newArrayList();
+ indices = new ArrayList<>();
matches.put(group, indices);
}
indices.add(matcher.start());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverProcessor.java b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverProcessor.java
index 6c88e28..d13d80b 100644
--- a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverProcessor.java
+++ b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverProcessor.java
@@ -24,13 +24,15 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
public class LinkResolverProcessor implements StreamsProcessor {
@@ -46,7 +48,7 @@ public class LinkResolverProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
LOGGER.debug("{} processing {}", STREAMS_ID, entry.getDocument().getClass());
@@ -56,7 +58,7 @@ public class LinkResolverProcessor implements StreamsProcessor {
if (entry.getDocument() instanceof Activity) {
activity = (Activity) entry.getDocument();
- activity.setLinks(Lists.newArrayList(unwind(activity.getLinks())));
+ activity.setLinks(new ArrayList<>(unwind(activity.getLinks())));
entry.setDocument(activity);
@@ -70,17 +72,17 @@ public class LinkResolverProcessor implements StreamsProcessor {
} catch (Exception e) {
e.printStackTrace();
LOGGER.warn(e.getMessage());
- return (Lists.newArrayList(entry));
+ return Stream.of(entry).collect(Collectors.toList());
}
- activity.setLinks(Lists.newArrayList(unwind(activity.getLinks())));
+ activity.setLinks(new ArrayList<>(unwind(activity.getLinks())));
try {
entry.setDocument(mapper.writeValueAsString(activity));
} catch (Exception e) {
e.printStackTrace();
LOGGER.warn(e.getMessage());
- return (Lists.newArrayList());
+ return new ArrayList<>();
}
result.add(entry);
@@ -88,8 +90,7 @@ public class LinkResolverProcessor implements StreamsProcessor {
return result;
} else {
- //return(Lists.newArrayList(entry));
- return (Lists.newArrayList());
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/pom.xml b/streams-contrib/streams-provider-facebook/pom.xml
index 3d21859..80a53a8 100644
--- a/streams-contrib/streams-provider-facebook/pom.xml
+++ b/streams-contrib/streams-provider-facebook/pom.xml
@@ -80,11 +80,6 @@
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.facebook4j</groupId>
<artifactId>facebook4j-core</artifactId>
<version>2.4.8</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 7a25b23..a7b5c9a 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
@@ -33,13 +33,15 @@ import com.fasterxml.jackson.core.JsonParser;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* FacebookTypeConverter converts facebook data to activity streams types.
@@ -182,7 +184,7 @@ public class FacebookTypeConverter implements StreamsProcessor {
} else if ( item instanceof ObjectNode) {
// first check for valid json
- node = (ObjectNode)mapper.valueToTree(item);
+ node = mapper.valueToTree(item);
Class inClass = FacebookEventClassifier.detectClass(mapper.writeValueAsString(item));
@@ -206,9 +208,9 @@ public class FacebookTypeConverter implements StreamsProcessor {
}
if ( result != null ) {
- return Lists.newArrayList(result);
+ return Stream.of(result).collect(Collectors.toList());
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 ddf032d..dc7aa52 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
@@ -37,15 +37,17 @@ import org.apache.streams.pojo.json.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* FacebookActivityUtil helps convert facebook data to activity formats.
@@ -266,6 +268,7 @@ public class FacebookActivityUtil {
* @return a valid Activity ID in format "id:facebook:part1:part2:...partN"
*/
public static String formatId(String... idparts) {
- return String.join(":", Lists.asList("id:facebook", idparts));
+ return String.join(":",
+ Stream.concat(Arrays.stream(new String[]{"id:facebook"}), Arrays.stream(idparts)).collect(Collectors.toList()));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
index 1abdb3f..20a08a7 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/providers/page/FacebookPageProviderIT.java
@@ -20,8 +20,6 @@ package org.apache.streams.facebook.test.providers.page;
import org.apache.streams.facebook.provider.page.FacebookPageProvider;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
@@ -56,7 +54,7 @@ public class FacebookPageProviderIT {
testThread.start();
testThread.join(60000);
- FacebookPageProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
+ FacebookPageProvider.main(new String[]{configfile, outfile});
File out = new File(outfile);
assertTrue (out.exists());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gmail/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/pom.xml b/streams-contrib/streams-provider-google/google-gmail/pom.xml
index f8370c7..af0d686 100644
--- a/streams-contrib/streams-provider-google/google-gmail/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gmail/pom.xml
@@ -74,10 +74,6 @@
<artifactId>streams-config</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 ed95373..bdc22db 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
@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import com.googlecode.gmail4j.GmailException;
import com.googlecode.gmail4j.GmailMessage;
import com.googlecode.gmail4j.javamail.JavaMailGmailMessage;
@@ -45,8 +44,11 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.mail.internet.MimeMultipart;
/**
@@ -115,20 +117,6 @@ public class GMailMessageActivitySerializer implements ActivitySerializer<GmailM
LOGGER.warn(e.getMessage());
}
activity.setObject(object);
-
-// try {
-// // if jackson can't serialize the object, find out now
-// String jsonString = mapper.writeValueAsString(gmailMessage);
-// ObjectNode jsonObject = mapper.valueToTree(gmailMessage);
-// // since it can, write the entire source object to extensions.gmail
-// Map<String, Object> extensions = Maps.newHashMap();
-// extensions.put("gmail", gmailMessage);
-// activity.setAdditionalProperty("extensions", extensions);
-// } catch (JsonProcessingException e) {
-// LOGGER.debug("Failed Json Deserialization");
-// e.printStackTrace();
-// }
-
return activity;
}
@@ -169,7 +157,8 @@ public class GMailMessageActivitySerializer implements ActivitySerializer<GmailM
}
public static String formatId(String... idparts) {
- return String.join(":", Lists.asList("id:gmail", idparts));
+ return String.join(":",
+ Stream.concat(Arrays.stream(new String[]{"id:googleplus"}), Arrays.stream(idparts)).collect(Collectors.toList()));
}
interface MessageMixIn {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml b/streams-contrib/streams-provider-google/google-gplus/pom.xml
index 1e80d88..1b8ddb2 100644
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@ -79,10 +79,6 @@
<artifactId>streams-config</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 833fe23..0b84932 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
@@ -30,6 +30,8 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* GooglePlusCommentProcessor collects comments about a google plus activity.
@@ -63,7 +65,7 @@ public class GooglePlusCommentProcessor implements StreamsProcessor {
/* TODO: FILL ME OUT WITH THE API CALL **/
List<Comment> comments = new ArrayList<>();
- googlePlusActivityUtil.updateActivity(comments, activity);
+ GooglePlusActivityUtil.updateActivity(comments, activity);
result = new StreamsDatum(activity);
}
} catch (Exception ex) {
@@ -72,7 +74,7 @@ public class GooglePlusCommentProcessor implements StreamsProcessor {
}
if ( result != null ) {
- return com.google.common.collect.Lists.newArrayList(result);
+ return Stream.of(result).collect(Collectors.toList());
} else {
return new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 ae9da2a..51a6d51 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
@@ -25,7 +25,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.api.services.plus.model.Person;
-import com.google.common.collect.Lists;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GPlusEventClassifier;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
@@ -33,8 +32,11 @@ import com.google.gplus.serializer.util.GooglePlusActivityUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* GooglePlusTypeConverter is a StreamsProcessor that converts gplus activities to activitystreams activities.
@@ -96,9 +98,9 @@ public class GooglePlusTypeConverter implements StreamsProcessor {
}
if ( result != null ) {
- return Lists.newArrayList(result);
+ return Stream.of(result).collect(Collectors.toList());
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java
index f04ab9b..f13267a 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusActivityDeserializer.java
@@ -25,12 +25,12 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.api.client.util.DateTime;
-import com.google.api.client.util.Lists;
import com.google.api.services.plus.model.Activity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -142,7 +142,7 @@ public class GPlusActivityDeserializer extends JsonDeserializer<Activity> {
* @return list of {@link com.google.api.services.plus.model.Activity.PlusObject.Attachments} objects
*/
private List<Activity.PlusObject.Attachments> buildAttachments(JsonNode objectNode) {
- List<Activity.PlusObject.Attachments> attachments = Lists.newArrayList();
+ List<Activity.PlusObject.Attachments> attachments = new ArrayList<>();
if ( objectNode.has("attachments") ) {
for (JsonNode attachmentNode : objectNode.get("attachments")) {
Activity.PlusObject.Attachments attachments1 = new Activity.PlusObject.Attachments();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusCommentDeserializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusCommentDeserializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusCommentDeserializer.java
index 8c5ade5..5b92c43 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusCommentDeserializer.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusCommentDeserializer.java
@@ -28,12 +28,12 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.api.client.util.DateTime;
-import com.google.api.client.util.Lists;
import com.google.api.services.plus.model.Comment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -83,7 +83,7 @@ public class GPlusCommentDeserializer extends JsonDeserializer<Comment> {
comment.setSelfLink(node.get("selfLink").asText());
- List<Comment.InReplyTo> replies = Lists.newArrayList();
+ List<Comment.InReplyTo> replies = new ArrayList<>();
for (JsonNode reply : node.get("inReplyTo")) {
Comment.InReplyTo irt = objectMapper.readValue(objectMapper.writeValueAsString(reply), Comment.InReplyTo.class);
replies.add(irt);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java
index 871e15b..38bb168 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusPersonDeserializer.java
@@ -27,14 +27,12 @@ import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.IntNode;
-import com.google.api.client.util.Lists;
import com.google.api.services.plus.model.Person;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -62,7 +60,7 @@ public class GPlusPersonDeserializer extends JsonDeserializer<Person> {
Person person = new Person();
try {
person.setId(node.get("id").asText());
- person.setCircledByCount((Integer) ((IntNode) node.get("circledByCount")).numberValue());
+ person.setCircledByCount((Integer) (node.get("circledByCount")).numberValue());
person.setDisplayName(node.get("displayName").asText());
if( node.has("etag")) {
person.setEtag(node.get("etag").asText());
@@ -88,7 +86,7 @@ public class GPlusPersonDeserializer extends JsonDeserializer<Person> {
person.setObjectType(node.get("objectType").asText());
- List<Person.Organizations> organizations = Lists.newArrayList();
+ List<Person.Organizations> organizations = new ArrayList<>();
if( node.has("organizations")) {
for (JsonNode orgNode : node.get("organizations")) {
Person.Organizations org = mapper.readValue(mapper.writeValueAsString(orgNode), Person.Organizations.class);
@@ -100,7 +98,7 @@ public class GPlusPersonDeserializer extends JsonDeserializer<Person> {
person.setUrl(node.get("url").asText());
person.setVerified(node.get("verified").asBoolean());
- List<Person.Emails> emails = Lists.newArrayList();
+ List<Person.Emails> emails = new ArrayList<>();
if ( node.has("emails")) {
for (JsonNode emailNode : node.get("emails")) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 c980b98..27b25a2 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
@@ -28,17 +28,18 @@ import org.apache.streams.pojo.json.Provider;
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.collect.Lists;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* GooglePlusActivityUtil helps convert c.g.Person and c.g.Activity into o.a.s.p.j.o.Page and o.a.s.p.j.Activity.
@@ -291,6 +292,7 @@ public class GooglePlusActivityUtil {
* @return a valid Activity ID in format "id:googleplus:part1:part2:...partN"
*/
public static String formatId(String... idparts) {
- return Joiner.on(":").join(Lists.asList("id:googleplus", idparts));
+ return String.join(":",
+ Stream.concat(Arrays.stream(new String[]{"id:googleplus"}), Arrays.stream(idparts)).collect(Collectors.toList()));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
index 780ab87..d223867 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusCommentSerDeIT.java
@@ -25,7 +25,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.api.client.util.Lists;
import com.google.api.services.plus.model.Comment;
import com.google.gplus.serializer.util.GPlusCommentDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
@@ -75,7 +74,7 @@ public class GooglePlusCommentSerDeIT {
BufferedReader br = new BufferedReader(isr);
Activity activity = new Activity();
- List<Comment> comments = Lists.newArrayList();
+ List<Comment> comments = new ArrayList<>();
try {
while (br.ready()) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
index 39da75d..031716e 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/org/apache/streams/gplus/test/providers/GPlusUserDataProviderIT.java
@@ -18,11 +18,10 @@
package org.apache.streams.gplus.test.providers;
-import com.google.common.collect.Lists;
import com.google.gplus.provider.GPlusUserDataProvider;
-import org.testng.annotations.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
import java.io.File;
import java.io.FileReader;
@@ -42,7 +41,7 @@ public class GPlusUserDataProviderIT {
args[0] = configfile;
args[1] = outfile;
- Thread testThread = new Thread((Runnable) () -> {
+ Thread testThread = new Thread(() -> {
try {
GPlusUserDataProvider.main(args);
} catch ( Exception ex ) {
@@ -52,7 +51,7 @@ public class GPlusUserDataProviderIT {
testThread.start();
testThread.join(60000);
- GPlusUserDataProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
+ GPlusUserDataProvider.main(new String[]{configfile, outfile});
File out = new File(outfile);
assert (out.exists());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/pom.xml b/streams-contrib/streams-provider-instagram/pom.xml
index a8b5989..5831cd9 100644
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@ -77,10 +77,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 6fd6b4e..036ae85 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
@@ -25,13 +25,15 @@ import org.apache.streams.instagram.serializer.InstagramUserInfoDataConverter;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import com.google.common.collect.Lists;
import org.jinstagram.entity.users.basicinfo.UserInfoData;
import org.jinstagram.entity.users.feed.MediaFeedData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* This is deprecated - use ActivityConverterProcessor or ActivityObjectConverterProcessor.
@@ -46,7 +48,7 @@ public class InstagramTypeConverter implements StreamsProcessor {
private InstagramMediaFeedDataConverter mediaFeedDataConverter;
private InstagramUserInfoDataConverter userInfoDataConverter;
- public static final String TERMINATE = new String("TERMINATE");
+ public static final String TERMINATE = "TERMINATE";
@Override
public String getId() {
@@ -88,9 +90,9 @@ public class InstagramTypeConverter implements StreamsProcessor {
}
if ( result != null ) {
- return Lists.newArrayList(result);
+ return Stream.of(result).collect(Collectors.toList());
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
index 98d0f3c..52ef214 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/userinfo/InstagramUserInfoCollector.java
@@ -20,7 +20,6 @@ import org.apache.streams.instagram.InstagramConfiguration;
import org.apache.streams.instagram.User;
import org.apache.streams.instagram.provider.InstagramDataCollector;
-import com.google.common.collect.Lists;
import org.jinstagram.entity.users.basicinfo.UserInfo;
import org.jinstagram.entity.users.basicinfo.UserInfoData;
import org.jinstagram.exceptions.InstagramBadRequestException;
@@ -28,6 +27,7 @@ import org.jinstagram.exceptions.InstagramRateLimitException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
@@ -75,7 +75,7 @@ public class InstagramUserInfoCollector extends InstagramDataCollector<UserInfoD
}
if (successful = (userInfo != null)) {
this.consecutiveErrorCount = 0;
- List<UserInfoData> data = Lists.newLinkedList();
+ List<UserInfoData> data = new LinkedList<>();
data.add(userInfo.getData());
super.queueData(data, user.getUserId());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
index 49e3c01..2b4cb66 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
@@ -27,7 +27,6 @@ import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
-import com.google.common.base.Joiner;
import org.jinstagram.entity.comments.CommentData;
import org.jinstagram.entity.common.Comments;
import org.jinstagram.entity.common.ImageData;
@@ -47,6 +46,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* Provides utilities for working with Activity objects within the context of Instagram.
@@ -312,7 +313,8 @@ public class InstagramActivityUtil {
* @return a valid Activity ID in format "id:instagram:part1:part2:...partN"
*/
public static String formatId(String... idparts) {
- return Joiner.on(":").join(Arrays.asList("id:instagram", idparts));
+ return String.join(":",
+ Stream.concat(Arrays.stream(new String[]{"id:instagram"}), Arrays.stream(idparts)).collect(Collectors.toList()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml
index 548f534..5e501f0 100644
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@ -60,10 +60,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
index 4d00075..b8cf27c 100644
--- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
+++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/provider/MoreoverProviderIT.java
@@ -22,7 +22,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.moreover.MoreoverProvider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
@@ -47,7 +46,7 @@ public class MoreoverProviderIT {
String configfile = "./target/test-classes/MoreoverProviderIT.conf";
String outfile = "./target/test-classes/MoreoverProviderIT.stdout.txt";
- MoreoverProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
+ MoreoverProvider.main(new String[]{configfile, outfile});
File out = new File(outfile);
assert (out.exists());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml
index 6a237d5..54320ad 100644
--- a/streams-contrib/streams-provider-rss/pom.xml
+++ b/streams-contrib/streams-provider-rss/pom.xml
@@ -68,10 +68,6 @@
<artifactId>streams-config</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/pom.xml b/streams-contrib/streams-provider-sysomos/pom.xml
index b00793c..e3b4393 100644
--- a/streams-contrib/streams-provider-sysomos/pom.xml
+++ b/streams-contrib/streams-provider-sysomos/pom.xml
@@ -68,10 +68,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/processor/SysomosTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/processor/SysomosTypeConverter.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/processor/SysomosTypeConverter.java
index 48615eb..3f228b4 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/processor/SysomosTypeConverter.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/processor/SysomosTypeConverter.java
@@ -23,10 +23,12 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.sysomos.conversion.SysomosBeatActivityConverter;
-import com.google.common.collect.Lists;
import com.sysomos.xml.BeatApi;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* Stream processor that converts Sysomos type to Activity.
@@ -46,9 +48,9 @@ public class SysomosTypeConverter implements StreamsProcessor {
public List<StreamsDatum> process(StreamsDatum entry) {
if (entry.getDocument() instanceof BeatApi.BeatResponse.Beat) {
entry.setDocument(converter.convert((BeatApi.BeatResponse.Beat)entry.getDocument()));
- return Lists.newArrayList(entry);
+ return Stream.of(entry).collect(Collectors.toList());
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java b/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
index e5b5400..7d0a7d3 100644
--- a/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
+++ b/streams-contrib/streams-provider-sysomos/src/test/java/org/apache/streams/sysomos/test/provider/SysomosProviderIT.java
@@ -22,7 +22,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.sysomos.provider.SysomosProvider;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
@@ -48,7 +47,7 @@ public class SysomosProviderIT {
String configfile = "./target/test-classes/SysomosProviderIT.conf";
String outfile = "./target/test-classes/SysomosProviderIT.stdout.txt";
- SysomosProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
+ SysomosProvider.main(new String[]{configfile, outfile});
File out = new File(outfile);
assert (out.exists());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/pom.xml b/streams-contrib/streams-provider-twitter/pom.xml
index f97a984..40d9fa5 100644
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@ -80,10 +80,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterFollowActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterFollowActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterFollowActivityConverter.java
index f34c14a..fccae58 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterFollowActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterFollowActivityConverter.java
@@ -25,11 +25,12 @@ import org.apache.streams.pojo.json.Provider;
import org.apache.streams.twitter.converter.util.TwitterActivityUtil;
import org.apache.streams.twitter.pojo.Follow;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import java.io.Serializable;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
public class TwitterFollowActivityConverter implements ActivityConverter<Follow>, Serializable {
@@ -73,7 +74,7 @@ public class TwitterFollowActivityConverter implements ActivityConverter<Follow>
activity.setObject(TwitterActivityUtil.buildActor(event.getFollowee()));
activity.setId(activity.getActor().getId() + "-follow->" + activity.getObject().getId());
activity.setProvider((Provider) new Provider().withId("twitter"));
- return Lists.newArrayList(activity);
+ return Stream.of(activity).collect(Collectors.toList());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonDeleteActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonDeleteActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonDeleteActivityConverter.java
index ac031b4..0e290ac 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonDeleteActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonDeleteActivityConverter.java
@@ -25,11 +25,12 @@ import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.twitter.pojo.Delete;
import org.apache.streams.twitter.pojo.Tweet;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import java.io.Serializable;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
@@ -77,7 +78,7 @@ public class TwitterJsonDeleteActivityConverter implements ActivityConverter<Del
Activity activity = new Activity();
updateActivity(delete, activity);
- return Lists.newArrayList(activity);
+ return Stream.of(activity).collect(Collectors.toList());
}
public ActivityObject buildTarget(Tweet tweet) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonRetweetActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonRetweetActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonRetweetActivityConverter.java
index 13e2568..feb3e58 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonRetweetActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonRetweetActivityConverter.java
@@ -23,11 +23,13 @@ import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.twitter.pojo.Retweet;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
@@ -67,12 +69,12 @@ public class TwitterJsonRetweetActivityConverter implements ActivityConverter<Re
Activity activity = new Activity();
updateActivity(retweet, activity);
- return Lists.newArrayList(activity);
+ return Stream.of(activity).collect(Collectors.toList());
}
@Override
public List<Activity> toActivityList(List<Retweet> serializedList) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
for ( Retweet item : serializedList ) {
try {
List<Activity> activities = toActivityList(item);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonTweetActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonTweetActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonTweetActivityConverter.java
index c3b5b15..d96392f 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonTweetActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonTweetActivityConverter.java
@@ -23,11 +23,13 @@ import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.twitter.pojo.Tweet;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
@@ -68,12 +70,12 @@ public class TwitterJsonTweetActivityConverter implements ActivityConverter<Twee
updateActivity(tweet, activity);
- return Lists.newArrayList(activity);
+ return Stream.of(activity).collect(Collectors.toList());
}
@Override
public List<Activity> toActivityList(List<Tweet> serializedList) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
for ( Tweet item : serializedList ) {
try {
List<Activity> activities = toActivityList(item);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
index 6685a96..c96b1a8 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
@@ -24,11 +24,12 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.twitter.pojo.UserstreamEvent;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.StringUtils;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.formatId;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.getProvider;
@@ -72,7 +73,7 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv
public List<Activity> toActivityList(UserstreamEvent userstreamEvent) throws ActivityConversionException {
Activity activity = convert(userstreamEvent);
- return Lists.newArrayList(activity);
+ return Stream.of(activity).collect(Collectors.toList());
}
@@ -94,7 +95,7 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv
activity.setVerb(detectVerb(event));
activity.setObject(buildActivityObject(event));
activity.setId(formatId(activity.getVerb()));
- if (Strings.isNullOrEmpty(activity.getId())) {
+ if (StringUtils.isEmpty(activity.getId())) {
throw new ActivityConversionException("Unable to determine activity id");
}
activity.setProvider(getProvider());
@@ -107,9 +108,7 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv
* @return $.actor
*/
public ActivityObject buildActor(UserstreamEvent event) {
- ActivityObject actor = new ActivityObject();
- //actor.setId(formatId(delete.getDelete().getStatus().getUserIdStr()));
- return actor;
+ return new ActivityObject();
}
/**
@@ -118,10 +117,7 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv
* @return $.object
*/
public ActivityObject buildActivityObject(UserstreamEvent event) {
- ActivityObject actObj = new ActivityObject();
- //actObj.setId(formatId(delete.getDelete().getStatus().getIdStr()));
- //actObj.setObjectType("tweet");
- return actObj;
+ return new ActivityObject();
}
public String detectVerb(UserstreamEvent event) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 242f2e5..6392e0d 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
@@ -39,16 +39,18 @@ import org.apache.streams.twitter.pojo.UserMentions;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static com.google.common.math.DoubleMath.mean;
@@ -300,7 +302,7 @@ public class TwitterActivityUtil {
* @return a valid Activity ID in format "id:twitter:part1:part2:...partN"
*/
public static String formatId(String... idparts) {
- return String.join(":", Lists.asList("id:twitter", idparts));
+ return String.join(":", Stream.concat(Arrays.stream(new String[]{"id:twitter"}), Arrays.stream(idparts)).collect(Collectors.toList()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/db897a21/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 c1c205b..89a5abd 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
@@ -35,7 +35,6 @@ import org.apache.streams.twitter.pojo.Tweet;
import org.apache.streams.twitter.provider.TwitterProviderUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import twitter4j.Status;
@@ -46,6 +45,8 @@ import twitter4j.TwitterObjectFactory;
import twitter4j.conf.ConfigurationBuilder;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.getProvider;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
@@ -93,7 +94,7 @@ public class FetchAndReplaceTwitterProcessor implements StreamsProcessor {
} else {
throw new IllegalStateException("Requires an activity document");
}
- return Lists.newArrayList(entry);
+ return Stream.of(entry).collect(Collectors.toList());
}