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/11/26 18:08:08 UTC
[7/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
STREAMS-441: Remove compile dependency on guava for core packages, this closes apache/incubator-streams#320
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c64f8435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c64f8435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c64f8435
Branch: refs/heads/master
Commit: c64f8435dd6958d342c6ebf89181c903f4293b7c
Parents: 745451d
Author: smarthi <sm...@apache.org>
Authored: Sat Nov 26 13:07:34 2016 -0500
Committer: smarthi <sm...@apache.org>
Committed: Sat Nov 26 13:07:34 2016 -0500
----------------------------------------------------------------------
.../converter/ActivityConverterProcessor.java | 9 ++-
.../ActivityObjectConverterProcessor.java | 9 ++-
.../converter/ActivityObjectConverterUtil.java | 24 +++----
.../converter/BaseDocumentClassifier.java | 1 -
.../BaseObjectNodeActivityConverter.java | 4 +-
.../converter/BaseStringActivityConverter.java | 12 ++--
.../BaseStringActivityObjectConverter.java | 2 +-
.../converter/HoconConverterProcessor.java | 5 +-
.../streams/converter/HoconConverterUtil.java | 3 +-
.../streams/converter/LineReadWriteUtil.java | 28 ++++----
.../converter/TypeConverterProcessor.java | 8 +--
.../streams/converter/TypeConverterUtil.java | 1 -
.../BaseActivityConverterProcessorTest.java | 13 ++--
...aseActivityObjectConverterProcessorTest.java | 14 ++--
.../converter/test/CustomActivityConverter.java | 11 ++-
.../CustomActivityConverterProcessorTest.java | 19 ++---
.../test/CustomActivityObjectConverter.java | 8 +--
...tomActivityObjectConverterProcessorTest.java | 23 +++---
.../test/CustomDocumentClassifier.java | 21 +++---
.../streams/converter/test/CustomType.java | 4 +-
.../test/HoconConverterProcessorTest.java | 17 ++---
.../converter/test/HoconConverterTest.java | 27 ++-----
.../NoConfigActivityConverterProcessorTest.java | 14 ++--
.../converter/test/TestLineReadWriteUtil.java | 36 +++++-----
.../test/TypeConverterProcessorTest.java | 23 +++---
.../filters/VerbDefinitionDropFilter.java | 10 +--
.../filters/VerbDefinitionKeepFilter.java | 10 +--
.../filters/test/VerbDefinitionFilterTest.java | 9 ++-
.../persist/SimpleHTTPPostPersistWriter.java | 15 ++--
.../http/processor/SimpleHTTPGetProcessor.java | 15 ++--
.../http/processor/SimpleHTTPPostProcessor.java | 27 +++----
.../http/provider/SimpleHttpProvider.java | 19 ++---
.../java/SimpleHTTPPostPersistWriterTest.java | 1 -
.../streams/config/ComponentConfigurator.java | 1 -
.../streams/config/StreamsConfigurator.java | 1 -
.../config/test/ComponentConfiguratorTest.java | 7 +-
.../config/test/StreamsConfiguratorTest.java | 27 ++-----
.../amazon/kinesis/KinesisPersistReader.java | 7 +-
.../kinesis/KinesisPersistReaderTask.java | 1 -
.../amazon/kinesis/KinesisPersistWriter.java | 5 +-
.../streams/s3/S3ObjectInputStreamWrapper.java | 1 -
.../streams/s3/S3OutputStreamWrapper.java | 1 -
.../org/apache/streams/s3/S3PersistReader.java | 9 ++-
.../apache/streams/s3/S3PersistReaderTask.java | 3 +-
.../org/apache/streams/s3/S3PersistWriter.java | 11 ++-
.../streams/console/ConsolePersistWriter.java | 9 ++-
.../ElasticsearchClientManager.java | 1 -
.../ElasticsearchPersistDeleter.java | 15 ++--
.../ElasticsearchPersistReader.java | 3 +-
.../ElasticsearchPersistUpdater.java | 19 +++--
.../ElasticsearchPersistWriter.java | 13 ++--
.../elasticsearch/ElasticsearchQuery.java | 1 -
.../DatumFromMetadataAsDocumentProcessor.java | 1 -
.../processor/DatumFromMetadataProcessor.java | 1 -
.../processor/DocumentToMetadataProcessor.java | 1 -
.../MetadataFromDocumentProcessor.java | 1 -
.../processor/PercolateTagProcessor.java | 23 +++---
.../test/DatumFromMetadataProcessorIT.java | 5 +-
.../test/ElasticsearchParentChildUpdaterIT.java | 29 +++-----
.../test/ElasticsearchParentChildWriterIT.java | 23 +++---
.../test/ElasticsearchPersistUpdaterIT.java | 5 +-
.../test/ElasticsearchPersistWriterIT.java | 5 +-
.../test/TestDocumentToMetadataProcessor.java | 15 ++--
.../test/TestMetadataFromDocumentProcessor.java | 1 -
.../filebuffer/FileBufferPersistReader.java | 11 ++-
.../filebuffer/FileBufferPersistWriter.java | 14 ++--
.../filebuffer/test/FileBufferPersistIT.java | 28 ++++----
.../filebuffer/test/TestFileBufferPersist.java | 1 +
.../org/apache/streams/graph/GraphHelper.java | 13 ++--
.../streams/graph/GraphHttpPersistWriter.java | 35 +++++----
.../apache/streams/graph/GraphVertexReader.java | 7 +-
.../apache/streams/graph/HttpGraphHelper.java | 3 +-
.../graph/neo4j/CypherQueryGraphHelper.java | 30 ++++----
.../graph/neo4j/Neo4jHttpGraphHelper.java | 15 ++--
.../graph/test/TestNeo4jHttpVertexReader.java | 4 +-
.../streams/hbase/HbasePersistWriter.java | 1 -
.../streams/hdfs/WebHdfsPersistReader.java | 75 +++++++++-----------
.../streams/hdfs/WebHdfsPersistReaderTask.java | 1 -
.../streams/hdfs/WebHdfsPersistWriter.java | 3 +-
.../hdfs/test/HdfsPersistConfigTest.java | 19 +++--
.../streams/hdfs/test/TestHdfsPersist.java | 29 ++++----
.../streams/kafka/KafkaPersistReader.java | 16 ++---
.../streams/kafka/KafkaPersistReaderTask.java | 11 ++-
.../streams/kafka/KafkaPersistWriter.java | 8 +--
.../streams/mongo/MongoPersistReader.java | 1 -
.../streams/mongo/MongoPersistWriter.java | 1 -
.../streams/mongo/test/MongoPersistIT.java | 1 -
.../CleanAdditionalPropertiesProcessor.java | 5 +-
.../streams/jackson/TypeConverterProcessor.java | 8 +--
.../test/TypeConverterProcessorTest.java | 17 +++--
.../apache/streams/json/JsonPathExtractor.java | 11 +--
.../org/apache/streams/json/JsonPathFilter.java | 14 ++--
.../json/test/JsonPathExtractorTest.java | 1 -
.../regex/AbstractRegexExtensionExtractor.java | 9 ++-
.../org/apache/streams/regex/RegexUtils.java | 1 -
.../regex/RegexHashtagExtractorTest.java | 3 +-
.../regex/RegexMentionExtractorTest.java | 10 ++-
.../streams/regex/RegexUrlExtractorTest.java | 8 ++-
.../org/apache/streams/urls/LinkResolver.java | 39 +++++-----
.../urls/LinkResolverHelperFunctions.java | 10 ++-
.../streams/urls/LinkResolverProcessor.java | 13 ++--
.../streams/urls/LinkHelperFunctionsTest.java | 6 +-
.../streams/urls/TestLinkUnwinderProcessor.java | 44 ++++++------
.../api/FacebookPageActivitySerializer.java | 1 -
.../api/FacebookPostActivitySerializer.java | 1 -
.../processor/FacebookTypeConverter.java | 6 +-
.../provider/FacebookDataCollector.java | 10 ++-
.../provider/FacebookEventClassifier.java | 1 -
.../provider/FacebookFriendFeedProvider.java | 31 ++++----
.../provider/FacebookFriendUpdatesProvider.java | 49 ++++++-------
.../facebook/provider/FacebookProvider.java | 3 +-
.../FacebookUserInformationProvider.java | 39 +++++-----
.../provider/FacebookUserstreamProvider.java | 47 ++++++------
.../page/FacebookPageDataCollector.java | 11 ++-
.../provider/page/FacebookPageProvider.java | 6 +-
.../pagefeed/FacebookPageFeedDataCollector.java | 10 ++-
.../pagefeed/FacebookPageFeedProvider.java | 6 +-
.../serializer/FacebookActivityUtil.java | 32 ++++-----
.../streams/facebook/test/SimplePageTest.java | 3 +-
.../apache/streams/facebook/test/TestPage.java | 6 +-
.../test/data/FacebookActivityActorSerDeIT.java | 1 -
.../test/data/FacebookActivitySerDeIT.java | 1 -
.../facebook/test/data/FacebookPageSerDeIT.java | 1 -
.../facebook/test/data/FacebookPostSerDeIT.java | 1 -
.../providers/page/FacebookPageProviderIT.java | 3 +-
.../gmail/provider/GMailImapProviderTask.java | 1 -
.../GMailMessageActivitySerializer.java | 2 -
.../google/gmail/provider/GMailProvider.java | 11 ++-
.../gmail/test/GMailMessageSerDeTest.java | 1 -
.../processor/GooglePlusTypeConverter.java | 7 +-
.../gplus/provider/AbstractGPlusProvider.java | 12 ++--
.../gplus/provider/GPlusActivitySerializer.java | 1 -
.../gplus/provider/GPlusDataCollector.java | 1 -
.../provider/GPlusUserActivityCollector.java | 2 -
.../gplus/provider/GPlusUserDataCollector.java | 3 +-
.../util/GPlusActivityDeserializer.java | 1 -
.../util/GPlusCommentDeserializer.java | 1 -
.../util/GPlusPersonDeserializer.java | 4 +-
.../serializer/util/GooglePlusActivityUtil.java | 41 +++++------
.../google/gplus/GooglePlusCommentSerDeIT.java | 5 +-
.../google/gplus/GooglePlusPersonSerDeIT.java | 3 +-
.../processor/GooglePlusActivitySerDeIT.java | 1 -
.../processor/GooglePlusTypeConverterTest.java | 1 -
.../provider/TestAbstractGPlusProvider.java | 18 ++---
.../TestGPlusUserActivityCollector.java | 14 ++--
.../provider/TestGPlusUserDataCollector.java | 15 +---
.../provider/InstagramAbstractProvider.java | 4 --
.../InstagramMediaFeedDataConverter.java | 4 +-
.../serializer/util/InstagramActivityUtil.java | 12 ++--
.../streams/moreover/MoreoverProvider.java | 13 ++--
.../apache/streams/moreover/MoreoverResult.java | 7 +-
.../test/MoreoverXmlActivitySerializerIT.java | 4 +-
.../streams/rss/processor/RssTypeConverter.java | 4 +-
.../streams/rss/provider/RssStreamProvider.java | 9 +--
.../provider/perpetual/RssFeedScheduler.java | 6 +-
.../serializer/SyndEntryActivitySerializer.java | 4 +-
.../rss/serializer/SyndEntrySerializer.java | 6 +-
.../rss/provider/RssStreamProviderTest.java | 4 +-
.../perpetual/RssFeedSchedulerTest.java | 18 ++---
.../streams/rss/test/RssStreamProviderIT.java | 10 +--
.../rss/test/SyndEntryActivitySerializerIT.java | 12 ++--
.../streams/sysomos/provider/SysomosClient.java | 4 --
.../converter/TwitterDocumentClassifier.java | 8 +--
.../TwitterJsonUserActivityConverter.java | 9 +--
.../converter/util/TwitterActivityUtil.java | 40 +++++------
.../provider/TwitterFollowingProviderTask.java | 32 ++++-----
.../twitter/provider/TwitterStreamHelper.java | 5 +-
.../twitter/provider/TwitterStreamProvider.java | 49 ++++++-------
.../TwitterUserInformationProvider.java | 55 +++++++-------
.../youtube/processor/YoutubeTypeConverter.java | 16 ++---
.../com/youtube/provider/YoutubeProvider.java | 16 ++---
.../youtube/serializer/YoutubeActivityUtil.java | 25 +++----
.../serializer/YoutubeChannelDeserializer.java | 13 ++--
.../serializer/YoutubeEventClassifier.java | 3 +-
.../YoutubeChannelDataCollectorTest.java | 8 +--
.../youtube/provider/YoutubeProviderTest.java | 12 ++--
.../YoutubeUserActivityCollectorTest.java | 19 ++---
.../org/apache/streams/core/StreamBuilder.java | 28 +++-----
.../apache/streams/core/StreamsOperation.java | 6 +-
.../tasks/BroadcastMonitorThread.java | 21 +++---
.../impl/LogstashUdpMessagePersisterTest.java | 5 +-
.../StreamsCassandraResourceGenerator.java | 30 ++++----
...StreamsCassandraResourceGeneratorMojoIT.java | 11 +--
.../StreamsElasticsearchResourceGenerator.java | 21 +++---
...amsElasticsearchResourceGeneratorMojoIT.java | 4 +-
.../hbase/StreamsHbaseResourceGenerator.java | 11 +--
.../StreamsHbaseResourceGeneratorCLITest.java | 7 +-
.../StreamsHbaseResourceGeneratorMojoIT.java | 16 ++---
.../test/StreamsHbaseResourceGeneratorTest.java | 29 +++-----
.../StreamsHiveResourceGeneratorMojoIT.java | 13 ++--
.../pig/StreamsPigResourceGenerator.java | 63 ++++++++--------
.../test/StreamsPigResourceGeneratorMojoIT.java | 13 ++--
.../test/StreamsPojoSourceGeneratorMojoIT.java | 16 ++---
.../test/StreamsScalaSourceGeneratorMojoIT.java | 11 +--
.../test/StreamsScalaSourceGeneratorTest.java | 25 +------
.../apache/streams/data/util/PropertyUtil.java | 24 +++----
.../streams/pojo/extensions/ExtensionUtil.java | 6 +-
.../pojo/extensions/test/ExtensionUtilTest.java | 4 +-
.../jackson/StreamsDateTimeDeserializer.java | 4 +-
.../streams/jackson/StreamsDateTimeFormat.java | 2 +-
.../jackson/StreamsDateTimeSerializer.java | 4 +-
.../streams/jackson/StreamsJacksonMapper.java | 16 ++---
.../streams/jackson/StreamsJacksonModule.java | 2 +-
.../streams/pojo/test/ActivitySerDeTest.java | 2 +-
.../local/builders/LocalStreamBuilder.java | 32 ++++-----
.../streams/local/builders/StreamComponent.java | 21 +++---
.../streams/pig/StreamsProcessDatumExec.java | 15 ++--
.../org/apache/streams/util/ComponentUtils.java | 1 -
.../java/org/apache/streams/util/GuidUtils.java | 12 ++--
.../apache/streams/util/SerializationUtil.java | 4 +-
.../tokenmanager/impl/BasicTokenManager.java | 14 ++--
.../apache/streams/util/schema/FieldUtil.java | 29 ++++----
.../apache/streams/util/schema/FileUtil.java | 4 +-
.../apache/streams/util/schema/SchemaStore.java | 2 +-
.../streams/util/schema/SchemaStoreImpl.java | 15 ++--
.../org/apache/streams/util/schema/UriUtil.java | 6 +-
.../util/schema/test/SchemaOrderingTest.java | 31 ++++----
.../util/schema/test/SchemaStoreTest.java | 3 -
.../verbs/ObjectCombinationGenericOrdering.java | 10 +--
.../ObjectCombinationSpecificOrdering.java | 12 ++--
.../streams/verbs/VerbDefinitionMatchUtil.java | 2 +-
.../streams/verbs/VerbDefinitionResolver.java | 24 +++----
.../verbs/VerbDefinitionTemplateUtil.java | 8 +--
.../verbs/VerbDefinitionTemplateTest.java | 2 +-
.../streams/verbs/VerbDefinitionTest.java | 4 +-
225 files changed, 1163 insertions(+), 1540 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
index 79b5d56..b116998 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java
@@ -24,11 +24,10 @@ import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.core.util.DatumUtils;
import org.apache.streams.pojo.json.Activity;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -68,7 +67,7 @@ public class ActivityConverterProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
Object document = entry.getDocument();
try {
@@ -85,10 +84,10 @@ public class ActivityConverterProcessor implements StreamsProcessor {
} catch (Exception ex) {
LOGGER.warn("General exception in process! " + ex.getMessage());
- } finally {
- return result;
}
+ return result;
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterProcessor.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterProcessor.java
index d77cbec..bb348b6 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterProcessor.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterProcessor.java
@@ -24,11 +24,10 @@ import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.core.util.DatumUtils;
import org.apache.streams.pojo.json.ActivityObject;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -68,7 +67,7 @@ public class ActivityObjectConverterProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
Object document = entry.getDocument();
try {
@@ -83,10 +82,10 @@ public class ActivityObjectConverterProcessor implements StreamsProcessor {
} catch ( Exception ex ) {
LOGGER.warn("General exception in process! " + ex.getMessage());
- } finally {
- return result;
}
+ return result;
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 408384d..e3986c9 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
@@ -26,8 +26,6 @@ import org.apache.streams.pojo.json.ActivityObject;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
@@ -37,6 +35,7 @@ import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -74,8 +73,8 @@ public class ActivityObjectConverterUtil {
return new ActivityObjectConverterUtil(configuration);
}
- private List<DocumentClassifier> classifiers = Lists.newLinkedList();
- private List<ActivityObjectConverter> converters = Lists.newLinkedList();
+ private List<DocumentClassifier> classifiers = new LinkedList<>();
+ private List<ActivityObjectConverter> converters = new LinkedList<>();
/*
Use getInstance to get a globally shared thread-safe ActivityConverterUtil,
@@ -135,9 +134,7 @@ public class ActivityObjectConverterUtil {
convertedDocs.put(requiredClass, activityObject);
}
- ActivityObject result = deepestDescendant(convertedDocs);
-
- return result;
+ return deepestDescendant(convertedDocs);
}
protected ActivityObject applyConverter(ActivityObjectConverter converter, Object typedDoc) {
@@ -192,7 +189,7 @@ public class ActivityObjectConverterUtil {
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;
@@ -242,14 +239,9 @@ public class ActivityObjectConverterUtil {
}
private boolean isAncestor(Class possibleDescendant, Class possibleAncestor) {
- if (possibleDescendant.equals(Object.class)) {
- return false;
- }
- if (possibleDescendant.getSuperclass().equals(possibleAncestor)) {
- return true;
- } else {
- return isAncestor(possibleDescendant.getSuperclass(), possibleAncestor);
- }
+ return !possibleDescendant.equals(Object.class) &&
+ (possibleDescendant.getSuperclass().equals(possibleAncestor) ||
+ isAncestor(possibleDescendant.getSuperclass(), possibleAncestor));
}
// prefer the most specific ActivityObject sub-class returned by all converters
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 cdba150..cd99b2f 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
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 cb61f0e..1048b4d 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
@@ -27,7 +27,6 @@ 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;
@@ -82,9 +81,8 @@ public class BaseObjectNodeActivityConverter implements ActivityConverter<Object
activityList.add(mapper.convertValue(serialized, Activity.class));
} catch (Exception ex) {
throw new ActivityConversionException();
- } finally {
- return activityList;
}
+ return activityList;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityConverter.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityConverter.java
index da15dee..74d5177 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityConverter.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityConverter.java
@@ -26,12 +26,11 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-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;
/**
@@ -39,7 +38,7 @@ import java.util.List;
*
* <p/>
* BaseObjectNodeActivityConverter is included by default in all
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * {@link org.apache.streams.converter.ActivityConverterProcessor}
*
*/
public class BaseStringActivityConverter implements ActivityConverter<String> {
@@ -76,19 +75,18 @@ public class BaseStringActivityConverter implements ActivityConverter<String> {
@Override
public List<Activity> toActivityList(String serialized) throws ActivityConversionException {
- List<Activity> activityList = Lists.newArrayList();
+ List<Activity> activityList = new ArrayList<>();
try {
activityList.add(mapper.readValue(serialized, Activity.class));
} catch (Exception ex) {
throw new ActivityConversionException();
- } finally {
- return activityList;
}
+ return activityList;
}
@Override
public List<Activity> toActivityList(List<String> list) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
for ( String item : list ) {
try {
result.addAll(toActivityList(item));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityObjectConverter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityObjectConverter.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityObjectConverter.java
index 7322fc1..5434c7d 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityObjectConverter.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/BaseStringActivityObjectConverter.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*
* <p/>
* BaseObjectNodeActivityConverter is included by default in all
- * @see {@link ActivityConverterProcessor}
+ * {@link ActivityConverterProcessor}
*
*/
public class BaseStringActivityObjectConverter implements ActivityObjectConverter<String> {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterProcessor.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterProcessor.java
index 44aa56b..41de6c5 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterProcessor.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterProcessor.java
@@ -23,11 +23,10 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.core.util.DatumUtils;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -71,7 +70,7 @@ public class HoconConverterProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
Object document = entry.getDocument();
Object outDoc = HoconConverterUtil.getInstance().convert(document, outClass, hocon, inPath, outPath);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterUtil.java
index bac081c..1f68f6c 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/HoconConverterUtil.java
@@ -28,7 +28,6 @@ import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigObject;
import com.typesafe.config.ConfigRenderOptions;
import com.typesafe.config.ConfigValue;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +78,7 @@ public class HoconConverterUtil {
* @return result
*/
public Object convert(Object object, Class outClass, Config hocon, String inPath, String outPath) {
- String json = null;
+ String json;
Object outDoc = null;
if ( object instanceof String ) {
json = (String) object;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
index d245c3e..9ffc653 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
@@ -18,23 +18,24 @@
package org.apache.streams.converter;
+import org.apache.streams.core.StreamsDatum;
+import org.apache.streams.jackson.StreamsJacksonMapper;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.jackson.StreamsJacksonMapper;
+import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* LineReadWriteUtil converts Datums to/from character array appropriate for writing to
@@ -44,14 +45,11 @@ public class LineReadWriteUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(TypeConverterUtil.class);
- private static Map<LineReadWriteConfiguration, LineReadWriteUtil> INSTANCE_MAP = Maps.newConcurrentMap();
-
- private static final List<String> DEFAULT_FIELDS = Lists.newArrayList("ID", "SEQ", "TS", "META", "DOC");
+ private static Map<LineReadWriteConfiguration, LineReadWriteUtil> INSTANCE_MAP = new ConcurrentHashMap<>();
private List<String> fields;
private String fieldDelimiter = "\t";
private String lineDelimiter = "\n";
- private String encoding = "UTF-8";
private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
@@ -62,7 +60,7 @@ public class LineReadWriteUtil {
this.fields = configuration.getFields();
this.fieldDelimiter = configuration.getFieldDelimiter();
this.lineDelimiter = configuration.getLineDelimiter();
- this.encoding = configuration.getEncoding();
+ String encoding = configuration.getEncoding();
}
public static LineReadWriteUtil getInstance() {
@@ -167,12 +165,12 @@ public class LineReadWriteUtil {
LOGGER.warn("Error converting document to string", ex);
}
- if (Strings.isNullOrEmpty(documentJson)) {
+ if (StringUtils.isBlank(documentJson)) {
return null;
} else {
StringBuilder stringBuilder = new StringBuilder();
Iterator<String> fields = this.fields.iterator();
- List<String> fielddata = Lists.newArrayList();
+ List<String> fielddata = new ArrayList<>();
Joiner joiner = Joiner.on(fieldDelimiter).useForNull("");
while( fields.hasNext() ) {
String field = fields.next();
@@ -207,8 +205,8 @@ public class LineReadWriteUtil {
/**
* parseTs
- * @param field
- * @return
+ * @param field - dateTime string to be parsed
+ * @return {@link DateTime}
*/
public DateTime parseTs(String field) {
@@ -250,7 +248,7 @@ public class LineReadWriteUtil {
}
private String trimLineDelimiter(String str) {
- if ( !Strings.isNullOrEmpty(str)) {
+ if ( !StringUtils.isNotBlank(str)) {
if (str.endsWith(lineDelimiter)) {
return str.substring(0, str.length() - 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java
index a269f4d..bd0b304 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java
@@ -24,12 +24,12 @@ import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -49,7 +49,7 @@ public class TypeConverterProcessor implements StreamsProcessor, Serializable {
private static final Logger LOGGER = LoggerFactory.getLogger(TypeConverterProcessor.class);
- private List<String> formats = Lists.newArrayList();
+ private List<String> formats = new ArrayList<>();
protected ObjectMapper mapper;
@@ -72,7 +72,7 @@ public class TypeConverterProcessor implements StreamsProcessor, Serializable {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
Object inDoc = entry.getDocument();
Object outDoc = TypeConverterUtil.getInstance().convert(inDoc, outClass, mapper);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterUtil.java
index 8843d0e..abf3151 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterUtil.java
@@ -22,7 +22,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityConverterProcessorTest.java
index f680764..2b41459 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityConverterProcessorTest.java
@@ -18,24 +18,27 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.converter.ActivityConverterProcessor;
import org.apache.streams.converter.ActivityConverterProcessorConfiguration;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Before;
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;
/**
* Test for
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * {@link org.apache.streams.converter.ActivityConverterProcessor}
*
* Test that default String & ObjectNode conversion works.
*/
@@ -45,7 +48,7 @@ public class BaseActivityConverterProcessorTest {
private static final String ACTIVITY_JSON = "{\"id\":\"id\",\"published\":\"Tue Jan 17 21:21:46 Z 2012\",\"verb\":\"post\",\"provider\":{\"id\":\"providerid\"}}";
- ActivityConverterProcessor processor;
+ private ActivityConverterProcessor processor;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityObjectConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityObjectConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityObjectConverterProcessorTest.java
index 30b3ef0..ac78b0e 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityObjectConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/BaseActivityObjectConverterProcessorTest.java
@@ -18,25 +18,27 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.converter.ActivityObjectConverterProcessor;
import org.apache.streams.converter.ActivityObjectConverterProcessorConfiguration;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Before;
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;
/**
* Test for
- * @see {@link ActivityObjectConverterProcessor}
+ * {@link ActivityObjectConverterProcessor}
*
* Test that default String & ObjectNode conversion works.
*/
@@ -46,7 +48,7 @@ public class BaseActivityObjectConverterProcessorTest {
private static final String ACTIVITYOBJECT_JSON = "{\"id\":\"id\",\"objectType\":\"person\"}";
- ActivityObjectConverterProcessor processor;
+ private ActivityObjectConverterProcessor processor;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverter.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverter.java
index 8421273..8d55e89 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverter.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverter.java
@@ -18,20 +18,17 @@
package org.apache.streams.converter.test;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import org.apache.streams.converter.ActivityConverterProcessor;
-import org.apache.streams.converter.ActivityConverterProcessorConfiguration;
import org.apache.streams.data.ActivityConverter;
import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.Provider;
+import java.util.ArrayList;
import java.util.List;
/**
* Support class for
- * @see {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
+ * {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
*/
public class CustomActivityConverter implements ActivityConverter<CustomType> {
@@ -57,7 +54,9 @@ public class CustomActivityConverter implements ActivityConverter<CustomType> {
customActivity.setId(document.getTest());
customActivity.setVerb(document.getTest());
customActivity.setProvider((Provider)new Provider().withId(document.getTest()));
- return Lists.newArrayList(customActivity);
+ List<Activity> activityList = new ArrayList<>();
+ activityList.add(customActivity);
+ return activityList;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverterProcessorTest.java
index 89ad571..d5ef633 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityConverterProcessorTest.java
@@ -18,24 +18,27 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.converter.ActivityConverterProcessor;
import org.apache.streams.converter.ActivityConverterProcessorConfiguration;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Before;
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;
/**
* Test for
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * {@link org.apache.streams.converter.ActivityConverterProcessor}
*
* Test that arbitrary POJO conversion works, including when POJO represented as String & ObjectNode.
*/
@@ -43,15 +46,13 @@ public class CustomActivityConverterProcessorTest {
private static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- ActivityConverterProcessor processor;
-
- ActivityConverterProcessorConfiguration configuration;
+ private ActivityConverterProcessor processor;
- CustomType testDocument;
+ private CustomType testDocument;
@Before
public void setup() {
- configuration = new ActivityConverterProcessorConfiguration();
+ ActivityConverterProcessorConfiguration configuration = new ActivityConverterProcessorConfiguration();
configuration.getClassifiers().add(new CustomDocumentClassifier());
configuration.getConverters().add(new CustomActivityConverter());
processor = new ActivityConverterProcessor(configuration);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverter.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverter.java
index a20edc5..8296a99 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverter.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverter.java
@@ -18,19 +18,13 @@
package org.apache.streams.converter.test;
-import com.google.common.collect.Lists;
-import org.apache.streams.data.ActivityConverter;
import org.apache.streams.data.ActivityObjectConverter;
import org.apache.streams.exceptions.ActivityConversionException;
-import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Provider;
-
-import java.util.List;
/**
* Support class for
- * @see {@link CustomActivityObjectConverterProcessorTest}
+ * {@link CustomActivityObjectConverterProcessorTest}
*/
public class CustomActivityObjectConverter implements ActivityObjectConverter<CustomType> {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverterProcessorTest.java
index cefc0d5..4cf2907 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomActivityObjectConverterProcessorTest.java
@@ -18,27 +18,26 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.streams.converter.ActivityConverterProcessor;
-import org.apache.streams.converter.ActivityConverterProcessorConfiguration;
import org.apache.streams.converter.ActivityObjectConverterProcessor;
import org.apache.streams.converter.ActivityObjectConverterProcessorConfiguration;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Before;
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;
/**
- * Test for
- * @see {@link ActivityConverterProcessor}
+ * Test for {@link ActivityObjectConverterProcessor}
*
* Test that arbitrary POJO conversion works, including when POJO represented as String & ObjectNode.
*/
@@ -46,15 +45,13 @@ public class CustomActivityObjectConverterProcessorTest {
private static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- ActivityObjectConverterProcessor processor;
-
- ActivityObjectConverterProcessorConfiguration configuration;
+ private ActivityObjectConverterProcessor processor;
- CustomType testDocument;
+ private CustomType testDocument;
@Before
public void setup() {
- configuration = new ActivityObjectConverterProcessorConfiguration();
+ ActivityObjectConverterProcessorConfiguration configuration = new ActivityObjectConverterProcessorConfiguration();
configuration.getClassifiers().add(new CustomDocumentClassifier());
configuration.getConverters().add(new CustomActivityObjectConverter());
processor = new ActivityObjectConverterProcessor(configuration);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomDocumentClassifier.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomDocumentClassifier.java
index 685ce8c..9f8f8a9 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomDocumentClassifier.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomDocumentClassifier.java
@@ -19,22 +19,19 @@ under the License.
package org.apache.streams.converter.test;
-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.converter.ActivityConverterProcessorConfiguration;
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 com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
* Support class for
- * @see {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
+ * {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
*/
public class CustomDocumentClassifier implements DocumentClassifier {
@@ -43,10 +40,10 @@ public class CustomDocumentClassifier implements DocumentClassifier {
@Override
public List<Class> detectClasses(Object document) {
- CustomType possibleMatchDocument = null;
+ CustomType possibleMatchDocument;
ObjectNode node = null;
- List<Class> classes = Lists.newArrayList();
+ List<Class> classes = new ArrayList<>();
if( document instanceof String ) {
classes.add(String.class);
@@ -58,11 +55,11 @@ public class CustomDocumentClassifier 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);
- possibleMatchDocument = this.mapper.convertValue((ObjectNode)document, CustomType.class);
+ possibleMatchDocument = this.mapper.convertValue(document, CustomType.class);
if(possibleMatchDocument != null && possibleMatchDocument.getTest() != null) {
classes.add(CustomType.class);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomType.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomType.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomType.java
index 4253c9c..70d2391 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomType.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/CustomType.java
@@ -21,8 +21,8 @@ package org.apache.streams.converter.test;
/**
* Support class for
- * @see {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
- * @see {@link org.apache.streams.converter.test.CustomActivityObjectConverterProcessorTest}
+ * {@link org.apache.streams.converter.test.CustomActivityConverterProcessorTest}
+ * {@link org.apache.streams.converter.test.CustomActivityObjectConverterProcessorTest}
*/
public class CustomType {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterProcessorTest.java
index b65a462..081e29a 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterProcessorTest.java
@@ -18,27 +18,22 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.streams.converter.HoconConverterProcessor;
-import org.apache.streams.converter.HoconConverterUtil;
-import org.apache.streams.converter.TypeConverterProcessor;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.data.util.ActivityUtil;
-import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
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 HoconConverterProcessor}
+ * Tests for {@link HoconConverterProcessor}
*/
public class HoconConverterProcessorTest {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterTest.java
index 2020daa..58ccad6 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/HoconConverterTest.java
@@ -18,26 +18,17 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.streams.converter.HoconConverterUtil;
-import org.apache.streams.converter.TypeConverterProcessor;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.data.util.ActivityUtil;
-import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.junit.Test;
-import java.io.IOException;
-import java.util.List;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Test;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
- * Tests for
- * @see {@link HoconConverterUtil}
+ * Tests for {@link HoconConverterUtil}
*/
public class HoconConverterTest {
@@ -48,9 +39,7 @@ public class HoconConverterTest {
public void testHoconConverter1() {
final String TEST_JSON_1 = "{\"race\":\"klingon\",\"gender\":\"male\"}";
-
String result1 = (String) HoconConverterUtil.getInstance().convert(TEST_JSON_1, String.class, "test1.conf");
-
assertNotNull(result1);
assertTrue(result1.contains("race"));
assertTrue(result1.contains("18"));
@@ -64,9 +53,7 @@ public class HoconConverterTest {
public void testHoconConverter2() {
final String TEST_JSON_2 = "{\"race\":\"klingon\",\"gender\":\"male\",\"age\":18}";
-
ObjectNode result2 = (ObjectNode) HoconConverterUtil.getInstance().convert(TEST_JSON_2, ObjectNode.class, "test2.conf", "demographics");
-
assertNotNull(result2);
assertTrue(result2.get("race") != null);
assertTrue(result2.get("age").asDouble() == 18);
@@ -80,9 +67,7 @@ public class HoconConverterTest {
public void testHoconConverter3() {
final String TEST_JSON_3 = "{\"id\":\"123\",\"text\":\"buncha stuff\",\"user\":{\"name\":\"guy\"}}";
-
Activity result3 = (Activity) HoconConverterUtil.getInstance().convert(TEST_JSON_3, Activity.class, "test3a.conf", null, "activity");
-
assertNotNull(result3);
assertTrue(result3.getProvider() != null);
assertTrue(result3.getId().equals("id:123"));
@@ -98,9 +83,7 @@ public class HoconConverterTest {
public void testHoconConverter4() {
final String TEST_JSON_4 = "{\"id\":\"123\",\"name\":\"nahme\",\"screenName\":\"screeny\",\"summary\":\"sumar\"}";
-
String result4 = (String) HoconConverterUtil.getInstance().convert(TEST_JSON_4, String.class, "test4.conf", "actor", "profile");
-
assertNotNull(result4);
assertTrue(result4.contains("123"));
assertTrue(result4.contains("\"nahme\""));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/NoConfigActivityConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/NoConfigActivityConverterProcessorTest.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/NoConfigActivityConverterProcessorTest.java
index a25f5cf..e0a19d1 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/NoConfigActivityConverterProcessorTest.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/NoConfigActivityConverterProcessorTest.java
@@ -18,24 +18,26 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.converter.ActivityConverterProcessor;
-import org.apache.streams.converter.ActivityConverterProcessorConfiguration;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Before;
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;
/**
* Test for
- * @see {@link org.apache.streams.converter.ActivityConverterProcessor}
+ * {@link org.apache.streams.converter.ActivityConverterProcessor}
*
* Test that default String & ObjectNode conversion works.
*/
@@ -45,7 +47,7 @@ public class NoConfigActivityConverterProcessorTest {
private static final String ACTIVITY_JSON = "{\"id\":\"id\",\"published\":\"Tue Jan 17 21:21:46 Z 2012\",\"verb\":\"post\",\"provider\":{\"id\":\"providerid\"}}";
- ActivityConverterProcessor processor;
+ private ActivityConverterProcessor processor;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TestLineReadWriteUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TestLineReadWriteUtil.java b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TestLineReadWriteUtil.java
index 955eef7..635d85a 100644
--- a/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TestLineReadWriteUtil.java
+++ b/streams-components/streams-converters/src/test/java/org/apache/streams/converter/test/TestLineReadWriteUtil.java
@@ -18,60 +18,62 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.streams.converter.LineReadWriteConfiguration;
import org.apache.streams.converter.LineReadWriteUtil;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.UUID;
/**
- * Tests for
- * @see {@link LineReadWriteUtil}
+ * Tests for {@link LineReadWriteUtil}
*/
public class TestLineReadWriteUtil {
private final static Logger LOGGER = LoggerFactory.getLogger(TestLineReadWriteUtil.class);
- ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+ private ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
private static Random rand = new Random();
@Test
public void TestLineReadWrite () throws Exception {
- List<LineReadWriteConfiguration> configs = Lists.newArrayList();
+ List<LineReadWriteConfiguration> configs = new ArrayList<>();
configs.add(new LineReadWriteConfiguration());
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("ID")));
+ .withFields(Collections.singletonList("ID")));
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("DOC"))
+ .withFields(Collections.singletonList("DOC"))
.withFieldDelimiter("\t"));
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("ID", "DOC"))
+ .withFields(Arrays.asList("ID", "DOC"))
.withFieldDelimiter("\t")
.withLineDelimiter("\n"));
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("ID", "TS", "DOC"))
+ .withFields(Arrays.asList("ID", "TS", "DOC"))
.withLineDelimiter("\n"));
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("ID", "TS", "META", "DOC"))
+ .withFields(Arrays.asList("ID", "TS", "META", "DOC"))
.withFieldDelimiter("|")
.withLineDelimiter("\n"));
configs.add(new LineReadWriteConfiguration()
- .withFields(Lists.newArrayList("ID", "SEQ", "TS", "META", "DOC"))
+ .withFields(Arrays.asList("ID", "SEQ", "TS", "META", "DOC"))
.withFieldDelimiter("|")
.withLineDelimiter("\\0"));
@@ -89,10 +91,10 @@ public class TestLineReadWriteUtil {
assert(lineReadWriteUtil != null);
StreamsDatum testDatum = randomDatum();
String writeResult = lineReadWriteUtil.convertResultToString(testDatum);
- assert !Strings.isNullOrEmpty(writeResult);
+ assert StringUtils.isNotBlank(writeResult);
StreamsDatum readResult = lineReadWriteUtil.processLine(writeResult);
assert readResult != null;
- assert !Strings.isNullOrEmpty(readResult.getId()) || !Strings.isNullOrEmpty((String)readResult.getDocument());
+ assert StringUtils.isNotBlank(readResult.getId()) || StringUtils.isNotBlank((String)readResult.getDocument());
}
@@ -103,7 +105,7 @@ public class TestLineReadWriteUtil {
datum.setTimestamp(DateTime.now());
BigInteger result = new BigInteger(64, rand);
datum.setSequenceid(result);
- Map<String,Object> metadata = Maps.newHashMap();
+ Map<String,Object> metadata = new HashMap<>();
metadata.put("a", UUID.randomUUID().toString());
datum.setMetadata(metadata);
return datum;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 1a32f01..e692444 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
@@ -18,18 +18,19 @@
package org.apache.streams.converter.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
+import org.apache.streams.converter.TypeConverterProcessor;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.converter.TypeConverterProcessor;
import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Test;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -55,7 +56,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterStringToString() {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(String.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(String.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
StreamsDatum datum = new StreamsDatum(DATASIFT_JSON, ID);
List<StreamsDatum> result = processor.process(datum);
@@ -74,7 +75,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterStringToObjectNode() {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
StreamsDatum datum = new StreamsDatum(DATASIFT_JSON, ID);
List<StreamsDatum> result = processor.process(datum);
@@ -93,7 +94,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterObjectNodeToString() throws IOException {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(String.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(String.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
ObjectMapper mapper = StreamsJacksonMapper.getInstance(DATASIFT_FORMAT);
ObjectNode node = mapper.readValue(DATASIFT_JSON, ObjectNode.class);
@@ -114,7 +115,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterStringToActivity() {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(Activity.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(Activity.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
StreamsDatum datum = new StreamsDatum(ACTIVITY_JSON, ID);
List<StreamsDatum> result = processor.process(datum);
@@ -134,7 +135,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterObjectNodeToActivity() throws IOException {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(Activity.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(Activity.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
ObjectMapper mapper = StreamsJacksonMapper.getInstance(DATASIFT_FORMAT);
ObjectNode node = mapper.readValue(ACTIVITY_JSON, ObjectNode.class);
@@ -156,7 +157,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterActivityToString() throws IOException {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(String.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(String.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
ObjectMapper mapper = StreamsJacksonMapper.getInstance(DATASIFT_FORMAT);
Activity node = mapper.readValue(ACTIVITY_JSON, Activity.class);
@@ -174,7 +175,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterActivityToObjectNode() throws IOException {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
ObjectMapper mapper = StreamsJacksonMapper.getInstance(DATASIFT_FORMAT);
Activity node = mapper.readValue(ACTIVITY_JSON, Activity.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java
index ed40a17..08106c4 100644
--- a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java
+++ b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java
@@ -26,12 +26,12 @@ import org.apache.streams.verbs.VerbDefinitionMatchUtil;
import org.apache.streams.verbs.VerbDefinitionResolver;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
/**
@@ -64,7 +64,7 @@ public class VerbDefinitionDropFilter implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
LOGGER.debug("{} filtering {}", STREAMS_ID, entry.getDocument().getClass());
@@ -74,7 +74,7 @@ public class VerbDefinitionDropFilter implements StreamsProcessor {
activity = (Activity) entry.getDocument();
- if ( VerbDefinitionMatchUtil.match(activity, this.verbDefinitionSet) == false ) {
+ if (!VerbDefinitionMatchUtil.match(activity, this.verbDefinitionSet)) {
result.add(entry);
}
@@ -88,7 +88,7 @@ public class VerbDefinitionDropFilter implements StreamsProcessor {
} else {
resolver = new VerbDefinitionResolver();
}
- Preconditions.checkNotNull(resolver);
+ Objects.requireNonNull(resolver);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java
index 7562905..89efb31 100644
--- a/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java
+++ b/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java
@@ -26,12 +26,12 @@ import org.apache.streams.verbs.VerbDefinitionMatchUtil;
import org.apache.streams.verbs.VerbDefinitionResolver;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
/**
@@ -64,7 +64,7 @@ public class VerbDefinitionKeepFilter implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
LOGGER.debug("{} filtering {}", STREAMS_ID, entry.getDocument().getClass());
@@ -74,7 +74,7 @@ public class VerbDefinitionKeepFilter implements StreamsProcessor {
activity = (Activity) entry.getDocument();
- if ( VerbDefinitionMatchUtil.match(activity, this.verbDefinitionSet) == true ) {
+ if (VerbDefinitionMatchUtil.match(activity, this.verbDefinitionSet)) {
result.add(entry);
}
@@ -88,7 +88,7 @@ public class VerbDefinitionKeepFilter implements StreamsProcessor {
} else {
resolver = new VerbDefinitionResolver();
}
- Preconditions.checkNotNull(resolver);
+ Objects.requireNonNull(resolver);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java b/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
index 1f622a9..09cb2e6 100644
--- a/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
+++ b/streams-components/streams-filters/src/test/java/org/apache/streams/filters/test/VerbDefinitionFilterTest.java
@@ -18,16 +18,15 @@
package org.apache.streams.filters.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Sets;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.filters.VerbDefinitionDropFilter;
import org.apache.streams.filters.VerbDefinitionKeepFilter;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.verbs.VerbDefinition;
-import org.apache.streams.verbs.VerbDefinitionResolver;
-import org.junit.Ignore;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Sets;
import org.junit.Test;
import java.util.List;
@@ -37,7 +36,7 @@ import java.util.List;
*/
public class VerbDefinitionFilterTest {
- ObjectMapper mapper = StreamsJacksonMapper.getInstance();
+ private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
/**
* Test verb match filter alone
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-http/src/main/java/org/apache/streams/components/http/persist/SimpleHTTPPostPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/persist/SimpleHTTPPostPersistWriter.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/persist/SimpleHTTPPostPersistWriter.java
index 8cacf1f..f4c1a5c 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/persist/SimpleHTTPPostPersistWriter.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/persist/SimpleHTTPPostPersistWriter.java
@@ -28,10 +28,8 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -50,6 +48,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
public class SimpleHTTPPostPersistWriter implements StreamsPersistWriter {
@@ -113,7 +112,7 @@ public class SimpleHTTPPostPersistWriter implements StreamsPersistWriter {
*/
protected URI prepareURI(Map<String, String> params) {
URI uri = null;
- for ( Map.Entry<String,String> param : params.entrySet()) {
+ for (Map.Entry<String,String> param : params.entrySet()) {
uriBuilder = uriBuilder.setParameter(param.getKey(), param.getValue());
}
try {
@@ -154,7 +153,7 @@ public class SimpleHTTPPostPersistWriter implements StreamsPersistWriter {
HttpPost httppost = new HttpPost(uri);
httppost.addHeader("content-type", this.configuration.getContentType());
httppost.addHeader("accept-charset", "UTF-8");
- if ( !Strings.isNullOrEmpty(authHeader)) {
+ if (StringUtils.isNotBlank(authHeader)) {
httppost.addHeader("Authorization", "Basic " + authHeader);
}
try {
@@ -168,7 +167,7 @@ public class SimpleHTTPPostPersistWriter implements StreamsPersistWriter {
protected ObjectNode executePost(HttpPost httpPost) {
- Preconditions.checkNotNull(httpPost);
+ Objects.requireNonNull(httpPost);
ObjectNode result = null;
@@ -208,10 +207,10 @@ public class SimpleHTTPPostPersistWriter implements StreamsPersistWriter {
.setPort(this.configuration.getPort().intValue())
.setPath(this.configuration.getResourcePath());
- if ( !Strings.isNullOrEmpty(configuration.getAccessToken()) ) {
+ if (StringUtils.isNotBlank(configuration.getAccessToken()) ) {
uriBuilder = uriBuilder.addParameter("access_token", configuration.getAccessToken());
}
- if ( !Strings.isNullOrEmpty(configuration.getUsername()) && !Strings.isNullOrEmpty(configuration.getPassword())) {
+ if (StringUtils.isNotBlank(configuration.getUsername()) && StringUtils.isNotBlank(configuration.getPassword())) {
String string = configuration.getUsername() + ":" + configuration.getPassword();
authHeader = Base64.encodeBase64String(string.getBytes());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
index 871a08b..ddc1ec5 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
@@ -27,12 +27,10 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.ActivityObject;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
-
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -118,9 +116,6 @@ public class SimpleHTTPGetProcessor implements StreamsProcessor {
? (String) datum.getDocument()
: mapper.writeValueAsString(datum.getDocument());
return mapper.readValue(json, ObjectNode.class);
- } catch (JsonProcessingException ex) {
- LOGGER.warn(ex.getMessage());
- return null;
} catch (IOException ex) {
LOGGER.warn(ex.getMessage());
return null;
@@ -252,7 +247,7 @@ public class SimpleHTTPGetProcessor implements StreamsProcessor {
public HttpGet prepareHttpGet(URI uri) {
HttpGet httpget = new HttpGet(uri);
httpget.addHeader("content-type", this.configuration.getContentType());
- if ( !Strings.isNullOrEmpty(authHeader)) {
+ if (StringUtils.isNotBlank(authHeader)) {
httpget.addHeader("Authorization", String.format("Basic %s", authHeader));
}
return httpget;
@@ -268,12 +263,12 @@ public class SimpleHTTPGetProcessor implements StreamsProcessor {
.setHost(this.configuration.getHostname())
.setPath(this.configuration.getResourcePath());
- if ( !Strings.isNullOrEmpty(configuration.getAccessToken()) ) {
+ if (StringUtils.isNotBlank(configuration.getAccessToken()) ) {
uriBuilder = uriBuilder.addParameter("access_token", configuration.getAccessToken());
}
- if ( !Strings.isNullOrEmpty(configuration.getUsername())
+ if (StringUtils.isNotBlank(configuration.getUsername())
&&
- !Strings.isNullOrEmpty(configuration.getPassword())) {
+ StringUtils.isNotBlank(configuration.getPassword())) {
String string = configuration.getUsername() + ":" + configuration.getPassword();
authHeader = Base64.encodeBase64String(string.getBytes());
}