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:02 UTC
[1/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Repository: incubator-streams
Updated Branches:
refs/heads/master 745451d8e -> c64f8435d
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
----------------------------------------------------------------------
diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
index c155b67..6713529 100644
--- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
+++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
@@ -25,16 +25,14 @@ import org.apache.streams.util.schema.SchemaStoreImpl;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import org.junit.Assert;
import org.junit.Test;
import java.io.File;
+import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-/**
- * Created by sblackmon on 5/3/16.
- */
public class SchemaOrderingTest {
@Test
@@ -44,11 +42,11 @@ public class SchemaOrderingTest {
schemaStore.create(update.toURI());
File activity = new File("target/test-classes/activitystreams-schemas/activity.json");
schemaStore.create(activity.toURI());
- assert ( schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(activity.toURI()).get()) == 1);
+ assert (schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(activity.toURI()).get()) == 1);
Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
assertContainsItemsEndingWithInOrder(
schemaIterator,
- Lists.newArrayList(
+ Arrays.asList(
"activity.json",
"update.json"
)
@@ -62,11 +60,11 @@ public class SchemaOrderingTest {
schemaStore.create(alert.toURI());
File object = new File("target/test-classes/activitystreams-schemas/object.json");
schemaStore.create(object.toURI());
- assert ( schemaStore.compare( schemaStore.getByUri(object.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1);
+ assert (schemaStore.compare( schemaStore.getByUri(object.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1);
Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
assertContainsItemsEndingWithInOrder(
schemaIterator,
- Lists.newArrayList(
+ Arrays.asList(
"object.json",
"alert.json"
)
@@ -80,7 +78,7 @@ public class SchemaOrderingTest {
schemaStore.create(alert.toURI());
File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json");
schemaStore.create(update.toURI());
- assert ( schemaStore.compare( schemaStore.getByUri(alert.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == 0);
+ assert (schemaStore.compare( schemaStore.getByUri(alert.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == 0);
}
@Test
@@ -94,7 +92,7 @@ public class SchemaOrderingTest {
Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
assertContainsItemsEndingWithInOrder(
schemaIterator,
- Lists.newArrayList(
+ Arrays.asList(
"object.json",
"update.json"
)
@@ -112,7 +110,7 @@ public class SchemaOrderingTest {
Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
assertContainsItemsEndingWithInOrder(
schemaIterator,
- Lists.newArrayList(
+ Arrays.asList(
"media_link.json",
"object.json",
"alert.json"
@@ -127,13 +125,14 @@ public class SchemaOrderingTest {
schemaStore.create(update.toURI());
File mediaLink = new File("target/test-classes/activitystreams-schemas/media_link.json");
schemaStore.create(mediaLink.toURI());
- assert ( schemaStore.getByUri(mediaLink.toURI()).isPresent());
- assert ( schemaStore.getByUri(update.toURI()).isPresent());
- assert ( schemaStore.compare( schemaStore.getByUri(mediaLink.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == -1);
+ Assert.assertTrue(schemaStore.getByUri(mediaLink.toURI()).isPresent());
+ Assert.assertTrue(schemaStore.getByUri(update.toURI()).isPresent());
+ Assert.assertTrue(schemaStore.compare( schemaStore.getByUri(mediaLink.toURI()).get(),
+ schemaStore.getByUri(update.toURI()).get()) == -1);
Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator();
assertContainsItemsEndingWithInOrder(
schemaIterator,
- Lists.newArrayList(
+ Arrays.asList(
"media_link.json",
"update.json"
)
@@ -148,7 +147,7 @@ public class SchemaOrderingTest {
public void assertContainsItemsEndingWithInOrder(Iterator<Schema> iterator, List<String> items) {
for ( String item : items ) {
Optional<Schema> tryFind = Iterators.tryFind( iterator, new SchemaUriEndsWithPredicate(item) );
- assert ( tryFind.isPresent() );
+ Assert.assertTrue(tryFind.isPresent());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
----------------------------------------------------------------------
diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
index 6dad615..d5c3d47 100644
--- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
+++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
@@ -26,9 +26,6 @@ import org.junit.Test;
import java.io.File;
-/**
- * Created by sblackmon on 5/2/16.
- */
public class SchemaStoreTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java
index 9bff713..228fba2 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java
@@ -61,7 +61,7 @@ public class ObjectCombinationGenericOrdering extends Ordering<ObjectCombination
* @param objectCombination ObjectCombination
* @return count
*/
- public int wildcardCount(ObjectCombination objectCombination) {
+ private int wildcardCount(ObjectCombination objectCombination) {
int wildcardCount = 0;
if ( wildcard(objectCombination.getActor())) {
wildcardCount++;
@@ -83,11 +83,7 @@ public class ObjectCombinationGenericOrdering extends Ordering<ObjectCombination
* @param pattern String
* @return true or false
*/
- public boolean wildcard(String pattern) {
- if ( pattern.equals("*")) {
- return true;
- } else {
- return false;
- }
+ private boolean wildcard(String pattern) {
+ return pattern.equals("*");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java
index 18b6d8b..8b395bd 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java
@@ -68,7 +68,7 @@ public class ObjectCombinationSpecificOrdering extends Ordering<ObjectCombinatio
* @param objectCombination ObjectCombination
* @return count
*/
- public int matchCount(ObjectCombination objectCombination) {
+ private int matchCount(ObjectCombination objectCombination) {
int matchCount = 0;
if ( match(activity.getActor(), objectCombination.getActor())) {
matchCount++;
@@ -92,12 +92,8 @@ public class ObjectCombinationSpecificOrdering extends Ordering<ObjectCombinatio
* @return true or false
*/
public boolean match(ActivityObject activityObject, String pattern) {
- if ( activityObject != null
- && activityObject.getObjectType() != null
- && activityObject.getObjectType().equals(pattern)) {
- return true;
- } else {
- return false;
- }
+ return activityObject != null
+ && activityObject.getObjectType() != null
+ && activityObject.getObjectType().equals(pattern);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java
index b447794..051be22 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java
@@ -56,7 +56,7 @@ public class VerbDefinitionMatchUtil {
if ( verbDefinition.getValue() != null
&& verbDefinition.getValue().equals(activity.getVerb())) {
for (ObjectCombination objectCombination : verbDefinition.getObjects()) {
- if (VerbDefinitionResolver.filter(activity, objectCombination) == true) {
+ if (VerbDefinitionResolver.filter(activity, objectCombination)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
index 81f0bfa..7b3017e 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java
@@ -62,7 +62,7 @@ public class VerbDefinitionResolver {
VerbDefinition verbDefinitionCopy = SerializationUtil.cloneBySerialization(verbDefinition);
if ( activity.getVerb().equals(verbDefinition.getValue())) {
for ( ObjectCombination criteria : verbDefinitionCopy.getObjects()) {
- if ( filter(activity, criteria) == false ) {
+ if (!filter(activity, criteria)) {
verbDefinitionCopy.getObjects().remove(criteria);
}
}
@@ -88,14 +88,14 @@ public class VerbDefinitionResolver {
for ( VerbDefinition verbDefinition : verbDefinitionSet ) {
if ( activity.getVerb().equals(verbDefinition.getValue())) {
for ( ObjectCombination criteria : verbDefinition.getObjects()) {
- if ( filter(activity, criteria) == true ) {
+ if (filter(activity, criteria)) {
results.add(criteria);
}
}
}
}
- Collections.sort(results, new ObjectCombinationSpecificOrdering(activity));
+ results.sort(new ObjectCombinationSpecificOrdering(activity));
return results;
}
@@ -120,19 +120,11 @@ public class VerbDefinitionResolver {
}
public static boolean filterType(ActivityObject activityObject, boolean required, String pattern) {
- if (required == true && activityObject == null) {
- return false;
- } else if (required == false && activityObject == null) {
- return true;
- } else if (pattern.equals("*")) {
- return true;
- } else if (activityObject.getObjectType() == null) {
- return false;
- } else if (activityObject.getObjectType().equals(pattern)) {
- return true;
- } else {
- return false;
- }
+ return !(required && activityObject == null) &&
+ (!required && activityObject == null ||
+ pattern.equals("*") ||
+ activityObject.getObjectType() != null &&
+ activityObject.getObjectType().equals(pattern));
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java
index 53113a7..e34f462 100644
--- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java
+++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java
@@ -22,7 +22,7 @@ package org.apache.streams.verbs;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.stringtemplate.v4.ST;
/**
@@ -71,11 +71,11 @@ public class VerbDefinitionTemplateUtil {
public static String displayName(ActivityObject activityObject) {
if ( activityObject == null ) {
return "";
- } else if ( !Strings.isNullOrEmpty(activityObject.getDisplayName())) {
+ } else if (StringUtils.isNotBlank(activityObject.getDisplayName())) {
return activityObject.getDisplayName();
- } else if ( !Strings.isNullOrEmpty(activityObject.getObjectType())) {
+ } else if (StringUtils.isNotBlank(activityObject.getObjectType())) {
return activityObject.getObjectType();
- } else if ( !Strings.isNullOrEmpty(activityObject.toString())) {
+ } else if (StringUtils.isNotBlank(activityObject.toString())) {
return activityObject.toString();
} else {
return "";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
index ba91b06..96039cb 100644
--- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
+++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
*/
public class VerbDefinitionTemplateTest {
- ObjectMapper mapper = new ObjectMapper();
+ private ObjectMapper mapper = new ObjectMapper();
/**
* Test application of template with no field.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java
index c481f5c..300115b 100644
--- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java
+++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
*/
public class VerbDefinitionTest {
- ObjectMapper mapper = new ObjectMapper();
+ private ObjectMapper mapper = new ObjectMapper();
/**
* Test read verb definition from json.
@@ -59,7 +59,7 @@ public class VerbDefinitionTest {
assert combination.getObject().equals("*");
assert combination.getTarget().equals("*");
assert combination.getProvider().equals("*");
- assert combination.getTargetRequired() == false;
+ assert !combination.getTargetRequired();
}
[5/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/CypherQueryGraphHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/CypherQueryGraphHelper.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/CypherQueryGraphHelper.java
index e322990..71cb055 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/CypherQueryGraphHelper.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/CypherQueryGraphHelper.java
@@ -27,17 +27,17 @@ import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
import org.javatuples.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.stringtemplate.v4.ST;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Supporting class for interacting with neo4j via rest API
@@ -48,10 +48,10 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
private static final Logger LOGGER = LoggerFactory.getLogger(Neo4jHttpGraphHelper.class);
- public static final String getVertexLongIdStatementTemplate = "MATCH (v) WHERE ID(v) = <id> RETURN v";
- public static final String getVertexStringIdStatementTemplate = "MATCH (v {id: '<id>'} ) RETURN v";
+ private static final String getVertexLongIdStatementTemplate = "MATCH (v) WHERE ID(v) = <id> RETURN v";
+ private static final String getVertexStringIdStatementTemplate = "MATCH (v {id: '<id>'} ) RETURN v";
- public static final String createVertexStatementTemplate =
+ private static final String createVertexStatementTemplate =
"MATCH (x {id: '<id>'}) "
+ "CREATE UNIQUE (v:<type> { props }) "
+ "ON CREATE SET v <labels> "
@@ -59,13 +59,13 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
- public static final String mergeVertexStatementTemplate =
+ private static final String mergeVertexStatementTemplate =
"MERGE (v:<type> {id: '<id>'}) "
+ "ON CREATE SET v <labels>, v = { props }, v.`@timestamp` = timestamp() "
+ "ON MATCH SET v <labels>, v = { props }, v.`@timestamp` = timestamp() "
+ "RETURN v";
- public static final String createEdgeStatementTemplate =
+ private static final String createEdgeStatementTemplate =
"MATCH (s:<s_type> {id: '<s_id>'}),(d:<d_type> {id: '<d_id>'}) "
+ "CREATE UNIQUE (s)-[r:<r_type> <r_props>]->(d) "
+ "RETURN r";
@@ -113,7 +113,7 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
*/
public Pair<String, Map<String, Object>> createVertexRequest(ActivityObject activityObject) {
- Preconditions.checkNotNull(activityObject.getObjectType());
+ Objects.requireNonNull(activityObject.getObjectType());
List<String> labels = getLabels(activityObject);
@@ -144,9 +144,9 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
*/
public Pair<String, Map<String, Object>> mergeVertexRequest(ActivityObject activityObject) {
- Preconditions.checkNotNull(activityObject.getObjectType());
+ Objects.requireNonNull(activityObject.getObjectType());
- Pair queryPlusParameters = new Pair(null, Maps.newHashMap());
+ Pair queryPlusParameters = new Pair(null, new HashMap<>());
List<String> labels = getLabels(activityObject);
@@ -176,7 +176,7 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
*/
public Pair<String, Map<String, Object>> createEdgeRequest(Activity activity) {
- Pair queryPlusParameters = new Pair(null, Maps.newHashMap());
+ Pair queryPlusParameters = new Pair(null, new HashMap<>());
ObjectNode object = MAPPER.convertValue(activity, ObjectNode.class);
Map<String, Object> props = PropertyUtil.flattenToMap(object, '.');
@@ -213,7 +213,7 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
public static String getPropertyCreater(Map<String, Object> map) {
StringBuilder builder = new StringBuilder();
builder.append("{");
- List<String> parts = Lists.newArrayList();
+ List<String> parts = new ArrayList<>();
for ( Map.Entry<String, Object> entry : map.entrySet()) {
if ( entry.getValue() instanceof String ) {
String propVal = (String) (entry.getValue());
@@ -226,7 +226,7 @@ public class CypherQueryGraphHelper implements QueryGraphHelper {
}
private List<String> getLabels(ActivityObject activityObject) {
- List<String> labels = Lists.newArrayList(":streams");
+ List<String> labels = Collections.singletonList(":streams");
if ( activityObject.getAdditionalProperties().containsKey("labels") ) {
List<String> extraLabels = (List<String>)activityObject.getAdditionalProperties().get("labels");
for ( String extraLabel : extraLabels ) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/Neo4jHttpGraphHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/Neo4jHttpGraphHelper.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/Neo4jHttpGraphHelper.java
index 72e668f..9f47058 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/Neo4jHttpGraphHelper.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/neo4j/Neo4jHttpGraphHelper.java
@@ -23,13 +23,12 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-
import org.javatuples.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
+import java.util.Objects;
/**
* Supporting class for interacting with neo4j via rest API.
@@ -40,9 +39,9 @@ public class Neo4jHttpGraphHelper implements HttpGraphHelper {
private static final Logger LOGGER = LoggerFactory.getLogger(Neo4jHttpGraphHelper.class);
- public static final String statementKey = "statement";
- public static final String paramsKey = "parameters";
- public static final String propsKey = "props";
+ private static final String statementKey = "statement";
+ private static final String paramsKey = "parameters";
+ private static final String propsKey = "props";
/**
* createHttpRequest neo4j rest json payload.
@@ -54,9 +53,9 @@ public class Neo4jHttpGraphHelper implements HttpGraphHelper {
LOGGER.debug("createHttpRequest: ", queryPlusParameters);
- Preconditions.checkNotNull(queryPlusParameters);
- Preconditions.checkNotNull(queryPlusParameters.getValue0());
- Preconditions.checkNotNull(queryPlusParameters.getValue1());
+ Objects.requireNonNull(queryPlusParameters);
+ Objects.requireNonNull(queryPlusParameters.getValue0());
+ Objects.requireNonNull(queryPlusParameters.getValue1());
ObjectNode request = MAPPER.createObjectNode();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jHttpVertexReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jHttpVertexReader.java b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jHttpVertexReader.java
index 673b402..24ddd65 100644
--- a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jHttpVertexReader.java
+++ b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestNeo4jHttpVertexReader.java
@@ -26,7 +26,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
@@ -38,8 +37,7 @@ import java.io.InputStream;
import java.util.List;
/**
- * Unit test for
- * @see {@link org.apache.streams.graph.GraphVertexReader}
+ * Unit test for {@link org.apache.streams.graph.GraphVertexReader}
*
* Test that graph db responses can be converted to streams data.
*/
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hbase/src/main/java/org/apache/streams/hbase/HbasePersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hbase/src/main/java/org/apache/streams/hbase/HbasePersistWriter.java b/streams-contrib/streams-persist-hbase/src/main/java/org/apache/streams/hbase/HbasePersistWriter.java
index c5a06fc..6102db0 100644
--- a/streams-contrib/streams-persist-hbase/src/main/java/org/apache/streams/hbase/HbasePersistWriter.java
+++ b/streams-contrib/streams-persist-hbase/src/main/java/org/apache/streams/hbase/HbasePersistWriter.java
@@ -26,7 +26,6 @@ import org.apache.streams.util.GuidUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.HConnection;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
index d254abb..64b7284 100644
--- a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
+++ b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java
@@ -30,15 +30,15 @@ import org.apache.streams.core.StreamsResultSet;
import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
-
+import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.security.UserGroupInformation;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -49,6 +49,7 @@ import java.math.BigInteger;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.PrivilegedExceptionAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Queue;
@@ -62,7 +63,7 @@ import java.util.concurrent.LinkedBlockingQueue;
*/
public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCountable {
- public static final String STREAMS_ID = "WebHdfsPersistReader";
+ private static final String STREAMS_ID = "WebHdfsPersistReader";
private static final Logger LOGGER = LoggerFactory.getLogger(WebHdfsPersistReader.class);
@@ -110,7 +111,7 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
StringBuilder uriBuilder = new StringBuilder();
uriBuilder.append(hdfsConfiguration.getScheme());
uriBuilder.append("://");
- if ( !Strings.isNullOrEmpty(hdfsConfiguration.getHost())) {
+ if (StringUtils.isNotBlank(hdfsConfiguration.getHost())) {
uriBuilder.append(hdfsConfiguration.getHost());
if (hdfsConfiguration.getPort() != null) {
uriBuilder.append(":" + hdfsConfiguration.getPort());
@@ -148,36 +149,34 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
UserGroupInformation ugi = UserGroupInformation.createRemoteUser(this.hdfsConfiguration.getUser());
ugi.setAuthenticationMethod(UserGroupInformation.AuthenticationMethod.SIMPLE);
- ugi.doAs(new PrivilegedExceptionAction<Void>() {
- public Void run() throws Exception {
- Configuration conf = new Configuration();
- conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "kerberos");
- conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
- conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
- LOGGER.info("WebURI : {}", getURI().toString());
- client = FileSystem.get(getURI(), conf);
- LOGGER.info("Connected to WebHDFS");
-
- /*
- * ************************************************************************************************
- * This code is an example of how you would work with HDFS and you weren't going over
- * the webHDFS protocol.
- *
- * Smashew: 2013-10-01
- * ************************************************************************************************
- conf.set("fs.defaultFS", "hdfs://hadoop.mdigitallife.com:8020/user/" + userName);
- conf.set("namenode.host","0.0.0.0");
- conf.set("hadoop.job.ugi", userName);
- conf.set(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY, "runner");
- fileSystem.createNewFile(new Path("/user/"+ userName + "/test"));
- FileStatus[] status = fs.listStatus(new Path("/user/" + userName));
- for(int i=0;i<status.length;i++)
- {
- LOGGER.info("Directory: {}", status[i].getPath());
- }
- */
- return null;
+ ugi.doAs((PrivilegedExceptionAction<Void>) () -> {
+ Configuration conf = new Configuration();
+ conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "kerberos");
+ conf.set("fs.hdfs.impl", DistributedFileSystem.class.getName());
+ conf.set("fs.file.impl", LocalFileSystem.class.getName());
+ LOGGER.info("WebURI : {}", getURI().toString());
+ client = FileSystem.get(getURI(), conf);
+ LOGGER.info("Connected to WebHDFS");
+
+ /*
+ * ************************************************************************************************
+ * This code is an example of how you would work with HDFS and you weren't going over
+ * the webHDFS protocol.
+ *
+ * Smashew: 2013-10-01
+ * ************************************************************************************************
+ conf.set("fs.defaultFS", "hdfs://hadoop.mdigitallife.com:8020/user/" + userName);
+ conf.set("namenode.host","0.0.0.0");
+ conf.set("hadoop.job.ugi", userName);
+ conf.set(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY, "runner");
+ fileSystem.createNewFile(new Path("/user/"+ userName + "/test"));
+ FileStatus[] status = fs.listStatus(new Path("/user/" + userName));
+ for(int i=0;i<status.length;i++)
+ {
+ LOGGER.info("Directory: {}", status[i].getPath());
}
+ */
+ return null;
});
} catch (Exception ex) {
LOGGER.error("There was an error connecting to WebHDFS, please check your settings and try again");
@@ -206,7 +205,7 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
status[0] = fileStatus;
} else if ( client.isDirectory(path)) {
status = client.listStatus(path);
- List<FileStatus> statusList = Lists.newArrayList(status);
+ List<FileStatus> statusList = Arrays.asList(status);
Collections.sort(statusList);
status = statusList.toArray(new FileStatus[0]);
LOGGER.info("Found Directory : {} files", status.length);
@@ -287,11 +286,7 @@ public class WebHdfsPersistReader implements StreamsPersistReader, DatumStatusCo
@Override
public boolean isRunning() {
- if ( task != null) {
- return !task.isDone() && !task.isCancelled();
- } else {
- return true;
- }
+ return task == null || !task.isDone() && !task.isCancelled();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReaderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReaderTask.java b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReaderTask.java
index 5bff080..d18bda9 100644
--- a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReaderTask.java
+++ b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReaderTask.java
@@ -23,7 +23,6 @@ import org.apache.streams.core.StreamsDatum;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.Uninterruptibles;
-
import org.apache.hadoop.fs.FileStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
index 4554c0f..29a6b73 100644
--- a/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
+++ b/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java
@@ -30,7 +30,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileSystem;
@@ -65,7 +64,7 @@ public class WebHdfsPersistWriter implements StreamsPersistWriter, Flushable, Cl
private Path path;
private int linesPerFile;
private int totalRecordsWritten = 0;
- private final List<Path> writtenFiles = new ArrayList<Path>();
+ private final List<Path> writtenFiles = new ArrayList<>();
private int fileLineCounter = 0;
private OutputStreamWriter currentWriter = null;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/HdfsPersistConfigTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/HdfsPersistConfigTest.java b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/HdfsPersistConfigTest.java
index a35f124..6e5f351 100644
--- a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/HdfsPersistConfigTest.java
+++ b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/HdfsPersistConfigTest.java
@@ -19,14 +19,21 @@
package org.apache.streams.hdfs.test;
-import org.apache.streams.hdfs.*;
+import org.apache.streams.hdfs.HdfsConfiguration;
+import org.apache.streams.hdfs.HdfsReaderConfiguration;
+import org.apache.streams.hdfs.HdfsWriterConfiguration;
+import org.apache.streams.hdfs.WebHdfsPersistReader;
+import org.apache.streams.hdfs.WebHdfsPersistWriter;
+
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URISyntaxException;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Test for checking that strings append to FS paths as expected
@@ -63,7 +70,7 @@ public class HdfsPersistConfigTest {
HdfsWriterConfiguration writerConfiguration = new HdfsWriterConfiguration();
writerConfiguration.setScheme(HdfsConfiguration.Scheme.HDFS);
writerConfiguration.setHost("localhost");
- writerConfiguration.setPort(9000l);
+ writerConfiguration.setPort(9000L);
writerConfiguration.setPath("path");
writerConfiguration.setWriterPath("writerPath");
writerConfiguration.setUser("cloudera");
@@ -86,7 +93,7 @@ public class HdfsPersistConfigTest {
HdfsWriterConfiguration writerConfiguration = new HdfsWriterConfiguration();
writerConfiguration.setScheme(HdfsConfiguration.Scheme.WEBHDFS);
writerConfiguration.setHost("localhost");
- writerConfiguration.setPort(57000l);
+ writerConfiguration.setPort(57000L);
writerConfiguration.setPath("path");
writerConfiguration.setWriterPath("writerPath");
writerConfiguration.setUser("cloudera");
@@ -128,7 +135,7 @@ public class HdfsPersistConfigTest {
HdfsReaderConfiguration readerConfiguration = new HdfsReaderConfiguration();
readerConfiguration.setScheme(HdfsConfiguration.Scheme.HDFS);
readerConfiguration.setHost("localhost");
- readerConfiguration.setPort(9000l);
+ readerConfiguration.setPort(9000L);
readerConfiguration.setPath("path");
readerConfiguration.setReaderPath("readerPath");
@@ -150,7 +157,7 @@ public class HdfsPersistConfigTest {
HdfsReaderConfiguration readerConfiguration = new HdfsReaderConfiguration();
readerConfiguration.setScheme(HdfsConfiguration.Scheme.WEBHDFS);
readerConfiguration.setHost("localhost");
- readerConfiguration.setPort(57000l);
+ readerConfiguration.setPort(57000L);
readerConfiguration.setPath("path");
readerConfiguration.setReaderPath("readerPath");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
index 7191d9a..1ab1693 100644
--- a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
+++ b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
@@ -18,10 +18,6 @@
package org.apache.streams.hdfs.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.commons.io.Charsets;
-import org.apache.commons.io.IOUtils;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsResultSet;
import org.apache.streams.hdfs.HdfsConfiguration;
@@ -31,6 +27,11 @@ import org.apache.streams.hdfs.WebHdfsPersistReader;
import org.apache.streams.hdfs.WebHdfsPersistWriter;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -39,6 +40,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -48,7 +51,7 @@ public class TestHdfsPersist {
private static final Logger LOGGER = LoggerFactory.getLogger(TestHdfsPersist.class);
- ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+ private ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
@Before
public void setup() {
@@ -60,12 +63,12 @@ public class TestHdfsPersist {
@Test
public void TestHdfsPersist() throws Exception {
- List<List<String>> fieldArrays = Lists.newArrayList();
- fieldArrays.add(new ArrayList<String>());
- fieldArrays.add(Lists.newArrayList("ID"));
- fieldArrays.add(Lists.newArrayList("ID", "DOC"));
- fieldArrays.add(Lists.newArrayList("ID", "TS", "DOC"));
- fieldArrays.add(Lists.newArrayList("ID", "TS", "META", "DOC"));
+ List<List<String>> fieldArrays = new ArrayList<>();
+ fieldArrays.add(new ArrayList<>());
+ fieldArrays.add(Collections.singletonList("ID"));
+ fieldArrays.add(Arrays.asList("ID", "DOC"));
+ fieldArrays.add(Arrays.asList("ID", "TS", "DOC"));
+ fieldArrays.add(Arrays.asList("ID", "TS", "META", "DOC"));
for( List<String> fields : fieldArrays )
TestHdfsPersistCase(fields);
@@ -108,13 +111,13 @@ public class TestHdfsPersist {
HdfsReaderConfiguration hdfsReaderConfiguration = MAPPER.convertValue(hdfsConfiguration, HdfsReaderConfiguration.class);
WebHdfsPersistReader reader = new WebHdfsPersistReader(hdfsReaderConfiguration);
- hdfsReaderConfiguration.setReaderPath(new Integer(fields.size()).toString());
+ hdfsReaderConfiguration.setReaderPath(Integer.toString(fields.size()));
reader.prepare(null);
StreamsResultSet resultSet = reader.readAll();
- assert( resultSet.size() == count);
+ Assert.assertEquals(resultSet.size(), count);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
index 64f7200..edca3de 100644
--- a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
+++ b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReader.java
@@ -25,7 +25,13 @@ import org.apache.streams.core.StreamsPersistReader;
import org.apache.streams.core.StreamsResultSet;
import com.fasterxml.jackson.databind.ObjectMapper;
-
+import kafka.consumer.Consumer;
+import kafka.consumer.ConsumerConfig;
+import kafka.consumer.KafkaStream;
+import kafka.consumer.Whitelist;
+import kafka.javaapi.consumer.ConsumerConnector;
+import kafka.serializer.StringDecoder;
+import kafka.utils.VerifiableProperties;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,14 +46,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import kafka.consumer.Consumer;
-import kafka.consumer.ConsumerConfig;
-import kafka.consumer.KafkaStream;
-import kafka.consumer.Whitelist;
-import kafka.javaapi.consumer.ConsumerConnector;
-import kafka.serializer.StringDecoder;
-import kafka.utils.VerifiableProperties;
-
/**
* KafkaPersistReader reads documents from kafka.
*/
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
index 199be73..a36246c 100644
--- a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
+++ b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistReaderTask.java
@@ -20,15 +20,13 @@ package org.apache.streams.kafka;
import org.apache.streams.core.StreamsDatum;
+import kafka.consumer.KafkaStream;
+import kafka.message.MessageAndMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Random;
-import kafka.consumer.ConsumerIterator;
-import kafka.consumer.KafkaStream;
-import kafka.message.MessageAndMetadata;
-
/**
* KafkaPersistReaderTask reads documents from kafka on behalf of
* @see org.apache.streams.kafka.KafkaPersistReader
@@ -51,9 +49,8 @@ public class KafkaPersistReaderTask implements Runnable {
MessageAndMetadata<String,String> item;
while (true) {
- ConsumerIterator<String, String> it = stream.iterator();
- while (it.hasNext()) {
- item = it.next();
+ for (MessageAndMetadata<String, String> aStream : stream) {
+ item = aStream;
reader.persistQueue.add(new StreamsDatum(item.message()));
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
index 40e125f..9f696c7 100644
--- a/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
+++ b/streams-contrib/streams-persist-kafka/src/main/java/org/apache/streams/kafka/KafkaPersistWriter.java
@@ -26,7 +26,9 @@ import org.apache.streams.util.GuidUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-
+import kafka.javaapi.producer.Producer;
+import kafka.producer.KeyedMessage;
+import kafka.producer.ProducerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,10 +37,6 @@ import java.util.Properties;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import kafka.javaapi.producer.Producer;
-import kafka.producer.KeyedMessage;
-import kafka.producer.ProducerConfig;
-
/**
* KafkaPersistWriter writes documents to kafka.
*/
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 b6a7404..30ecfbf 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
@@ -38,7 +38,6 @@ import com.mongodb.DBObject;
import com.mongodb.MongoClient;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 6072f58..8f33648 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
@@ -35,7 +35,6 @@ import com.mongodb.MongoClient;
import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress;
import com.mongodb.util.JSON;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
index 2a2e170..7688b04 100644
--- a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
+++ b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java
index ae0709a..718e0f3 100644
--- a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java
+++ b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java
@@ -26,12 +26,11 @@ import com.fasterxml.jackson.databind.JsonNode;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -57,7 +56,7 @@ public class CleanAdditionalPropertiesProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum datum) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
ObjectNode activity = this.mapper.convertValue(datum.getDocument(), ObjectNode.class);
cleanAdditionalProperties(activity);
datum.setDocument(activity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/TypeConverterProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/TypeConverterProcessor.java b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/TypeConverterProcessor.java
index 4736ee2..26c7c4f 100644
--- a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/TypeConverterProcessor.java
+++ b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/TypeConverterProcessor.java
@@ -24,12 +24,12 @@ import org.apache.streams.core.StreamsProcessor;
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.LinkedList;
import java.util.List;
/**
@@ -42,7 +42,7 @@ public class TypeConverterProcessor implements StreamsProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(TypeConverterProcessor.class);
- private List<String> formats = Lists.newArrayList();
+ private List<String> formats = new ArrayList<>();
private ObjectMapper mapper;
@@ -91,7 +91,7 @@ public class TypeConverterProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newLinkedList();
+ List<StreamsDatum> result = new LinkedList<>();
Object inDoc = entry.getDocument();
ObjectNode node = null;
if ( inClass == String.class
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-jackson/src/test/java/org/apache/streams/jackson/test/TypeConverterProcessorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-jackson/src/test/java/org/apache/streams/jackson/test/TypeConverterProcessorTest.java b/streams-contrib/streams-processor-jackson/src/test/java/org/apache/streams/jackson/test/TypeConverterProcessorTest.java
index e0759c3..cea963a 100644
--- a/streams-contrib/streams-processor-jackson/src/test/java/org/apache/streams/jackson/test/TypeConverterProcessorTest.java
+++ b/streams-contrib/streams-processor-jackson/src/test/java/org/apache/streams/jackson/test/TypeConverterProcessorTest.java
@@ -25,16 +25,15 @@ import org.apache.streams.jackson.TypeConverterProcessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
-
import org.junit.Test;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
*
@@ -48,7 +47,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterStringToString() {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(String.class, String.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(String.class, String.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
StreamsDatum datum = new StreamsDatum(DATASIFT_JSON, ID);
List<StreamsDatum> result = processor.process(datum);
@@ -64,7 +63,7 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterStringToObjectNode() {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(String.class, ObjectNode.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(String.class, ObjectNode.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
StreamsDatum datum = new StreamsDatum(DATASIFT_JSON, ID);
List<StreamsDatum> result = processor.process(datum);
@@ -80,9 +79,9 @@ public class TypeConverterProcessorTest {
@Test
public void testTypeConverterObjectNodeToString() throws IOException {
final String ID = "1";
- StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, String.class, Lists.newArrayList(DATASIFT_FORMAT));
+ StreamsProcessor processor = new TypeConverterProcessor(ObjectNode.class, String.class, Collections.singletonList(DATASIFT_FORMAT));
processor.prepare(null);
- ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(DATASIFT_FORMAT));
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance(Collections.singletonList(DATASIFT_FORMAT));
ObjectNode node = mapper.readValue(DATASIFT_JSON, ObjectNode.class);
StreamsDatum datum = new StreamsDatum(node, ID);
List<StreamsDatum> result = processor.process(datum);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 c2c3705..b1024bd 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
@@ -28,15 +28,12 @@ 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;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Iterator;
import java.util.List;
/**
@@ -107,15 +104,13 @@ public class JsonPathExtractor implements StreamsProcessor {
} else if (readResult instanceof JSONArray) {
LOGGER.info("Matched Array:");
JSONArray array = (JSONArray) readResult;
- Iterator iterator = array.iterator();
- while (iterator.hasNext()) {
- Object item = iterator.next();
- if ( item instanceof String ) {
+ for (Object item : array) {
+ if (item instanceof String) {
LOGGER.info("String Item:" + item);
String match = (String) item;
StreamsDatum matchDatum = new StreamsDatum(match);
result.add(matchDatum);
- } else if ( item instanceof JSONObject ) {
+ } else if (item instanceof JSONObject) {
LOGGER.info("Object Item:" + item);
JSONObject match = (JSONObject) item;
ObjectNode objectNode = mapper.readValue(mapper.writeValueAsString(match), ObjectNode.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java
index ec741c2..dfeb8a2 100644
--- a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java
+++ b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java
@@ -29,20 +29,18 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.jayway.jsonpath.JsonPath;
-
import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Provides a base implementation for filtering datums which
@@ -77,7 +75,7 @@ public class JsonPathFilter implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
String json = null;
@@ -102,7 +100,7 @@ public class JsonPathFilter implements StreamsProcessor {
}
}
- Preconditions.checkNotNull(document);
+ Objects.requireNonNull(document);
if ( StringUtils.isNotEmpty(json)) {
@@ -114,7 +112,7 @@ public class JsonPathFilter implements StreamsProcessor {
LOGGER.warn(ex.getMessage());
}
- Preconditions.checkNotNull(srcResult);
+ Objects.requireNonNull(srcResult);
String[] path = StringUtils.split(pathExpression, '.');
ObjectNode node = document;
@@ -122,7 +120,7 @@ public class JsonPathFilter implements StreamsProcessor {
node = (ObjectNode) document.get(path[i]);
}
- Preconditions.checkNotNull(node);
+ Objects.requireNonNull(node);
if ( srcResult instanceof JSONArray ) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTest.java b/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTest.java
index 1ab7c00..50ea9ba 100644
--- a/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTest.java
+++ b/streams-contrib/streams-processor-json/src/test/java/org/apache/streams/json/test/JsonPathExtractorTest.java
@@ -23,7 +23,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.json.JsonPathExtractor;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.apache.commons.io.FileUtils;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
index 206931f..305ddfd 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
@@ -27,15 +27,14 @@ import org.apache.streams.pojo.json.Activity;
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.Sets;
-
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -77,7 +76,7 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
} else {
return new ArrayList<>();
}
- if (Strings.isNullOrEmpty(pattern)) {
+ if (StringUtils.isBlank(pattern)) {
prepare(null);
}
Map<String, List<Integer>> matches = RegexUtils.extractMatches(pattern, activity.getContent());
@@ -92,7 +91,7 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
entities.addAll(set);
entry.setDocument(activity);
- return Lists.newArrayList(entry);
+ return Collections.singletonList(entry);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 d1936d1..d46c2af 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
@@ -21,7 +21,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
index 6e17de8..1912ff0 100644
--- a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
+++ b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
@@ -19,10 +19,11 @@
package org.apache.streams.regex;
-import com.google.common.collect.Sets;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
+
+import com.google.common.collect.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
index 66f7aa5..bb0e95d 100644
--- a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
+++ b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
@@ -19,15 +19,21 @@
package org.apache.streams.regex;
-import com.google.common.collect.Sets;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
+
+import com.google.common.collect.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexUrlExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexUrlExtractorTest.java b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexUrlExtractorTest.java
index d5d8d9b..64e8599 100644
--- a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexUrlExtractorTest.java
+++ b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexUrlExtractorTest.java
@@ -19,14 +19,18 @@
package org.apache.streams.regex;
-import com.google.common.collect.Sets;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.pojo.json.Activity;
+
+import com.google.common.collect.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
index 42867d7..cefac6f 100644
--- a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
+++ b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
@@ -18,9 +18,8 @@
package org.apache.streams.urls;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
import org.apache.commons.codec.net.URLCodec;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.UrlValidator;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -28,12 +27,16 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLDecoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
public class LinkResolver implements Serializable {
@@ -73,7 +76,7 @@ public class LinkResolver implements Serializable {
// To help canonicalize the URL, these parts are 'known' to be 'ok' to remove
private static final Collection<String> URL_TRACKING_TO_REMOVE = new ArrayList<String>() {{
- /******************************************************************
+ /*
* Google uses parameters in the URL string to track referrers
* on their Google Analytics and promotions. These are the
* identified URL patterns.
@@ -102,7 +105,7 @@ public class LinkResolver implements Serializable {
// This element holds all the information about all the re-directs that have taken place
// and the steps and HTTP codes that occurred inside of each step.
private final LinkDetails linkDetails;
- private Collection<String> domainsSensitiveTo = new HashSet<String>();
+ private Collection<String> domainsSensitiveTo = new HashSet<>();
/**
* Get the link details
@@ -125,7 +128,7 @@ public class LinkResolver implements Serializable {
public void run() {
- Preconditions.checkNotNull(linkDetails.getOriginalURL());
+ Objects.requireNonNull(linkDetails.getOriginalURL());
linkDetails.setStartTime(DateTime.now());
@@ -140,22 +143,22 @@ public class LinkResolver implements Serializable {
this.linkDetails.setRedirected(false);
linkDetails.setFinalURL(cleanURL(linkDetails.getFinalURL()));
- if( !Strings.isNullOrEmpty(linkDetails.getFinalURL()))
+ if(StringUtils.isNotBlank(linkDetails.getFinalURL()))
linkDetails.setNormalizedURL(normalizeURL(linkDetails.getFinalURL()));
- if( !Strings.isNullOrEmpty(linkDetails.getNormalizedURL()))
+ if(StringUtils.isNotBlank(linkDetails.getNormalizedURL()))
linkDetails.setUrlParts(tokenizeURL(linkDetails.getNormalizedURL()));
this.updateTookInMillis();
}
protected void updateTookInMillis() {
- Preconditions.checkNotNull(linkDetails.getStartTime());
+ Objects.requireNonNull(linkDetails.getStartTime());
linkDetails.setTookInMills(DateTime.now().minus(linkDetails.getStartTime().getMillis()).getMillis());
}
public void unwindLink(String url) {
- Preconditions.checkNotNull(linkDetails);
- Preconditions.checkNotNull(url);
+ Objects.requireNonNull(linkDetails);
+ Objects.requireNonNull(url);
// Check url validity
UrlValidator urlValidator = new UrlValidator();
@@ -238,7 +241,7 @@ public class LinkResolver implements Serializable {
linkDetails.setFinalResponseCode((long) connection.getResponseCode());
Map<String, List<String>> headers = createCaseInsensitiveMap(connection.getHeaderFields());
- /******************************************************************
+ /*
* If they want us to set cookies, well, then we will set cookies
* Example URL:
* http://nyti.ms/1bCpesx
@@ -247,7 +250,7 @@ public class LinkResolver implements Serializable {
linkDetails.getCookies().add(headers.get(SET_COOKIE_IDENTIFIER).get(0));
switch (linkDetails.getFinalResponseCode().intValue()) {
- /**
+ /*
* W3C HTTP Response Codes:
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
*/
@@ -263,7 +266,7 @@ public class LinkResolver implements Serializable {
case 304: // Not Modified
case 306: // This status code is unused but in the redirect block.
case 307: // Temporary re-direct
- /*******************************************************************
+ /*
* Author:
* Smashew
*
@@ -338,7 +341,7 @@ public class LinkResolver implements Serializable {
}
private Map<String, List<String>> createCaseInsensitiveMap(Map<String, List<String>> input) {
- Map<String, List<String>> toReturn = new HashMap<String, List<String>>();
+ Map<String, List<String>> toReturn = new HashMap<>();
for (String k : input.keySet())
if (k != null && input.get(k) != null)
toReturn.put(k.toLowerCase(), input.get(k));
@@ -418,7 +421,7 @@ public class LinkResolver implements Serializable {
// If you want to just look in the GET parameters, or you want to ignore the domain
// or you want to use the domain as a token itself, that would have to be
// processed above the next line, and only the remaining parts split
- List<String> toReturn = new ArrayList<String>();
+ List<String> toReturn = new ArrayList<>();
// Split the URL by forward slashes. Most modern browsers will accept a URL
// this malformed such as http://www.smashew.com/hello//how////are/you
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverHelperFunctions.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverHelperFunctions.java b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverHelperFunctions.java
index d6785e9..5493fef 100644
--- a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverHelperFunctions.java
+++ b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolverHelperFunctions.java
@@ -18,7 +18,11 @@
package org.apache.streams.urls;
-import java.util.*;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Timer;
+import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Pattern;
@@ -57,7 +61,7 @@ public final class LinkResolverHelperFunctions {
public static final long DEFAULT_STAGGER = RECENT_DOMAINS_BACKOFF / 10;
// Map to store the information of recent domains, with the last time they were accessed.
- private static final ConcurrentMap<String, Date> RECENT_DOMAINS = new ConcurrentHashMap<String, Date>();
+ private static final ConcurrentMap<String, Date> RECENT_DOMAINS = new ConcurrentHashMap<>();
private static Timer timer;
@@ -142,7 +146,7 @@ public final class LinkResolverHelperFunctions {
// see if there is any work that 'can' be done
if(RECENT_DOMAINS.size() != 0) {
// create a temporary list of the items that can be removed
- Collection<String> ableToRemove = new HashSet<String>();
+ Collection<String> ableToRemove = new HashSet<>();
// iterate through all the domains (keys)
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 203b414..6c88e28 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
@@ -18,16 +18,19 @@
package org.apache.streams.urls;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
+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.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class LinkResolverProcessor implements StreamsProcessor {
@@ -102,7 +105,7 @@ public class LinkResolverProcessor implements StreamsProcessor {
protected Set<String> unwind(List<String> inputLinks) {
- Set<String> outputLinks = new HashSet<String>();
+ Set<String> outputLinks = new HashSet<>();
for (String link : inputLinks) {
try {
LinkResolver unwinder = new LinkResolver(link);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java
index 12f9848..6c8439f 100644
--- a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java
+++ b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java
@@ -24,9 +24,9 @@ import org.slf4j.LoggerFactory;
import java.util.Date;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public class LinkHelperFunctionsTest {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java
index 5908baa..3af3a89 100644
--- a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java
+++ b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java
@@ -18,24 +18,22 @@
package org.apache.streams.urls;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.apache.commons.lang3.SerializationUtils;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.jackson.StreamsJacksonModule;
import org.apache.streams.pojo.json.Activity;
+
+import org.apache.commons.lang3.SerializationUtils;
import org.junit.Ignore;
import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
-/**
- * Created by rebanks on 2/27/14.
- */
public class TestLinkUnwinderProcessor {
private static String activityString;
@@ -73,44 +71,44 @@ public class TestLinkUnwinderProcessor {
@Ignore
@Test
public void testActivityLinkUnwinderProcessorBitly() throws Exception{
- testActivityUnwinderHelper(Lists.newArrayList("http://bit.ly/1cX5Rh4"), Lists.newArrayList("http://www.wcgworld.com/"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://bit.ly/1cX5Rh4"), Lists.newArrayList("http://www.wcgworld.com/"));
+ testActivityUnwinderHelper(Collections.singletonList("http://bit.ly/1cX5Rh4"), Collections.singletonList("http://www.wcgworld.com/"));
+ testStringActivityUnwinderHelper(Collections.singletonList("http://bit.ly/1cX5Rh4"), Collections.singletonList("http://www.wcgworld.com/"));
}
@Ignore
@Test
public void testActivityLinkUnwinderProcessorTdotCo() throws Exception{
- testActivityUnwinderHelper(Lists.newArrayList("http://t.co/lLFgFynv2G"), Lists.newArrayList("http://www.holmesreport.com/latest"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://t.co/lLFgFynv2G"), Lists.newArrayList("http://www.holmesreport.com/latest"));
+ testActivityUnwinderHelper(Collections.singletonList("http://t.co/lLFgFynv2G"), Collections.singletonList("http://www.holmesreport.com/latest"));
+ testStringActivityUnwinderHelper(Collections.singletonList("http://t.co/lLFgFynv2G"), Collections.singletonList("http://www.holmesreport.com/latest"));
}
@Ignore
@Test
public void testActivityLinkUnwinderProcessorGoogle() throws Exception{
- testActivityUnwinderHelper(Lists.newArrayList("http://goo.gl/wSrHDA"), Lists.newArrayList("http://www.wcgworld.com/"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://goo.gl/wSrHDA"), Lists.newArrayList("http://www.wcgworld.com/"));
+ testActivityUnwinderHelper(Collections.singletonList("http://goo.gl/wSrHDA"), Collections.singletonList("http://www.wcgworld.com/"));
+ testStringActivityUnwinderHelper(Collections.singletonList("http://goo.gl/wSrHDA"), Collections.singletonList("http://www.wcgworld.com/"));
}
@Ignore
@Test
public void testActivityLinkUnwinderProcessorOwly() throws Exception{
- testActivityUnwinderHelper(Lists.newArrayList("http://ow.ly/u4Kte"), Lists.newArrayList("http://www.wcgworld.com/"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://ow.ly/u4Kte"), Lists.newArrayList("http://www.wcgworld.com/"));
+ testActivityUnwinderHelper(Collections.singletonList("http://ow.ly/u4Kte"), Collections.singletonList("http://www.wcgworld.com/"));
+ testStringActivityUnwinderHelper(Collections.singletonList("http://ow.ly/u4Kte"), Collections.singletonList("http://www.wcgworld.com/"));
}
@Ignore
@Test
public void testActivityLinkUnwinderProcessorGoDaddy() throws Exception{
- testActivityUnwinderHelper(Lists.newArrayList("http://x.co/3yapt"), Lists.newArrayList("http://www.wcgworld.com/"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://x.co/3yapt"), Lists.newArrayList("http://www.wcgworld.com/"));
+ testActivityUnwinderHelper(Collections.singletonList("http://x.co/3yapt"), Collections.singletonList("http://www.wcgworld.com/"));
+ testStringActivityUnwinderHelper(Collections.singletonList("http://x.co/3yapt"), Collections.singletonList("http://www.wcgworld.com/"));
}
@Ignore
@Test
public void testActivityLinkUnwinderProcessorMulti() throws Exception{
// changed these tests because the processor now guarantees each result returned only once
- testActivityUnwinderHelper(Lists.newArrayList("http://x.co/3yapt", "http://ow.ly/u4Kte", "http://goo.gl/wSrHDA"), Lists.newArrayList("http://www.wcgworld.com/"));
- testStringActivityUnwinderHelper(Lists.newArrayList("http://x.co/3yapt", "http://ow.ly/u4Kte", "http://goo.gl/wSrHDA"), Lists.newArrayList("http://www.wcgworld.com/"));
+ testActivityUnwinderHelper(Arrays.asList("http://x.co/3yapt", "http://ow.ly/u4Kte", "http://goo.gl/wSrHDA"), Collections.singletonList("http://www.wcgworld.com/"));
+ testStringActivityUnwinderHelper(Arrays.asList("http://x.co/3yapt", "http://ow.ly/u4Kte", "http://goo.gl/wSrHDA"), Collections.singletonList("http://www.wcgworld.com/"));
}
public void testActivityUnwinderHelper(List<String> input, List<String> expected) throws Exception{
@@ -137,7 +135,7 @@ public class TestLinkUnwinderProcessor {
assertNotNull(resultActivity.getLinks());
List<String> resultLinks = resultActivity.getLinks();
assertEquals(expected.size(), resultLinks.size());
- assertEquals(Sets.newHashSet(expected), Sets.newHashSet(resultLinks));
+ assertEquals(expected, resultLinks);
}
public void testStringActivityUnwinderHelper(List<String> input, List<String> expected) throws Exception{
@@ -159,7 +157,7 @@ public class TestLinkUnwinderProcessor {
assertNotNull(resultActivity.getLinks());
List<String> resultLinks = resultActivity.getLinks();
assertEquals(expected.size(), resultLinks.size());
- assertEquals(Sets.newHashSet(expected), Sets.newHashSet(resultLinks));
+ assertEquals(expected, resultLinks);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java
index 1216c38..7dd6769 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPageActivitySerializer.java
@@ -26,7 +26,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.commons.lang.NotImplementedException;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java
index 306fecc..0710a2c 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivitySerializer.java
@@ -26,7 +26,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 92cf333..7a25b23 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
@@ -29,13 +29,11 @@ import org.apache.streams.facebook.provider.FacebookEventClassifier;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import com.fasterxml.jackson.core.JsonParseException;
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;
@@ -65,7 +63,7 @@ public class FacebookTypeConverter implements StreamsProcessor {
private int count = 0;
- public static final String TERMINATE = new String("TERMINATE");
+ public static final String TERMINATE = "TERMINATE";
public FacebookTypeConverter(Class inClass, Class outClass) {
this.inClass = inClass;
@@ -138,8 +136,6 @@ public class FacebookTypeConverter implements StreamsProcessor {
while (parser.nextToken() != null) {
}
valid = true;
- } catch (JsonParseException jpe) {
- LOGGER.warn("validate: {}", jpe);
} catch (IOException ioe) {
LOGGER.warn("validate: {}", ioe);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookDataCollector.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookDataCollector.java
index 617bfab..52ec222 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookDataCollector.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookDataCollector.java
@@ -28,17 +28,15 @@ import org.apache.streams.util.oauth.tokens.tokenmanager.impl.BasicTokenManager;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
-
+import facebook4j.Facebook;
+import facebook4j.FacebookFactory;
+import facebook4j.conf.ConfigurationBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
-import facebook4j.Facebook;
-import facebook4j.FacebookFactory;
-import facebook4j.conf.ConfigurationBuilder;
-
/**
* Abstract data collector for Facebook. Iterates over ids and queues data to be output
* by a {@link org.apache.streams.core.StreamsProvider}
@@ -66,7 +64,7 @@ public abstract class FacebookDataCollector implements Runnable {
this.queue = queue;
this.isComplete = new AtomicBoolean(false);
this.backOff = new ExponentialBackOffStrategy(5);
- this.authTokens = new BasicTokenManager<String>();
+ this.authTokens = new BasicTokenManager<>();
if (config.getUserAccessTokens() != null) {
for (String token : config.getUserAccessTokens()) {
this.authTokens.addTokenToPool(token);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookEventClassifier.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookEventClassifier.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookEventClassifier.java
index 47c2afb..2370810 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookEventClassifier.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookEventClassifier.java
@@ -24,7 +24,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendFeedProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendFeedProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendFeedProvider.java
index 3253479..93508b0 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendFeedProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendFeedProvider.java
@@ -34,7 +34,15 @@ import com.google.common.collect.Queues;
import com.google.common.util.concurrent.MoreExecutors;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigRenderOptions;
-
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.Friend;
+import facebook4j.Paging;
+import facebook4j.Post;
+import facebook4j.ResponseList;
+import facebook4j.conf.ConfigurationBuilder;
+import facebook4j.json.DataObjectFactory;
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -54,16 +62,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import facebook4j.Facebook;
-import facebook4j.FacebookException;
-import facebook4j.FacebookFactory;
-import facebook4j.Friend;
-import facebook4j.Paging;
-import facebook4j.Post;
-import facebook4j.ResponseList;
-import facebook4j.conf.ConfigurationBuilder;
-import facebook4j.json.DataObjectFactory;
-
public class FacebookFriendFeedProvider implements StreamsProvider, Serializable {
public static final String STREAMS_ID = "FacebookFriendFeedProvider";
@@ -78,7 +76,7 @@ public class FacebookFriendFeedProvider implements StreamsProvider, Serializable
private Class klass;
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
- protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<StreamsDatum>();
+ protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<>();
public FacebookUserstreamConfiguration getConfig() {
return configuration;
@@ -103,7 +101,7 @@ public class FacebookFriendFeedProvider implements StreamsProvider, Serializable
private static ExecutorService newFixedThreadPoolWithQueueSize(int numThreads, int queueSize) {
return new ThreadPoolExecutor(numThreads, numThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
/**
@@ -116,7 +114,6 @@ public class FacebookFriendFeedProvider implements StreamsProvider, Serializable
configuration = mapper.readValue(config.root().render(ConfigRenderOptions.concise()), FacebookUserInformationConfiguration.class);
} catch (IOException ex) {
ex.printStackTrace();
- return;
}
}
@@ -193,8 +190,7 @@ public class FacebookFriendFeedProvider implements StreamsProvider, Serializable
this.start = start;
this.end = end;
readCurrent();
- StreamsResultSet result = (StreamsResultSet)providerQueue.iterator();
- return result;
+ return (StreamsResultSet)providerQueue.iterator();
}
@Override
@@ -266,9 +262,8 @@ public class FacebookFriendFeedProvider implements StreamsProvider, Serializable
.setClientVersion("v1.0");
FacebookFactory ff = new FacebookFactory(cb.build());
- Facebook facebook = ff.getInstance();
- return facebook;
+ return ff.getInstance();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendUpdatesProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendUpdatesProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendUpdatesProvider.java
index 50ac64a..c973863 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendUpdatesProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookFriendUpdatesProvider.java
@@ -34,7 +34,15 @@ import com.google.common.collect.Sets;
import com.google.common.util.concurrent.MoreExecutors;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigRenderOptions;
-
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.Friend;
+import facebook4j.Paging;
+import facebook4j.Post;
+import facebook4j.ResponseList;
+import facebook4j.conf.ConfigurationBuilder;
+import facebook4j.json.DataObjectFactory;
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -44,6 +52,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.Iterator;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
@@ -55,22 +64,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import facebook4j.Facebook;
-import facebook4j.FacebookException;
-import facebook4j.FacebookFactory;
-import facebook4j.Friend;
-import facebook4j.Paging;
-import facebook4j.Post;
-import facebook4j.ResponseList;
-import facebook4j.conf.ConfigurationBuilder;
-import facebook4j.json.DataObjectFactory;
-
/**
* FacebookFriendUpdatesProvider provides updates from friend feed.
*/
public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializable {
- public static final String STREAMS_ID = "FacebookFriendPostsProvider";
+ private static final String STREAMS_ID = "FacebookFriendPostsProvider";
private static final Logger LOGGER = LoggerFactory.getLogger(FacebookFriendUpdatesProvider.class);
@@ -84,7 +83,7 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
private Class klass;
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
- protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<StreamsDatum>();
+ protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<>();
public FacebookUserstreamConfiguration getConfig() {
return configuration;
@@ -110,7 +109,7 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
private static ExecutorService newFixedThreadPoolWithQueueSize(int numThreads, int queueSize) {
return new ThreadPoolExecutor(numThreads, numThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
/**
@@ -123,7 +122,6 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
configuration = mapper.readValue(config.root().render(ConfigRenderOptions.concise()), FacebookUserInformationConfiguration.class);
} catch (IOException ex) {
ex.printStackTrace();
- return;
}
}
@@ -209,8 +207,7 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
this.start = start;
this.end = end;
readCurrent();
- StreamsResultSet result = (StreamsResultSet)providerQueue.iterator();
- return result;
+ return (StreamsResultSet)providerQueue.iterator();
}
@Override
@@ -242,11 +239,11 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
executor = MoreExecutors.listeningDecorator(newFixedThreadPoolWithQueueSize(5, 20));
- Preconditions.checkNotNull(providerQueue);
- Preconditions.checkNotNull(this.klass);
- Preconditions.checkNotNull(configuration.getOauth().getAppId());
- Preconditions.checkNotNull(configuration.getOauth().getAppSecret());
- Preconditions.checkNotNull(configuration.getOauth().getUserAccessToken());
+ Objects.requireNonNull(providerQueue);
+ Objects.requireNonNull(this.klass);
+ Objects.requireNonNull(configuration.getOauth().getAppId());
+ Objects.requireNonNull(configuration.getOauth().getAppSecret());
+ Objects.requireNonNull(configuration.getOauth().getUserAccessToken());
Facebook client = getFacebookClient();
@@ -254,11 +251,6 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
ResponseList<Friend> friendResponseList = client.friends().getFriends();
Paging<Friend> friendPaging;
do {
-
- for ( Friend friend : friendResponseList ) {
- // client.rawAPI().callPostAPI();
- // add a subscription
- }
friendPaging = friendResponseList.getPaging();
friendResponseList = client.fetchNext(friendPaging);
}
@@ -283,9 +275,8 @@ public class FacebookFriendUpdatesProvider implements StreamsProvider, Serializa
.setClientVersion("v1.0");
FacebookFactory ff = new FacebookFactory(cb.build());
- Facebook facebook = ff.getInstance();
- return facebook;
+ return ff.getInstance();
}
@Override
[6/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
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/SimpleHTTPPostProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
index 1d52b5c..6901b4f 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
@@ -18,11 +18,20 @@
package org.apache.streams.components.http.processor;
+import org.apache.streams.components.http.HttpProcessorConfiguration;
+import org.apache.streams.config.ComponentConfigurator;
+import org.apache.streams.config.StreamsConfigurator;
+import org.apache.streams.core.StreamsDatum;
+import org.apache.streams.core.StreamsProcessor;
+import org.apache.streams.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.HttpPost;
@@ -32,14 +41,6 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.apache.streams.components.http.HttpProcessorConfiguration;
-import org.apache.streams.config.ComponentConfigurator;
-import org.apache.streams.config.StreamsConfigurator;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.core.StreamsProcessor;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.extensions.ExtensionUtil;
-import org.apache.streams.pojo.json.ActivityObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -244,7 +245,7 @@ public class SimpleHTTPPostProcessor implements StreamsProcessor {
public HttpPost prepareHttpPost(URI uri, HttpEntity entity) {
HttpPost httpPost = new HttpPost(uri);
httpPost.addHeader("content-type", this.configuration.getContentType());
- if ( !Strings.isNullOrEmpty(authHeader)) {
+ if (StringUtils.isNotBlank(authHeader)) {
httpPost.addHeader("Authorization", String.format("Basic %s", authHeader));
}
httpPost.setEntity(entity);
@@ -261,11 +262,11 @@ public class SimpleHTTPPostProcessor 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())
- && !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/provider/SimpleHttpProvider.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/provider/SimpleHttpProvider.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/provider/SimpleHttpProvider.java
index ab11a68..e46342e 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/provider/SimpleHttpProvider.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/provider/SimpleHttpProvider.java
@@ -18,12 +18,19 @@
package org.apache.streams.components.http.provider;
+import org.apache.streams.components.http.HttpProviderConfiguration;
+import org.apache.streams.config.ComponentConfigurator;
+import org.apache.streams.config.StreamsConfigurator;
+import org.apache.streams.core.StreamsDatum;
+import org.apache.streams.core.StreamsProvider;
+import org.apache.streams.core.StreamsResultSet;
+import org.apache.streams.jackson.StreamsJacksonMapper;
+
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -37,13 +44,6 @@ import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.apache.streams.components.http.HttpProviderConfiguration;
-import org.apache.streams.config.ComponentConfigurator;
-import org.apache.streams.config.StreamsConfigurator;
-import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.core.StreamsProvider;
-import org.apache.streams.core.StreamsResultSet;
-import org.apache.streams.jackson.StreamsJacksonMapper;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,6 +60,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
@@ -236,7 +237,7 @@ public class SimpleHttpProvider implements StreamsProvider {
protected List<ObjectNode> execute(URI uri) {
- Preconditions.checkNotNull(uri);
+ Objects.requireNonNull(uri);
List<ObjectNode> results = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
index 2333c4b..a74e6bc 100644
--- a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
+++ b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
@@ -23,7 +23,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-config/src/main/java/org/apache/streams/config/ComponentConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-config/src/main/java/org/apache/streams/config/ComponentConfigurator.java b/streams-config/src/main/java/org/apache/streams/config/ComponentConfigurator.java
index 5eea60e..ce88a23 100644
--- a/streams-config/src/main/java/org/apache/streams/config/ComponentConfigurator.java
+++ b/streams-config/src/main/java/org/apache/streams/config/ComponentConfigurator.java
@@ -21,7 +21,6 @@ package org.apache.streams.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigRenderOptions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java b/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
index 319b32a..83e98b5 100644
--- a/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
+++ b/streams-config/src/main/java/org/apache/streams/config/StreamsConfigurator.java
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigRenderOptions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java b/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
index 82cc6bc..80fa7de 100644
--- a/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
+++ b/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
@@ -18,13 +18,14 @@
package org.apache.streams.config.test;
+import org.apache.streams.config.ComponentConfiguration;
+import org.apache.streams.config.ComponentConfigurator;
+import org.apache.streams.config.StreamsConfigurator;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigRenderOptions;
-import org.apache.streams.config.ComponentConfiguration;
-import org.apache.streams.config.ComponentConfigurator;
-import org.apache.streams.config.StreamsConfigurator;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-config/src/test/java/org/apache/streams/config/test/StreamsConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/streams-config/src/test/java/org/apache/streams/config/test/StreamsConfiguratorTest.java b/streams-config/src/test/java/org/apache/streams/config/test/StreamsConfiguratorTest.java
index a29d8c7..64010c1 100644
--- a/streams-config/src/test/java/org/apache/streams/config/test/StreamsConfiguratorTest.java
+++ b/streams-config/src/test/java/org/apache/streams/config/test/StreamsConfiguratorTest.java
@@ -18,34 +18,19 @@
package org.apache.streams.config.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import org.apache.streams.config.ComponentConfiguration;
import org.apache.streams.config.StreamsConfiguration;
import org.apache.streams.config.StreamsConfigurator;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.Scanner;
-
/**
- * Test for
- * @see {@link org.apache.streams.config.StreamsConfigurator}
+ * Test for {@link org.apache.streams.config.StreamsConfigurator}
*/
public class StreamsConfiguratorTest {
- private static final ObjectMapper mapper = new ObjectMapper();
-
@Test
public void testDetectConfiguration() throws Exception {
@@ -53,7 +38,7 @@ public class StreamsConfiguratorTest {
Config detected = StreamsConfigurator.getConfig();
- junit.framework.Assert.assertEquals(config, detected);
+ Assert.assertEquals(config, detected);
StreamsConfiguration defaultPojo = StreamsConfigurator.detectConfiguration();
@@ -63,7 +48,7 @@ public class StreamsConfiguratorTest {
assert(configuredPojo != null);
- junit.framework.Assert.assertEquals(configuredPojo, defaultPojo);
+ Assert.assertEquals(configuredPojo, defaultPojo);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReader.java b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReader.java
index e3bfe70..42cce8a 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReader.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistReader.java
@@ -37,7 +37,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Queues;
import com.typesafe.config.Config;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +79,7 @@ public class KinesisPersistReader implements StreamsPersistReader, Serializable
public KinesisPersistReader() {
Config config = StreamsConfigurator.config.getConfig("kinesis");
this.config = new ComponentConfigurator<>(KinesisReaderConfiguration.class).detectConfiguration(config);
- this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ this.persistQueue = new ConcurrentLinkedQueue<>();
}
/**
@@ -88,7 +87,7 @@ public class KinesisPersistReader implements StreamsPersistReader, Serializable
*/
public KinesisPersistReader(KinesisReaderConfiguration config) {
this.config = config;
- this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ this.persistQueue = new ConcurrentLinkedQueue<>();
}
public void setConfig(KinesisReaderConfiguration config) {
@@ -176,7 +175,7 @@ public class KinesisPersistReader implements StreamsPersistReader, Serializable
while( !executor.isTerminated()) {
try {
executor.awaitTermination(5, TimeUnit.SECONDS);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException ignored) {}
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 a93fda8..37891be 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
@@ -27,7 +27,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistWriter.java b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistWriter.java
index b61a364..6e2db0f 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistWriter.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/src/main/java/org/apache/streams/amazon/kinesis/KinesisPersistWriter.java
@@ -37,7 +37,6 @@ import com.amazonaws.services.kinesis.model.PutRecordResult;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.typesafe.config.Config;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,7 +76,7 @@ public class KinesisPersistWriter implements StreamsPersistWriter {
public KinesisPersistWriter() {
Config config = StreamsConfigurator.config.getConfig("kinesis");
this.config = new ComponentConfigurator<>(KinesisWriterConfiguration.class).detectConfiguration(config);
- this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ this.persistQueue = new ConcurrentLinkedQueue<>();
}
/**
@@ -85,7 +84,7 @@ public class KinesisPersistWriter implements StreamsPersistWriter {
*/
public KinesisPersistWriter(KinesisWriterConfiguration config) {
this.config = config;
- this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ this.persistQueue = new ConcurrentLinkedQueue<>();
}
public void setConfig(KinesisWriterConfiguration config) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3ObjectInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3ObjectInputStreamWrapper.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3ObjectInputStreamWrapper.java
index f34782a..e70c361 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3ObjectInputStreamWrapper.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3ObjectInputStreamWrapper.java
@@ -20,7 +20,6 @@ package org.apache.streams.s3;
import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectInputStream;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3OutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3OutputStreamWrapper.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3OutputStreamWrapper.java
index e8ca0c7..87bd8c8 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3OutputStreamWrapper.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3OutputStreamWrapper.java
@@ -22,7 +22,6 @@ import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.transfer.TransferManager;
import com.amazonaws.services.s3.transfer.Upload;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
index 753b439..da1a00e 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReader.java
@@ -39,7 +39,6 @@ import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Queues;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -147,15 +146,15 @@ public class S3PersistReader implements StreamsPersistReader, DatumStatusCountab
ObjectListing listing = this.amazonS3Client.listObjects(request);
- this.files = new ArrayList<String>();
+ this.files = new ArrayList<>();
- /**
+ /*
* If you can list files that are in this path, then you must be dealing with a directory
* if you cannot list files that are in this path, then you are most likely dealing with
* a simple file.
*/
- boolean hasCommonPrefixes = listing.getCommonPrefixes().size() > 0 ? true : false;
- boolean hasObjectSummaries = listing.getObjectSummaries().size() > 0 ? true : false;
+ boolean hasCommonPrefixes = listing.getCommonPrefixes().size() > 0;
+ boolean hasObjectSummaries = listing.getObjectSummaries().size() > 0;
if (hasCommonPrefixes || hasObjectSummaries) {
// Handle the 'directory' use case
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReaderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReaderTask.java b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReaderTask.java
index f0e9626..82bcba7 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReaderTask.java
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/src/main/java/org/apache/streams/s3/S3PersistReaderTask.java
@@ -23,7 +23,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.util.ComponentUtils;
import com.google.common.base.Strings;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +54,7 @@ public class S3PersistReaderTask implements Runnable {
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(is));
LOGGER.info("Reading: {} ", file);
- String line = "";
+ String line;
try {
while ((line = bufferedReader.readLine()) != null) {
if ( !Strings.isNullOrEmpty(line) ) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 ef6e831..34e4b67 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
@@ -39,7 +39,6 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +69,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
private ObjectMapper objectMapper;
private AmazonS3Client amazonS3Client;
private S3WriterConfiguration s3WriterConfiguration;
- private final List<String> writtenFiles = new ArrayList<String>();
+ private final List<String> writtenFiles = new ArrayList<>();
protected LineReadWriteUtil lineWriterUtil;
private final AtomicLong totalBytesWritten = new AtomicLong();
@@ -79,7 +78,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
private final AtomicInteger totalRecordsWritten = new AtomicInteger();
private AtomicInteger fileLineCounter = new AtomicInteger();
- private static Map<String, String> objectMetaData = new HashMap<String, String>();
+ private static Map<String, String> objectMetaData = new HashMap<>();
static {
objectMetaData.put("line[0]", "id");
@@ -103,7 +102,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
}
public Map<String, String> getObjectMetaData() {
- return this.objectMetaData;
+ return objectMetaData;
}
public ObjectMapper getObjectMapper() {
@@ -115,7 +114,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
}
public void setObjectMetaData(Map<String, String> val) {
- this.objectMetaData = val;
+ objectMetaData = val;
}
public S3PersistWriter() {
@@ -203,7 +202,7 @@ public class S3PersistWriter implements StreamsPersistWriter, DatumStatusCountab
this.s3WriterConfiguration.getBucket(),
this.s3WriterConfiguration.getWriterPath(),
fileName,
- this.objectMetaData);
+ objectMetaData);
// reset the counter
this.fileLineCounter = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
index 6358071..dfbd91e 100644
--- a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
+++ b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
@@ -24,12 +24,11 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.PrintStream;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -42,14 +41,14 @@ public class ConsolePersistWriter implements StreamsPersistWriter {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsolePersistWriter.class);
- protected PrintStream printStream = System.out;
+ private PrintStream printStream = System.out;
protected volatile Queue<StreamsDatum> persistQueue;
private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
public ConsolePersistWriter() {
- this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ this.persistQueue = new ConcurrentLinkedQueue<>();
}
public ConsolePersistWriter(PrintStream printStream) {
@@ -63,7 +62,7 @@ public class ConsolePersistWriter implements StreamsPersistWriter {
}
public void prepare(Object configuration) {
- Preconditions.checkNotNull(persistQueue);
+ Objects.requireNonNull(persistQueue);
}
public void cleanUp() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
index bdff9aa..f488263 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
@@ -19,7 +19,6 @@
package org.apache.streams.elasticsearch;
import com.google.common.net.InetAddresses;
-
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java
index 789b62f..3c4ebc9 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistDeleter.java
@@ -21,20 +21,19 @@ package org.apache.streams.elasticsearch;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsPersistWriter;
-import com.google.common.base.Preconditions;
-
import org.elasticsearch.action.delete.DeleteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
+import java.util.Objects;
/**
* ElasticsearchPersistDeleter deletes documents from elasticsearch.
*/
public class ElasticsearchPersistDeleter extends ElasticsearchPersistWriter implements StreamsPersistWriter {
- public static final String STREAMS_ID = ElasticsearchPersistDeleter.class.getCanonicalName();
+ private static final String STREAMS_ID = ElasticsearchPersistDeleter.class.getCanonicalName();
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchPersistDeleter.class);
@@ -84,9 +83,9 @@ public class ElasticsearchPersistDeleter extends ElasticsearchPersistWriter impl
public void delete(String index, String type, String id) {
DeleteRequest deleteRequest;
- Preconditions.checkNotNull(index);
- Preconditions.checkNotNull(id);
- Preconditions.checkNotNull(type);
+ Objects.requireNonNull(index);
+ Objects.requireNonNull(id);
+ Objects.requireNonNull(type);
// They didn't specify an ID, so we will create one for them.
deleteRequest = new DeleteRequest()
@@ -104,8 +103,8 @@ public class ElasticsearchPersistDeleter extends ElasticsearchPersistWriter impl
*/
public void add(DeleteRequest request) {
- Preconditions.checkNotNull(request);
- Preconditions.checkNotNull(request.index());
+ Objects.requireNonNull(request);
+ Objects.requireNonNull(request.index());
// If our queue is larger than our flush threshold, then we should flush the queue.
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
index 388497e..27285f9 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
@@ -27,7 +27,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Queues;
-
import org.elasticsearch.search.SearchHit;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -200,7 +199,7 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Seriali
StreamsDatum item;
while (query.hasNext()) {
SearchHit hit = query.next();
- ObjectNode jsonObject = null;
+ ObjectNode jsonObject;
try {
jsonObject = mapper.readValue(hit.getSourceAsString(), ObjectNode.class);
item = new StreamsDatum(jsonObject, hit.getId());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistUpdater.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistUpdater.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistUpdater.java
index f4da436..c8b95d6 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistUpdater.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistUpdater.java
@@ -21,21 +21,20 @@ package org.apache.streams.elasticsearch;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsPersistWriter;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-
+import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.update.UpdateRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Map;
+import java.util.Objects;
/**
* ElasticsearchPersistUpdater updates documents to elasticsearch.
*/
public class ElasticsearchPersistUpdater extends ElasticsearchPersistWriter implements StreamsPersistWriter {
- public static final String STREAMS_ID = ElasticsearchPersistUpdater.class.getCanonicalName();
+ private static final String STREAMS_ID = ElasticsearchPersistUpdater.class.getCanonicalName();
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchPersistUpdater.class);
@@ -97,8 +96,8 @@ public class ElasticsearchPersistUpdater extends ElasticsearchPersistWriter impl
public void update(String indexName, String type, String id, String parent, String routing, String json) {
UpdateRequest updateRequest;
- Preconditions.checkNotNull(id);
- Preconditions.checkNotNull(json);
+ Objects.requireNonNull(id);
+ Objects.requireNonNull(json);
// They didn't specify an ID, so we will create one for them.
updateRequest = new UpdateRequest()
@@ -107,11 +106,11 @@ public class ElasticsearchPersistUpdater extends ElasticsearchPersistWriter impl
.id(id)
.doc(json);
- if (!Strings.isNullOrEmpty(parent)) {
+ if (StringUtils.isNotBlank(parent)) {
updateRequest = updateRequest.parent(parent);
}
- if (!Strings.isNullOrEmpty(routing)) {
+ if (StringUtils.isNotBlank(routing)) {
updateRequest = updateRequest.routing(routing);
}
@@ -128,8 +127,8 @@ public class ElasticsearchPersistUpdater extends ElasticsearchPersistWriter impl
*/
public void add(UpdateRequest request) {
- Preconditions.checkNotNull(request);
- Preconditions.checkNotNull(request.index());
+ Objects.requireNonNull(request);
+ Objects.requireNonNull(request.index());
// If our queue is larger than our flush threshold, then we should flush the queue.
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
index 07ab734..bc60197 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
@@ -27,8 +27,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.Preconditions;
-
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
@@ -52,6 +50,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
@@ -425,9 +424,9 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Seriali
public void add(String indexName, String type, String id, String parent, String routing, String ts, String json) {
// make sure that these are not null
- Preconditions.checkNotNull(indexName);
- Preconditions.checkNotNull(type);
- Preconditions.checkNotNull(json);
+ Objects.requireNonNull(indexName);
+ Objects.requireNonNull(type);
+ Objects.requireNonNull(json);
IndexRequestBuilder indexRequestBuilder = manager.getClient()
.prepareIndex(indexName, type)
@@ -451,8 +450,8 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Seriali
protected void add(IndexRequest request) {
- Preconditions.checkNotNull(request);
- Preconditions.checkNotNull(request.index());
+ Objects.requireNonNull(request);
+ Objects.requireNonNull(request.index());
// If our queue is larger than our flush threshold, then we should flush the queue.
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchQuery.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchQuery.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchQuery.java
index 06a6dc8..a77101b 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchQuery.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchQuery.java
@@ -23,7 +23,6 @@ import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
-
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java
index 6ce15d4..28f8b38 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
import com.typesafe.config.Config;
-
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.joda.time.DateTime;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataProcessor.java
index bef190e..cc35b05 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataProcessor.java
@@ -27,7 +27,6 @@ import org.apache.streams.elasticsearch.ElasticsearchMetadataUtil;
import org.apache.streams.elasticsearch.ElasticsearchReaderConfiguration;
import com.typesafe.config.Config;
-
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
import org.joda.time.DateTime;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java
index 2a64fbc..105c453 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java
@@ -26,7 +26,6 @@ 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 721ad42..e5efbb9 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
@@ -28,7 +28,6 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
index 69394ee..ab6341c 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
@@ -32,9 +32,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
@@ -53,9 +50,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
@@ -124,7 +122,7 @@ public class PercolateTagProcessor implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
String json;
ObjectNode node;
@@ -172,9 +170,8 @@ public class PercolateTagProcessor implements StreamsProcessor {
ArrayNode tagArray = JsonNodeFactory.instance.arrayNode();
- Iterator<PercolateResponse.Match> matchIterator = response.iterator();
- while (matchIterator.hasNext()) {
- tagArray.add(matchIterator.next().getId().string());
+ for (PercolateResponse.Match aResponse : response) {
+ tagArray.add(aResponse.getId().string());
}
LOGGER.trace("Percolate matches: {}", tagArray);
@@ -202,14 +199,14 @@ public class PercolateTagProcessor implements StreamsProcessor {
mapper = StreamsJacksonMapper.getInstance();
- Preconditions.checkNotNull(config);
+ Objects.requireNonNull(config);
manager = new ElasticsearchClientManager(config);
if ( config.getTags() != null && config.getTags().getAdditionalProperties().size() > 0) {
// initial write tags to index
createIndexIfMissing(config.getIndex());
- if ( config.getReplaceTags() == true ) {
+ if (config.getReplaceTags()) {
deleteOldQueries(config.getIndex());
}
for (String tag : config.getTags().getAdditionalProperties().keySet()) {
@@ -219,7 +216,7 @@ public class PercolateTagProcessor implements StreamsProcessor {
}
bulkBuilder = manager.getClient().prepareBulk();
- if (writePercolateRules() == true) {
+ if (writePercolateRules()) {
LOGGER.info("wrote " + bulkBuilder.numberOfActions() + " tags to " + config.getIndex() + " _percolator");
} else {
LOGGER.error("FAILED writing " + bulkBuilder.numberOfActions() + " tags to " + config.getIndex() + " _percolator");
@@ -230,7 +227,7 @@ public class PercolateTagProcessor implements StreamsProcessor {
@Override
public void cleanUp() {
- if ( config.getCleanupTags() == true ) {
+ if (config.getCleanupTags()) {
deleteOldQueries(config.getIndex());
}
manager.getClient().close();
@@ -311,7 +308,7 @@ public class PercolateTagProcessor implements StreamsProcessor {
* @return result
*/
public Set<String> getActivePercolateTags(String index) {
- Set<String> tags = new HashSet<String>();
+ Set<String> tags = new HashSet<>();
SearchRequestBuilder searchBuilder = manager.getClient().prepareSearch("*").setIndices(index).setTypes(".percolator").setSize(1000);
SearchResponse response = searchBuilder.setQuery(QueryBuilders.matchAllQuery()).execute().actionGet();
SearchHits hits = response.getHits();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
index caa0b8d..91afef6 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/DatumFromMetadataProcessorIT.java
@@ -24,11 +24,9 @@ import org.apache.streams.elasticsearch.ElasticsearchClientManager;
import org.apache.streams.elasticsearch.ElasticsearchReaderConfiguration;
import org.apache.streams.elasticsearch.processor.DatumFromMetadataProcessor;
-import com.google.common.collect.Maps;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.apache.commons.lang.SerializationUtils;
import org.elasticsearch.client.Client;
import org.junit.Assert;
@@ -36,6 +34,7 @@ import org.junit.Before;
import org.junit.Test;
import java.io.File;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -70,7 +69,7 @@ public class DatumFromMetadataProcessorIT {
@Test
public void testDatumFromMetadataProcessor() {
- Map<String, Object> metadata = Maps.newHashMap();
+ Map<String, Object> metadata = new HashMap<>();
metadata.put("index", testConfiguration.getIndexes().get(0));
metadata.put("type", testConfiguration.getTypes().get(0));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
index 553a711..d3b1fd3 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
@@ -18,34 +18,26 @@
package org.apache.streams.elasticsearch.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
-import org.apache.commons.io.IOUtils;
import org.apache.streams.config.ComponentConfigurator;
-import org.apache.streams.config.StreamsConfiguration;
-import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.elasticsearch.ElasticsearchClientManager;
import org.apache.streams.elasticsearch.ElasticsearchPersistUpdater;
-import org.apache.streams.elasticsearch.ElasticsearchPersistWriter;
import org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration;
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.google.common.base.Strings;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigParseOptions;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder;
-import org.elasticsearch.action.count.CountRequest;
-import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
@@ -62,14 +54,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.net.URL;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
index 6b52ce5..d35b8a2 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
@@ -18,14 +18,6 @@
package org.apache.streams.elasticsearch.test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
-import org.apache.commons.io.IOUtils;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.elasticsearch.ElasticsearchClientManager;
@@ -34,6 +26,15 @@ import org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration;
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 com.google.common.base.Strings;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import com.typesafe.config.ConfigParseOptions;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -61,7 +62,7 @@ import java.net.URL;
import java.util.List;
import java.util.Set;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -104,7 +105,7 @@ public class ElasticsearchParentChildWriterIT {
DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
assertTrue(deleteIndexResponse.isAcknowledged());
- };
+ }
PutIndexTemplateRequestBuilder putTemplateRequestBuilder = testClient.admin().indices().preparePutTemplate("mappings");
URL templateURL = ElasticsearchParentChildWriterIT.class.getResource("/ActivityChildObjectParent.json");
@@ -133,7 +134,7 @@ public class ElasticsearchParentChildWriterIT {
if(indicesExistsResponse.isExists()) {
DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
- };
+ }
ElasticsearchPersistWriter testPersistWriter = new ElasticsearchPersistWriter(testConfiguration);
testPersistWriter.prepare(null);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
index e356aff..603ec5f 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
@@ -53,7 +52,7 @@ import java.io.File;
import java.io.InputStream;
import java.util.List;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -120,7 +119,7 @@ public class ElasticsearchPersistUpdaterIT {
Activity update = new Activity();
update.setAdditionalProperty("updated", Boolean.TRUE);
update.setAdditionalProperty("str", "str");
- update.setAdditionalProperty("long", 10l);
+ update.setAdditionalProperty("long", 10L);
update.setActor(
new ActivityObject()
.withAdditionalProperty("updated", Boolean.TRUE)
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
index f290971..3fec9f3 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
@@ -53,7 +52,7 @@ import java.io.File;
import java.io.InputStream;
import java.util.List;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -91,7 +90,7 @@ public class ElasticsearchPersistWriterIT {
DeleteIndexRequest deleteIndexRequest = Requests.deleteIndexRequest(testConfiguration.getIndex());
DeleteIndexResponse deleteIndexResponse = testClient.admin().indices().delete(deleteIndexRequest).actionGet();
assertTrue(deleteIndexResponse.isAcknowledged());
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestDocumentToMetadataProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestDocumentToMetadataProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestDocumentToMetadataProcessor.java
index 8900ef3..3e9f3e1 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestDocumentToMetadataProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestDocumentToMetadataProcessor.java
@@ -18,24 +18,17 @@
package org.apache.streams.elasticsearch.test;
-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.apache.commons.lang.SerializationUtils;
import org.apache.streams.core.StreamsDatum;
-import org.apache.streams.elasticsearch.ElasticsearchReaderConfiguration;
import org.apache.streams.elasticsearch.processor.DocumentToMetadataProcessor;
import org.apache.streams.jackson.StreamsJacksonMapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang.SerializationUtils;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by sblackmon on 10/20/14.
- */
public class TestDocumentToMetadataProcessor {
private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
index 76f10b1..7bd4341 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
-
import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.SerializationUtils;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java
index b921ba5..32d6032 100644
--- a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java
+++ b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java
@@ -26,9 +26,7 @@ import org.apache.streams.core.StreamsResultSet;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Queues;
import com.squareup.tape.QueueFile;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +38,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Serializable;
import java.math.BigInteger;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
@@ -50,11 +49,11 @@ import java.util.concurrent.Executors;
*/
public class FileBufferPersistReader implements StreamsPersistReader, Serializable {
- public static final String STREAMS_ID = "FileBufferPersistReader";
+ private static final String STREAMS_ID = "FileBufferPersistReader";
private static final Logger LOGGER = LoggerFactory.getLogger(FileBufferPersistReader.class);
- protected volatile Queue<StreamsDatum> persistQueue;
+ private volatile Queue<StreamsDatum> persistQueue;
private ObjectMapper mapper;
@@ -109,7 +108,7 @@ public class FileBufferPersistReader implements StreamsPersistReader, Serializab
}
StreamsResultSet current;
- current = new StreamsResultSet(Queues.newConcurrentLinkedQueue(persistQueue));
+ current = new StreamsResultSet(new ConcurrentLinkedQueue<>(persistQueue));
persistQueue.clear();
return current;
@@ -164,7 +163,7 @@ public class FileBufferPersistReader implements StreamsPersistReader, Serializab
LOGGER.error(ex.getMessage());
}
- Preconditions.checkNotNull(queueFile);
+ Objects.requireNonNull(queueFile);
this.persistQueue = new ConcurrentLinkedQueue<>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistWriter.java b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistWriter.java
index 76dfafc..a4348f6 100644
--- a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistWriter.java
+++ b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistWriter.java
@@ -26,15 +26,15 @@ import org.apache.streams.util.GuidUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
import com.squareup.tape.QueueFile;
-
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -43,11 +43,11 @@ import java.util.concurrent.ConcurrentLinkedQueue;
*/
public class FileBufferPersistWriter implements StreamsPersistWriter, Serializable {
- public static final String STREAMS_ID = "FileBufferPersistWriter";
+ private static final String STREAMS_ID = "FileBufferPersistWriter";
private static final Logger LOGGER = LoggerFactory.getLogger(FileBufferPersistWriter.class);
- protected volatile Queue<StreamsDatum> persistQueue;
+ private volatile Queue<StreamsDatum> persistQueue;
private ObjectMapper mapper;
@@ -74,9 +74,9 @@ public class FileBufferPersistWriter implements StreamsPersistWriter, Serializab
String key = entry.getId() != null ? entry.getId() : GuidUtils.generateGuid("filewriter");
- Preconditions.checkArgument(!Strings.isNullOrEmpty(key));
+ Preconditions.checkArgument(StringUtils.isNotBlank(key));
Preconditions.checkArgument(entry.getDocument() instanceof String);
- Preconditions.checkArgument(!Strings.isNullOrEmpty((String) entry.getDocument()));
+ Preconditions.checkArgument(StringUtils.isNotBlank((String) entry.getDocument()));
byte[] item = ((String)entry.getDocument()).getBytes();
try {
@@ -102,7 +102,7 @@ public class FileBufferPersistWriter implements StreamsPersistWriter, Serializab
Preconditions.checkArgument(file.exists());
Preconditions.checkArgument(file.canWrite());
- Preconditions.checkNotNull(queueFile);
+ Objects.requireNonNull(queueFile);
this.persistQueue = new ConcurrentLinkedQueue<>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
index 7c3e019..de8419d 100644
--- a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
+++ b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/FileBufferPersistIT.java
@@ -18,9 +18,6 @@
package org.apache.streams.filebuffer.test;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Queues;
import org.apache.streams.console.ConsolePersistReader;
import org.apache.streams.console.ConsolePersistWriter;
import org.apache.streams.core.StreamBuilder;
@@ -30,19 +27,18 @@ import org.apache.streams.filebuffer.FileBufferConfiguration;
import org.apache.streams.filebuffer.FileBufferPersistReader;
import org.apache.streams.filebuffer.FileBufferPersistWriter;
import org.apache.streams.local.builders.LocalStreamBuilder;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
-import static org.mockito.Mockito.mock;
-
import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.Map;
-
-import static org.mockito.Mockito.mock;
+import java.util.concurrent.ConcurrentLinkedQueue;
/**
* Tests {@link org.apache.streams.filebuffer.FileBufferPersistWriter }
@@ -52,12 +48,12 @@ public class FileBufferPersistIT {
private FileBufferConfiguration testConfiguration;
- ConsolePersistReader reader = Mockito.mock(ConsolePersistReader.class);
- ConsolePersistWriter writer = Mockito.mock(ConsolePersistWriter.class);
+ private ConsolePersistReader reader = Mockito.mock(ConsolePersistReader.class);
+ private ConsolePersistWriter writer = Mockito.mock(ConsolePersistWriter.class);
- StreamsDatum testDatum1 = new StreamsDatum("{\"datum\":1}");
- StreamsDatum testDatum2 = new StreamsDatum("{\"datum\":2}");
- StreamsDatum testDatum3 = new StreamsDatum("{\"datum\":3}");
+ private StreamsDatum testDatum1 = new StreamsDatum("{\"datum\":1}");
+ private StreamsDatum testDatum2 = new StreamsDatum("{\"datum\":2}");
+ private StreamsDatum testDatum3 = new StreamsDatum("{\"datum\":3}");
@Before
public void prepareTest() {
@@ -71,8 +67,8 @@ public class FileBufferPersistIT {
PowerMockito.when(reader.readCurrent())
.thenReturn(
- new StreamsResultSet(Queues.newConcurrentLinkedQueue(
- Lists.newArrayList(testDatum1, testDatum2, testDatum3)))
+ new StreamsResultSet(new ConcurrentLinkedQueue<>(
+ Arrays.asList(testDatum1, testDatum2, testDatum3)))
).thenReturn(null);
}
@@ -81,7 +77,7 @@ public class FileBufferPersistIT {
assert(testConfiguration != null);
- Map<String, Object> streamConfig = Maps.newHashMap();
+ Map<String, Object> streamConfig = new HashMap<>();
streamConfig.put(LocalStreamBuilder.TIMEOUT_KEY, 1000);
StreamBuilder builder = new LocalStreamBuilder(1, streamConfig);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
index 728e368..391e445 100644
--- a/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
+++ b/streams-contrib/streams-persist-filebuffer/src/test/java/org/apache/streams/filebuffer/test/TestFileBufferPersist.java
@@ -23,6 +23,7 @@ import org.apache.streams.core.StreamsResultSet;
import org.apache.streams.filebuffer.FileBufferConfiguration;
import org.apache.streams.filebuffer.FileBufferPersistReader;
import org.apache.streams.filebuffer.FileBufferPersistWriter;
+
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHelper.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHelper.java
index fee2f6f..614dc95 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHelper.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHelper.java
@@ -18,24 +18,25 @@
package org.apache.streams.graph;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
/**
* Interface for methods allowing persistance to a graph database wrapped with
* a rest API. CypherGraphHelper is a good example, for neo4j.
*/
public interface GraphHelper {
- public ObjectNode getVertexRequest(String streamsId);
+ ObjectNode getVertexRequest(String streamsId);
- public ObjectNode getVertexRequest(Long vertexId);
+ ObjectNode getVertexRequest(Long vertexId);
- public ObjectNode createVertexRequest(ActivityObject activityObject);
+ ObjectNode createVertexRequest(ActivityObject activityObject);
- public ObjectNode mergeVertexRequest(ActivityObject activityObject);
+ ObjectNode mergeVertexRequest(ActivityObject activityObject);
- public ObjectNode createEdgeRequest(Activity activity, ActivityObject source, ActivityObject destination);
+ ObjectNode createEdgeRequest(Activity activity, ActivityObject source, ActivityObject destination);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
index 847328a..5b2dec6 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
@@ -34,9 +34,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
@@ -45,7 +43,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -60,10 +60,10 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
private static final Logger LOGGER = LoggerFactory.getLogger(GraphHttpPersistWriter.class);
private static final long MAX_WRITE_LATENCY = 1000;
- protected GraphHttpConfiguration configuration;
+ private GraphHttpConfiguration configuration;
- protected QueryGraphHelper queryGraphHelper;
- protected HttpGraphHelper httpGraphHelper;
+ private QueryGraphHelper queryGraphHelper;
+ private HttpGraphHelper httpGraphHelper;
private static ObjectMapper mapper;
@@ -73,7 +73,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
* GraphHttpPersistWriter constructor - resolve GraphHttpConfiguration from JVM 'graph'.
*/
public GraphHttpPersistWriter() {
- this(new ComponentConfigurator<GraphHttpConfiguration>(GraphHttpConfiguration.class).detectConfiguration(StreamsConfigurator.config.getConfig("graph")));
+ this(new ComponentConfigurator<>(GraphHttpConfiguration.class).detectConfiguration(StreamsConfigurator.config.getConfig("graph")));
}
/**
@@ -94,7 +94,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
protected ObjectNode preparePayload(StreamsDatum entry) throws Exception {
Activity activity = null;
- ActivityObject activityObject = null;
+ ActivityObject activityObject;
Object document = entry.getDocument();
if (document instanceof Activity) {
@@ -137,7 +137,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
// always add vertices first
- List<String> labels = Lists.newArrayList("streams");
+ List<String> labels = Collections.singletonList("streams");
if ( activityObject != null ) {
if ( activityObject.getObjectType() != null ) {
@@ -151,20 +151,17 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
ActivityObject actor = activity.getActor();
Provider provider = activity.getProvider();
- if ( provider != null
- && !Strings.isNullOrEmpty(provider.getId()) ) {
+ if (provider != null && StringUtils.isNotBlank(provider.getId())) {
labels.add(provider.getId());
}
- if (actor != null
- && !Strings.isNullOrEmpty(actor.getId())) {
+ if (actor != null && StringUtils.isNotBlank(actor.getId())) {
if (actor.getObjectType() != null) {
labels.add(actor.getObjectType());
}
statements.add(httpGraphHelper.createHttpRequest(queryGraphHelper.mergeVertexRequest(actor)));
}
- if (activityObject != null
- && !Strings.isNullOrEmpty(activityObject.getId())) {
+ if (activityObject != null && StringUtils.isNotBlank(activityObject.getId())) {
if (activityObject.getObjectType() != null) {
labels.add(activityObject.getObjectType());
}
@@ -173,7 +170,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
// then add edge
- if (!Strings.isNullOrEmpty(activity.getVerb())) {
+ if (StringUtils.isNotBlank(activity.getVerb())) {
statements.add(httpGraphHelper.createHttpRequest(queryGraphHelper.createEdgeRequest(activity)));
}
}
@@ -186,7 +183,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
@Override
protected ObjectNode executePost(HttpPost httpPost) {
- Preconditions.checkNotNull(httpPost);
+ Objects.requireNonNull(httpPost);
ObjectNode result = null;
@@ -239,8 +236,8 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
httpGraphHelper = new Neo4jHttpGraphHelper();
}
- Preconditions.checkNotNull(queryGraphHelper);
- Preconditions.checkNotNull(httpGraphHelper);
+ Objects.requireNonNull(queryGraphHelper);
+ Objects.requireNonNull(httpGraphHelper);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphVertexReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphVertexReader.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphVertexReader.java
index 7c6e341..9560083 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphVertexReader.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphVertexReader.java
@@ -33,11 +33,10 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.JsonNode;
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.List;
/**
@@ -58,7 +57,7 @@ public class GraphVertexReader extends SimpleHttpProvider implements StreamsPers
* GraphVertexReader constructor - resolve GraphReaderConfiguration from JVM 'graph'.
*/
public GraphVertexReader() {
- this(new ComponentConfigurator<GraphReaderConfiguration>(GraphReaderConfiguration.class).detectConfiguration(StreamsConfigurator.config.getConfig("graph")));
+ this(new ComponentConfigurator<>(GraphReaderConfiguration.class).detectConfiguration(StreamsConfigurator.config.getConfig("graph")));
}
/**
@@ -83,7 +82,7 @@ public class GraphVertexReader extends SimpleHttpProvider implements StreamsPers
* @return result
*/
public List<ObjectNode> parse(JsonNode jsonNode) {
- List<ObjectNode> results = Lists.newArrayList();
+ List<ObjectNode> results = new ArrayList<>();
ObjectNode root = (ObjectNode) jsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/HttpGraphHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/HttpGraphHelper.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/HttpGraphHelper.java
index 17b8840..ca1f4e4 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/HttpGraphHelper.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/HttpGraphHelper.java
@@ -19,7 +19,6 @@
package org.apache.streams.graph;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.javatuples.Pair;
import java.util.Map;
@@ -30,6 +29,6 @@ import java.util.Map;
*/
public interface HttpGraphHelper {
- public ObjectNode createHttpRequest(Pair<String, Map<String, Object>> queryPlusParameters);
+ ObjectNode createHttpRequest(Pair<String, Map<String, Object>> queryPlusParameters);
}
[7/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
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());
}
[4/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookProvider.java
index be59bd7..a665023 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookProvider.java
@@ -36,7 +36,6 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.typesafe.config.ConfigRenderOptions;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,7 +85,7 @@ public abstract class FacebookProvider implements StreamsProvider {
* FacebookProvider constructor - uses supplied FacebookConfiguration.
*/
public FacebookProvider(FacebookConfiguration configuration) {
- this.configuration = (FacebookConfiguration) SerializationUtil.cloneBySerialization(configuration);
+ this.configuration = SerializationUtil.cloneBySerialization(configuration);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserInformationProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserInformationProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserInformationProvider.java
index 3939f23..4c14f75 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserInformationProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserInformationProvider.java
@@ -31,7 +31,14 @@ import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.MoreExecutors;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigRenderOptions;
-
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.Friend;
+import facebook4j.Paging;
+import facebook4j.ResponseList;
+import facebook4j.User;
+import facebook4j.conf.ConfigurationBuilder;
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -51,15 +58,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import facebook4j.Facebook;
-import facebook4j.FacebookException;
-import facebook4j.FacebookFactory;
-import facebook4j.Friend;
-import facebook4j.Paging;
-import facebook4j.ResponseList;
-import facebook4j.User;
-import facebook4j.conf.ConfigurationBuilder;
-
public class FacebookUserInformationProvider implements StreamsProvider, Serializable {
@@ -73,7 +71,7 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
private FacebookUserInformationConfiguration facebookUserInformationConfiguration;
private Class klass;
- protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<StreamsDatum>();
+ protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<>();
public FacebookUserInformationConfiguration getConfig() {
return facebookUserInformationConfiguration;
@@ -95,7 +93,7 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
private static ExecutorService newFixedThreadPoolWithQueueSize(int numThreads, int queueSize) {
return new ThreadPoolExecutor(numThreads, numThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
/**
@@ -108,7 +106,6 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
facebookUserInformationConfiguration = mapper.readValue(config.root().render(ConfigRenderOptions.concise()), FacebookUserInformationConfiguration.class);
} catch (IOException ex) {
ex.printStackTrace();
- return;
}
}
@@ -166,9 +163,7 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
providerQueue.add(
new StreamsDatum(json, DateTime.now())
);
- } catch (JsonProcessingException ex) {
- ex.printStackTrace();
- } catch (FacebookException ex) {
+ } catch (JsonProcessingException | FacebookException ex) {
ex.printStackTrace();
}
@@ -247,8 +242,7 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
this.start = start;
this.end = end;
readCurrent();
- StreamsResultSet result = (StreamsResultSet)providerQueue.iterator();
- return result;
+ return (StreamsResultSet)providerQueue.iterator();
}
@Override
@@ -287,8 +281,8 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
Preconditions.checkNotNull(facebookUserInformationConfiguration.getOauth().getUserAccessToken());
Preconditions.checkNotNull(facebookUserInformationConfiguration.getInfo());
- List<String> ids = new ArrayList<String>();
- List<String[]> idsBatches = new ArrayList<String[]>();
+ List<String> ids = new ArrayList<>();
+ List<String[]> idsBatches = new ArrayList<>();
for (String s : facebookUserInformationConfiguration.getInfo()) {
if (s != null) {
@@ -298,7 +292,7 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
// add the batch
idsBatches.add(ids.toArray(new String[ids.size()]));
// reset the Ids
- ids = new ArrayList<String>();
+ ids = new ArrayList<>();
}
}
@@ -322,9 +316,8 @@ public class FacebookUserInformationProvider implements StreamsProvider, Seriali
.setClientVersion("v1.0");
FacebookFactory ff = new FacebookFactory(cb.build());
- Facebook facebook = ff.getInstance();
- return facebook;
+ return ff.getInstance();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserstreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserstreamProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserstreamProvider.java
index b292d30..d198e43 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserstreamProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/FacebookUserstreamProvider.java
@@ -29,14 +29,19 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.util.ComponentUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigRenderOptions;
-
+import facebook4j.Facebook;
+import facebook4j.FacebookException;
+import facebook4j.FacebookFactory;
+import facebook4j.Post;
+import facebook4j.ResponseList;
+import facebook4j.conf.ConfigurationBuilder;
+import facebook4j.json.DataObjectFactory;
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -47,6 +52,7 @@ import java.io.Serializable;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
@@ -58,17 +64,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import facebook4j.Facebook;
-import facebook4j.FacebookException;
-import facebook4j.FacebookFactory;
-import facebook4j.Post;
-import facebook4j.ResponseList;
-import facebook4j.conf.ConfigurationBuilder;
-import facebook4j.json.DataObjectFactory;
-
public class FacebookUserstreamProvider implements StreamsProvider, Serializable {
- public static final String STREAMS_ID = "FacebookUserstreamProvider";
+ private static final String STREAMS_ID = "FacebookUserstreamProvider";
private static final Logger LOGGER = LoggerFactory.getLogger(FacebookUserstreamProvider.class);
@@ -80,7 +78,7 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
private Class klass;
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
- protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<StreamsDatum>();
+ protected volatile Queue<StreamsDatum> providerQueue = new LinkedBlockingQueue<>();
public FacebookUserstreamConfiguration getConfig() {
return configuration;
@@ -105,7 +103,7 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
private static ExecutorService newFixedThreadPoolWithQueueSize(int numThreads, int queueSize) {
return new ThreadPoolExecutor(numThreads, numThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
/**
@@ -118,7 +116,6 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
facebookUserInformationConfiguration = mapper.readValue(config.root().render(ConfigRenderOptions.concise()), FacebookUserInformationConfiguration.class);
} catch (IOException ex) {
ex.printStackTrace();
- return;
}
}
@@ -214,8 +211,7 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
this.start = start;
this.end = end;
readCurrent();
- StreamsResultSet result = (StreamsResultSet) providerQueue.iterator();
- return result;
+ return (StreamsResultSet) providerQueue.iterator();
}
@Override
@@ -247,11 +243,11 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
executor = MoreExecutors.listeningDecorator(newFixedThreadPoolWithQueueSize(5, 20));
- Preconditions.checkNotNull(providerQueue);
- Preconditions.checkNotNull(this.klass);
- Preconditions.checkNotNull(configuration.getOauth().getAppId());
- Preconditions.checkNotNull(configuration.getOauth().getAppSecret());
- Preconditions.checkNotNull(configuration.getOauth().getUserAccessToken());
+ Objects.requireNonNull(providerQueue);
+ Objects.requireNonNull(this.klass);
+ Objects.requireNonNull(configuration.getOauth().getAppId());
+ Objects.requireNonNull(configuration.getOauth().getAppSecret());
+ Objects.requireNonNull(configuration.getOauth().getUserAccessToken());
client = getFacebookClient();
@@ -259,8 +255,8 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
&&
configuration.getInfo().size() > 0 ) {
- List<String> ids = new ArrayList<String>();
- List<String[]> idsBatches = new ArrayList<String[]>();
+ List<String> ids = new ArrayList<>();
+ List<String[]> idsBatches = new ArrayList<>();
for (String s : configuration.getInfo()) {
if (s != null) {
@@ -270,7 +266,7 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
// add the batch
idsBatches.add(ids.toArray(new String[ids.size()]));
// reset the Ids
- ids = new ArrayList<String>();
+ ids = new ArrayList<>();
}
}
@@ -288,9 +284,8 @@ public class FacebookUserstreamProvider implements StreamsProvider, Serializable
.setJSONStoreEnabled(true);
FacebookFactory ff = new FacebookFactory(cb.build());
- Facebook facebook = ff.getInstance();
- return facebook;
+ return ff.getInstance();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageDataCollector.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageDataCollector.java
index 68d8f06..5f697f7 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageDataCollector.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageDataCollector.java
@@ -26,16 +26,14 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
-
+import facebook4j.FacebookException;
+import facebook4j.Page;
+import facebook4j.json.DataObjectFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.BlockingQueue;
-import facebook4j.FacebookException;
-import facebook4j.Page;
-import facebook4j.json.DataObjectFactory;
-
/**
* Collects the page data from public Facebook pages.
*/
@@ -64,8 +62,7 @@ public class FacebookPageDataCollector extends FacebookDataCollector {
while (attempt < MAX_ATTEMPTS) {
++attempt;
try {
- Page page = getNextFacebookClient().getPage(pageId);
- return page;
+ return getNextFacebookClient().getPage(pageId);
} catch (FacebookException fe) {
LOGGER.error("Facebook returned an exception : {}", fe);
LOGGER.error("Facebook returned an exception while trying to get feed for page, {} : {}", pageId, fe.getMessage());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageProvider.java
index e7bbcfa..ff57839 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/page/FacebookPageProvider.java
@@ -36,7 +36,6 @@ import com.google.common.util.concurrent.Uninterruptibles;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +43,6 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -122,9 +120,7 @@ public class FacebookPageProvider extends FacebookProvider {
provider.startStream();
do {
Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS);
- Iterator<StreamsDatum> iterator = provider.readCurrent().iterator();
- while (iterator.hasNext()) {
- StreamsDatum datum = iterator.next();
+ for (StreamsDatum datum : provider.readCurrent()) {
String json;
try {
json = MAPPER.writeValueAsString(datum.getDocument());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedDataCollector.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedDataCollector.java
index f509170..5cf8b3e 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedDataCollector.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedDataCollector.java
@@ -25,18 +25,16 @@ import org.apache.streams.facebook.provider.FacebookDataCollector;
import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.BlockingQueue;
-
import facebook4j.FacebookException;
import facebook4j.Paging;
import facebook4j.Post;
import facebook4j.Reading;
import facebook4j.ResponseList;
import facebook4j.json.DataObjectFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.BlockingQueue;
/**
* Collects the page feed data from public Facebook pages.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedProvider.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedProvider.java
index 5d977e0..3e7d8d9 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedProvider.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/provider/pagefeed/FacebookPageFeedProvider.java
@@ -35,7 +35,6 @@ import com.google.common.util.concurrent.Uninterruptibles;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +42,6 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
-import java.util.Iterator;
import java.util.concurrent.TimeUnit;
/**
@@ -98,9 +96,7 @@ public class FacebookPageFeedProvider extends FacebookProvider {
provider.startStream();
do {
Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS);
- Iterator<StreamsDatum> iterator = provider.readCurrent().iterator();
- while (iterator.hasNext()) {
- StreamsDatum datum = iterator.next();
+ for (StreamsDatum datum : provider.readCurrent()) {
String json;
try {
json = MAPPER.writeValueAsString(datum.getDocument());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 93ac199..a81719c 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
@@ -22,6 +22,7 @@ import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.facebook.Cover;
import org.apache.streams.facebook.Datum;
+import org.apache.streams.facebook.Like;
import org.apache.streams.facebook.Location;
import org.apache.streams.facebook.Page;
import org.apache.streams.facebook.Place;
@@ -37,9 +38,7 @@ import org.apache.streams.pojo.json.Provider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
import com.google.common.collect.Lists;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +46,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* FacebookActivityUtil helps convert facebook data to activity formats.
@@ -93,9 +93,9 @@ public class FacebookActivityUtil {
}
/**
- * Builds out the {@link org.apache.streams.pojo.json.ActivityObject} from the given {@link Post}.
+ * Builds out the {@link ActivityObject} from the given {@link Post}.
* @param post
- * @return {@link org.apache.streams.pojo.json.ActivityObject}
+ * @return {@link ActivityObject}
*/
public static ActivityObject buildObject(Post post) {
ActivityObject activityObject = new ActivityObject();
@@ -122,7 +122,7 @@ public class FacebookActivityUtil {
}
/**
- * Gets the common facebook {@link org.apache.streams.pojo.json.Provider} object.
+ * Gets the common facebook {@link Provider} object.
* @return a provider object representing Facebook
*/
public static Provider getProvider() {
@@ -134,17 +134,15 @@ public class FacebookActivityUtil {
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the Page.
+ * Builds the activity {@link ActivityObject} actor from the Page.
* @param page the object to use as the source
* @return a valid Actor populated from the Page
*/
public static ActivityObject buildActor(Page page) {
ActivityObject actor = new ActivityObject();
actor.setId(formatId(
- Optional.fromNullable(
- page.getId())
- .or(Optional.of(page.getId().toString()))
- .orNull()
+ Optional.ofNullable(Optional.ofNullable(page.getId())
+ .orElseGet(Optional.of(page.getId())::get)).orElse(null)
));
actor.setDisplayName(page.getName());
@@ -169,19 +167,17 @@ public class FacebookActivityUtil {
}
/**
- * Builds an {@link org.apache.streams.pojo.json.ActivityObject} object from the {@link Post}.
+ * Builds an {@link ActivityObject} object from the {@link Post}.
* @param post post
- * @return {@link org.apache.streams.pojo.json.ActivityObject}
+ * @return {@link ActivityObject}
*/
public static ActivityObject buildActor(Post post) {
ActivityObject actor = new ActivityObject();
try {
actor.setId(formatId(
- Optional.fromNullable(
- post.getFrom().getId())
- .or(Optional.of(post.getFrom().getId()))
- .orNull()
+ Optional.ofNullable(Optional.ofNullable(post.getFrom().getId())
+ .orElseGet(Optional.of(post.getFrom().getId())::get)).orElse(null)
));
actor.setDisplayName(post.getFrom().getName());
@@ -215,7 +211,7 @@ public class FacebookActivityUtil {
}
/**
- * Fills out the extensions attribute of the passed in {@link org.apache.streams.pojo.json.Activity}
+ * Fills out the extensions attribute of the passed in {@link Activity}
* @param activity
* @param post
*/
@@ -226,7 +222,7 @@ public class FacebookActivityUtil {
if(post.getLikes() != null && post.getLikes().size() > 0) {
Map<String, Object> likes = new HashMap<>();
- org.apache.streams.facebook.Like like = post.getLikes().get(0);
+ Like like = post.getLikes().get(0);
if(like.getAdditionalProperties().containsKey("data")) {
extensions.put("likes", likes);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/SimplePageTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/SimplePageTest.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/SimplePageTest.java
index 36d3b16..b7009e2 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/SimplePageTest.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/SimplePageTest.java
@@ -28,7 +28,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.node.ObjectNode;
-
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -87,7 +86,7 @@ public class SimplePageTest {
public void TestDeserialization() throws Exception {
Page page = mapper.convertValue(event, Page.class);
- Activity activity = null;
+ Activity activity;
activity = facebookPageActivitySerializer.deserialize(page);
assertThat(activity, is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/TestPage.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/TestPage.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/TestPage.java
index 620f31f..893509e 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/TestPage.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/TestPage.java
@@ -17,13 +17,13 @@
*/
package org.apache.streams.facebook.test;
-import java.net.URL;
-import java.util.Date;
-
import facebook4j.Cover;
import facebook4j.Page;
import facebook4j.Place;
+import java.net.URL;
+import java.util.Date;
+
public class TestPage implements Page {
private String id;
private String name;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivityActorSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivityActorSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivityActorSerDeIT.java
index 7b50535..4133b43 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivityActorSerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivityActorSerDeIT.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
index 8112d59..7ad9388 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookActivitySerDeIT.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
index 2a2ef6e..d90ea3c 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPageSerDeIT.java
@@ -24,7 +24,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
index 3ae6749..6ed1d55 100644
--- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
+++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/data/FacebookPostSerDeIT.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.BoundedInputStream;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 f78f2e5..b280eae 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
@@ -21,7 +21,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.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +43,7 @@ public class FacebookPageProviderIT {
args[0] = configfile;
args[1] = outfile;
- Thread testThread = new Thread((Runnable) () -> {
+ Thread testThread = new Thread(() -> {
try {
FacebookPageProvider.main(args);
} catch( Exception e ) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailImapProviderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailImapProviderTask.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailImapProviderTask.java
index a0aac9b..168aed7 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailImapProviderTask.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailImapProviderTask.java
@@ -23,7 +23,6 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.util.ComponentUtils;
import com.googlecode.gmail4j.GmailMessage;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 acc745d..3758a5f 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
@@ -41,7 +41,6 @@ import com.googlecode.gmail4j.javamail.JavaMailGmailMessage;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPMessage;
import com.sun.mail.imap.IMAPSSLStore;
-
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -49,7 +48,6 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
-
import javax.mail.internet.MimeMultipart;
/**
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailProvider.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailProvider.java
index e11628f..bd21acc 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailProvider.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailProvider.java
@@ -25,7 +25,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProvider;
import org.apache.streams.core.StreamsResultSet;
-import com.google.common.base.Preconditions;
import com.google.gmail.GMailConfiguration;
import com.googlecode.gmail4j.GmailClient;
import com.googlecode.gmail4j.GmailConnection;
@@ -33,13 +32,13 @@ import com.googlecode.gmail4j.http.HttpGmailConnection;
import com.googlecode.gmail4j.javamail.ImapGmailClient;
import com.googlecode.gmail4j.javamail.ImapGmailConnection;
import com.googlecode.gmail4j.rss.RssGmailClient;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.math.BigInteger;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
@@ -89,7 +88,7 @@ public class GMailProvider implements StreamsProvider, Serializable {
private static ExecutorService newFixedThreadPoolWithQueueSize(int nThreads, int queueSize) {
return new ThreadPoolExecutor(nThreads, nThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
public GMailProvider() {
@@ -162,10 +161,10 @@ public class GMailProvider implements StreamsProvider, Serializable {
@Override
public void prepare(Object configurationObject) {
- Preconditions.checkNotNull(this.klass);
+ Objects.requireNonNull(this.klass);
- Preconditions.checkNotNull(config.getUserName());
- Preconditions.checkNotNull(config.getPassword());
+ Objects.requireNonNull(config.getUserName());
+ Objects.requireNonNull(config.getPassword());
rssClient = new RssGmailClient();
GmailConnection rssConnection = new HttpGmailConnection(config.getUserName(), config.getPassword().toCharArray());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gmail/src/test/java/com/google/gmail/test/GMailMessageSerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/test/java/com/google/gmail/test/GMailMessageSerDeTest.java b/streams-contrib/streams-provider-google/google-gmail/src/test/java/com/google/gmail/test/GMailMessageSerDeTest.java
index 2da9e82..3a611f7 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/test/java/com/google/gmail/test/GMailMessageSerDeTest.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/test/java/com/google/gmail/test/GMailMessageSerDeTest.java
@@ -20,7 +20,6 @@ package com.google.gmail.test;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 fe4d5da..ae9da2a 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/processor/GooglePlusTypeConverter.java
@@ -30,7 +30,6 @@ import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GPlusEventClassifier;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,6 @@ public class GooglePlusTypeConverter implements StreamsProcessor {
private StreamsJacksonMapper mapper;
private Queue<Person> inQueue;
private Queue<StreamsDatum> outQueue;
- private GooglePlusActivityUtil googlePlusActivityUtil;
private int count = 0;
public GooglePlusTypeConverter() {}
@@ -82,10 +80,10 @@ public class GooglePlusTypeConverter implements StreamsProcessor {
if (item instanceof Person) {
activity = new Activity();
- googlePlusActivityUtil.updateActivity((Person)item, activity);
+ GooglePlusActivityUtil.updateActivity((Person)item, activity);
} else if (item instanceof com.google.api.services.plus.model.Activity) {
activity = new Activity();
- googlePlusActivityUtil.updateActivity((com.google.api.services.plus.model.Activity)item, activity);
+ GooglePlusActivityUtil.updateActivity((com.google.api.services.plus.model.Activity)item, activity);
}
if (activity != null) {
@@ -122,7 +120,6 @@ public class GooglePlusTypeConverter implements StreamsProcessor {
@Override
public void prepare(Object configurationObject) {
- googlePlusActivityUtil = new GooglePlusActivityUtil();
mapper = StreamsJacksonMapper.getInstance();
SimpleModule simpleModule = new SimpleModule();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/AbstractGPlusProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/AbstractGPlusProvider.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/AbstractGPlusProvider.java
index e08c571..d9c7dd7 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/AbstractGPlusProvider.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/AbstractGPlusProvider.java
@@ -29,20 +29,17 @@ import org.apache.streams.util.ComponentUtils;
import org.apache.streams.util.api.requests.backoff.BackOffStrategy;
import org.apache.streams.util.api.requests.backoff.impl.ExponentialBackOffStrategy;
-import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.plus.Plus;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.gson.Gson;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,6 +53,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executors;
@@ -88,11 +86,9 @@ public abstract class AbstractGPlusProvider implements StreamsProvider {
private ListeningExecutorService executor;
private BlockingQueue<StreamsDatum> datumQueue;
- private BlockingQueue<Runnable> runnables;
private AtomicBoolean isComplete;
private boolean previousPullWasEmpty;
- protected GoogleClientSecrets clientSecrets;
protected GoogleCredential credential;
protected Plus plus;
@@ -108,9 +104,9 @@ public abstract class AbstractGPlusProvider implements StreamsProvider {
@Override
public void prepare(Object configurationObject) {
- Preconditions.checkNotNull(config.getOauth().getPathToP12KeyFile());
- Preconditions.checkNotNull(config.getOauth().getAppName());
- Preconditions.checkNotNull(config.getOauth().getServiceAccountEmailAddress());
+ Objects.requireNonNull(config.getOauth().getPathToP12KeyFile());
+ Objects.requireNonNull(config.getOauth().getAppName());
+ Objects.requireNonNull(config.getOauth().getServiceAccountEmailAddress());
try {
this.plus = createPlusClient();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusActivitySerializer.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusActivitySerializer.java
index 20f5002..eda55d2 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusActivitySerializer.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusActivitySerializer.java
@@ -22,7 +22,6 @@ import org.apache.streams.data.ActivitySerializer;
import org.apache.streams.pojo.json.Activity;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
-
import org.apache.commons.lang.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusDataCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusDataCollector.java
index edbc663..351e5be 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusDataCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusDataCollector.java
@@ -22,7 +22,6 @@ import org.apache.streams.util.api.requests.backoff.BackOffException;
import org.apache.streams.util.api.requests.backoff.BackOffStrategy;
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
index 5585bfc..31d8b5c 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityCollector.java
@@ -23,7 +23,6 @@ import org.apache.streams.google.gplus.configuration.UserInfo;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.util.api.requests.backoff.BackOffStrategy;
-import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,7 +34,6 @@ import com.google.api.services.plus.Plus;
import com.google.api.services.plus.model.Activity;
import com.google.api.services.plus.model.ActivityFeed;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
index 3da3468..e0df58d 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserDataCollector.java
@@ -30,7 +30,6 @@ import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.plus.Plus;
import com.google.api.services.plus.model.Person;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +72,7 @@ public class GPlusUserDataCollector extends GPlusDataCollector {
protected void queueUserHistory() {
try {
- boolean tryAgain = false;
+ boolean tryAgain;
int attempts = 0;
com.google.api.services.plus.model.Person person = null;
do {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 79f1815..7468de4 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
@@ -27,7 +27,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 d143419..8c5ade5 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
@@ -30,7 +30,6 @@ 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;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 f70335b..b7b4e24 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,10 +27,8 @@ 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;
@@ -62,7 +60,7 @@ public class GPlusPersonDeserializer extends JsonDeserializer<Person> {
Person person = new Person();
try {
- person.setCircledByCount((Integer) ((IntNode) node.get("circledByCount")).numberValue());
+ person.setCircledByCount((Integer) (node.get("circledByCount")).numberValue());
person.setDisplayName(node.get("displayName").asText());
person.setEtag(node.get("etag").asText());
person.setGender(node.get("gender").asText());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 1293d18..c980b98 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
@@ -29,9 +29,7 @@ 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.base.Optional;
import com.google.common.collect.Lists;
-
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +38,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* 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.
@@ -49,8 +48,8 @@ public class GooglePlusActivityUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(GooglePlusActivityUtil.class);
/**
- * Given a {@link com.google.api.services.plus.model.Person} object and an
- * {@link org.apache.streams.pojo.json.Activity} object, fill out the appropriate details.
+ * Given a {@link Person} object and an
+ * {@link Activity} object, fill out the appropriate details.
*
* @param item Person
* @param activity Activity
@@ -60,17 +59,14 @@ public class GooglePlusActivityUtil {
activity.setActor(buildActor(item));
activity.setVerb("update");
- activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- item.getId())
- .orNull()));
+ activity.setId(formatId(activity.getVerb(), Optional.ofNullable(item.getId()).orElse(null)));
activity.setProvider(getProvider());
}
/**
- * Given a {@link List} of {@link com.google.api.services.plus.model.Comment} objects and an
- * {@link org.apache.streams.pojo.json.Activity}, update that Activity to contain all comments
+ * Given a {@link List} of {@link Comment} objects and an
+ * {@link Activity}, update that Activity to contain all comments
*
* @param comments input List of Comment
* @param activity output Activity
@@ -86,7 +82,7 @@ public class GooglePlusActivityUtil {
/**
* Given a Google Plus {@link com.google.api.services.plus.model.Activity},
- * convert that into an Activity streams formatted {@link org.apache.streams.pojo.json.Activity}
+ * convert that into an Activity streams formatted {@link Activity}
*
* @param gPlusActivity input c.g.a.s.p.m.Activity
* @param activity output o.a.s.p.j.Activity
@@ -102,10 +98,7 @@ public class GooglePlusActivityUtil {
activity.setContent(gPlusActivity.getObject().getContent());
}
- activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- gPlusActivity.getId())
- .orNull()));
+ activity.setId(formatId(activity.getVerb(), Optional.ofNullable(gPlusActivity.getId()).orElse(null)));
DateTime published = new DateTime(String.valueOf(gPlusActivity.getPublished()));
activity.setPublished(published);
@@ -115,8 +108,8 @@ public class GooglePlusActivityUtil {
}
/**
- * Adds a single {@link com.google.api.services.plus.model.Comment} to the Object.Attachments
- * section of the passed in {@link org.apache.streams.pojo.json.Activity}
+ * Adds a single {@link Comment} to the Object.Attachments
+ * section of the passed in {@link Activity}
*
* @param activity output o.a.s.p.j.Activity
* @param comment input c.g.a.s.p.m.Comment
@@ -139,7 +132,7 @@ public class GooglePlusActivityUtil {
activity.setObject(new ActivityObject());
}
if (activity.getObject().getAttachments() == null) {
- activity.getObject().setAttachments(new ArrayList<ActivityObject>());
+ activity.getObject().setAttachments(new ArrayList<>());
}
activity.getObject().getAttachments().add(obj);
@@ -147,7 +140,7 @@ public class GooglePlusActivityUtil {
/**
* Add in necessary extensions from the passed in {@link com.google.api.services.plus.model.Activity} to the
- * {@link org.apache.streams.pojo.json.Activity} object
+ * {@link Activity} object
*
* @param activity output o.a.s.p.j.Activity
* @param gPlusActivity input c.g.a.s.p.m.Activity
@@ -180,7 +173,7 @@ public class GooglePlusActivityUtil {
}
/**
- * Set the {@link org.apache.streams.pojo.json.ActivityObject} field given the passed in
+ * Set the {@link ActivityObject} field given the passed in
* {@link com.google.api.services.plus.model.Activity.PlusObject}
*
* @param activity output $.object as o.a.s.p.j.ActivityObject
@@ -193,7 +186,7 @@ public class GooglePlusActivityUtil {
activityObject.setContent(plusObject.getContent());
activityObject.setObjectType(plusObject.getObjectType());
- java.util.List<ActivityObject> attachmentsList = new ArrayList<>();
+ List<ActivityObject> attachmentsList = new ArrayList<>();
for (com.google.api.services.plus.model.Activity.PlusObject.Attachments attachments : plusObject.getAttachments()) {
ActivityObject attach = new ActivityObject();
@@ -221,7 +214,7 @@ public class GooglePlusActivityUtil {
/**
* Given a {@link com.google.api.services.plus.model.Activity.Actor} object, return a fully fleshed
- * out {@link org.apache.streams.pojo.json.ActivityObject} actor
+ * out {@link ActivityObject} actor
*
* @param gPlusActor input c.g.a.s.p.m.Activity.Actor
* @return {@link ActivityObject} output $.actor as o.a.s.p.j.ActivityObject
@@ -245,7 +238,7 @@ public class GooglePlusActivityUtil {
}
/**
- * Extract the relevant details from the passed in {@link com.google.api.services.plus.model.Person} object and build
+ * Extract the relevant details from the passed in {@link Person} object and build
* an actor with them
*
* @param person Person
@@ -282,7 +275,7 @@ public class GooglePlusActivityUtil {
}
/**
- * Gets the common googleplus {@link org.apache.streams.pojo.json.Provider} object
+ * Gets the common googleplus {@link Provider} object
* @return a provider object representing GooglePlus
*/
public static Provider getProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 28b4db8..c3e026f 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
@@ -29,7 +29,6 @@ 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;
-
import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.slf4j.Logger;
@@ -102,7 +101,7 @@ public class GooglePlusCommentSerDeIT {
assertEquals(comments.size(), 3);
- googlePlusActivityUtil.updateActivity(comments, activity);
+ GooglePlusActivityUtil.updateActivity(comments, activity);
assertNotNull(activity);
assertNotNull(activity.getObject());
assertEquals(activity.getObject().getAttachments().size(), 3);
@@ -115,7 +114,7 @@ public class GooglePlusCommentSerDeIT {
public void testEmptyComments() {
Activity activity = new Activity();
- googlePlusActivityUtil.updateActivity(new ArrayList<Comment>(), activity);
+ GooglePlusActivityUtil.updateActivity(new ArrayList<>(), activity);
assertNull(activity.getObject());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
index be54aa1..ab5f8cb 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.api.services.plus.model.Person;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
-
import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.junit.Test;
@@ -81,7 +80,7 @@ public class GooglePlusPersonSerDeIT {
Person person = objectMapper.readValue(line, Person.class);
- googlePlusActivityUtil.updateActivity(person, activity);
+ GooglePlusActivityUtil.updateActivity(person, activity);
LOGGER.info("activity: {}", activity);
assertNotNull(activity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
index d86001c..7b1d71d 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
-
import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusTypeConverterTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusTypeConverterTest.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusTypeConverterTest.java
index c27351c..ebdeac6 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusTypeConverterTest.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusTypeConverterTest.java
@@ -30,7 +30,6 @@ import com.google.api.services.plus.model.Person;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
import com.google.gplus.serializer.util.GPlusPersonDeserializer;
import com.google.gplus.serializer.util.GooglePlusActivityUtil;
-
import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestAbstractGPlusProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestAbstractGPlusProvider.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestAbstractGPlusProvider.java
index 4cae4c0..b3590c4 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestAbstractGPlusProvider.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestAbstractGPlusProvider.java
@@ -28,11 +28,10 @@ import org.apache.streams.util.api.requests.backoff.BackOffStrategy;
import com.carrotsearch.randomizedtesting.RandomizedTest;
import com.carrotsearch.randomizedtesting.annotations.Repeat;
import com.google.api.services.plus.Plus;
-import com.google.common.collect.Lists;
-
import org.junit.Test;
import java.io.IOException;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -50,7 +49,7 @@ public class TestAbstractGPlusProvider extends RandomizedTest {
@Repeat(iterations = 3)
public void testDataCollectorRunsPerUser() {
int numUsers = randomIntBetween(1, 1000);
- List<UserInfo> userList = Lists.newLinkedList();
+ List<UserInfo> userList = new LinkedList<>();
for (int i = 0; i < numUsers; ++i) {
userList.add(new UserInfo());
}
@@ -71,14 +70,11 @@ public class TestAbstractGPlusProvider extends RandomizedTest {
@Override
protected Runnable getDataCollector(BackOffStrategy strategy, BlockingQueue<StreamsDatum> queue, Plus plus, UserInfo userInfo) {
final BlockingQueue<StreamsDatum> q = queue;
- return new Runnable() {
- @Override
- public void run() {
- try {
- q.put(new StreamsDatum(null));
- } catch (InterruptedException ie) {
- fail("Test was interrupted");
- }
+ return () -> {
+ try {
+ q.put(new StreamsDatum(null));
+ } catch (InterruptedException ie) {
+ fail("Test was interrupted");
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserActivityCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserActivityCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserActivityCollector.java
index 3620346..ffff3e0 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserActivityCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserActivityCollector.java
@@ -33,15 +33,14 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.api.services.plus.Plus;
import com.google.api.services.plus.model.Activity;
import com.google.api.services.plus.model.ActivityFeed;
-import com.google.common.collect.Lists;
import com.google.gplus.serializer.util.GPlusActivityDeserializer;
-
import org.joda.time.DateTime;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.IOException;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -142,12 +141,7 @@ public class TestGPlusUserActivityCollector extends RandomizedTest {
private Plus createMockPlus(final int numBefore, final int numAfter, final int numInRange, final DateTime after, final DateTime before) {
Plus plus = mock(Plus.class);
final Plus.Activities activities = createMockPlusActivities(numBefore, numAfter, numInRange, after, before);
- doAnswer(new Answer() {
- @Override
- public Plus.Activities answer(InvocationOnMock invocationOnMock) throws Throwable {
- return activities;
- }
- }).when(plus).activities();
+ doAnswer(invocationOnMock -> activities).when(plus).activities();
return plus;
}
@@ -194,14 +188,14 @@ public class TestGPlusUserActivityCollector extends RandomizedTest {
DateTime before,
boolean page) {
ActivityFeed feed = new ActivityFeed();
- List<Activity> list = Lists.newLinkedList();
+ List<Activity> list = new LinkedList<>();
for (int i = 0; i < numAfter; ++i) {
DateTime published = before.plus(randomIntBetween(0, Integer.MAX_VALUE));
Activity activity = createActivityWithPublishedDate(published);
list.add(activity);
}
for (int i = 0; i < numInRange; ++i) {
- DateTime published = null;
+ DateTime published;
if ((before == null && after == null) || before == null) {
published = DateTime.now(); // no date range or end time date range so just make the time now.
} else if (after == null) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserDataCollector.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserDataCollector.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserDataCollector.java
index 4460fb1..8d30314 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserDataCollector.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/provider/TestGPlusUserDataCollector.java
@@ -27,7 +27,6 @@ import org.apache.streams.util.api.requests.backoff.impl.ConstantTimeBackOffStra
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.plus.Plus;
import com.google.api.services.plus.model.Person;
-
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -95,24 +94,14 @@ public class TestGPlusUserDataCollector {
private Plus createMockPlus(final int succedOnTry, final Throwable throwable) {
Plus plus = mock(Plus.class);
- doAnswer(new Answer() {
- @Override
- public Plus.People answer(InvocationOnMock invocationOnMock) throws Throwable {
- return createMockPeople(succedOnTry, throwable);
- }
- }).when(plus).people();
+ doAnswer(invocationOnMock -> createMockPeople(succedOnTry, throwable)).when(plus).people();
return plus;
}
private Plus.People createMockPeople(final int succedOnTry, final Throwable throwable) {
Plus.People people = mock(Plus.People.class);
try {
- when(people.get(anyString())).thenAnswer(new Answer<Plus.People.Get>() {
- @Override
- public Plus.People.Get answer(InvocationOnMock invocationOnMock) throws Throwable {
- return createMockGetNoError(succedOnTry, throwable);
- }
- });
+ when(people.get(anyString())).thenAnswer(invocationOnMock -> createMockGetNoError(succedOnTry, throwable));
} catch (IOException ioe) {
fail("No Excpetion should have been thrown while creating mocks");
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
index 025af18..1e2a714 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/provider/InstagramAbstractProvider.java
@@ -42,12 +42,8 @@ import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java
index c9bbd85..40c3b37 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/InstagramMediaFeedDataConverter.java
@@ -22,11 +22,11 @@ import org.apache.streams.data.ActivityConverter;
import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import org.jinstagram.entity.users.feed.MediaFeedData;
import java.io.Serializable;
+import java.util.Collections;
import java.util.List;
import static org.apache.streams.instagram.serializer.util.InstagramActivityUtil.updateActivity;
@@ -66,7 +66,7 @@ public class InstagramMediaFeedDataConverter implements ActivityConverter<MediaF
updateActivity(item, activity);
- return Lists.newArrayList(activity);
+ return Collections.singletonList(activity);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 dd181de..49e3c01 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
@@ -28,8 +28,6 @@ import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
import org.jinstagram.entity.comments.CommentData;
import org.jinstagram.entity.common.Comments;
import org.jinstagram.entity.common.ImageData;
@@ -44,9 +42,11 @@ 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;
/**
* Provides utilities for working with Activity objects within the context of Instagram.
@@ -70,9 +70,7 @@ public class InstagramActivityUtil {
}
activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- item.getId())
- .orNull()));
+ Optional.ofNullable(item.getId()).orElse(null)));
activity.setProvider(getProvider());
activity.setUrl(item.getLink());
@@ -298,7 +296,7 @@ public class InstagramActivityUtil {
}
/**
- * Gets the common instagram {@link org.apache.streams.pojo.json.Provider} object.
+ * Gets the common instagram {@link Provider} object.
* @return a provider object representing Instagram
*/
public static Provider getProvider() {
@@ -314,7 +312,7 @@ 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(Lists.asList("id:instagram", idparts));
+ return Joiner.on(":").join(Arrays.asList("id:instagram", idparts));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverProvider.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverProvider.java
index 2ab6ee4..f7b9d88 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverProvider.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverProvider.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.google.common.util.concurrent.Uninterruptibles;
import com.typesafe.config.Config;
@@ -45,8 +44,8 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -63,7 +62,7 @@ public class MoreoverProvider implements StreamsProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(MoreoverProvider.class);
- protected volatile Queue<StreamsDatum> providerQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+ protected volatile Queue<StreamsDatum> providerQueue = new ConcurrentLinkedQueue<>();
private List<MoreoverKeyData> keys;
@@ -77,7 +76,7 @@ public class MoreoverProvider implements StreamsProvider {
*/
public MoreoverProvider(MoreoverConfiguration moreoverConfiguration) {
this.config = moreoverConfiguration;
- this.keys = Lists.newArrayList();
+ this.keys = new ArrayList<>();
for ( MoreoverKeyData apiKey : config.getApiKeys()) {
this.keys.add(apiKey);
}
@@ -104,7 +103,7 @@ public class MoreoverProvider implements StreamsProvider {
LOGGER.debug("readCurrent: {}", providerQueue.size());
- Collection<StreamsDatum> currentIterator = Lists.newArrayList();
+ Collection<StreamsDatum> currentIterator = new ArrayList<>();
Iterators.addAll(currentIterator, providerQueue.iterator());
StreamsResultSet current = new StreamsResultSet(Queues.newConcurrentLinkedQueue(currentIterator));
@@ -180,9 +179,7 @@ public class MoreoverProvider implements StreamsProvider {
provider.startStream();
do {
Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS);
- Iterator<StreamsDatum> iterator = provider.readCurrent().iterator();
- while (iterator.hasNext()) {
- StreamsDatum datum = iterator.next();
+ for (StreamsDatum datum : provider.readCurrent()) {
String json;
try {
json = mapper.writeValueAsString(datum.getDocument());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverResult.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverResult.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverResult.java
index 589e647..c3a78bb 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverResult.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverResult.java
@@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
import com.fasterxml.jackson.dataformat.xml.XmlFactory;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.google.common.collect.Lists;
import com.moreover.api.Article;
import com.moreover.api.ArticlesResponse;
import org.slf4j.Logger;
@@ -36,6 +35,7 @@ import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -43,7 +43,6 @@ public class MoreoverResult implements Iterable<StreamsDatum> {
private static final Logger logger = LoggerFactory.getLogger(MoreoverResult.class);
- private ObjectMapper mapper;
private XmlMapper xmlMapper;
private String xmlString;
@@ -57,7 +56,7 @@ public class MoreoverResult implements Iterable<StreamsDatum> {
private BigInteger maxSequencedId = BigInteger.ZERO;
protected ArticlesResponse response;
- protected List<StreamsDatum> list = Lists.newArrayList();
+ protected List<StreamsDatum> list = new ArrayList<>();
protected MoreoverResult(String clientId, String xmlString, long start, long end) {
this.xmlString = xmlString;
@@ -92,7 +91,7 @@ public class MoreoverResult implements Iterable<StreamsDatum> {
DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
Boolean.FALSE);
- mapper = new ObjectMapper();
+ ObjectMapper mapper = new ObjectMapper();
mapper
.configure(
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
index 2d93656..0422f7f 100644
--- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
+++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/moreover/test/MoreoverXmlActivitySerializerIT.java
@@ -23,7 +23,6 @@ import org.apache.streams.moreover.MoreoverTestUtil;
import org.apache.streams.moreover.MoreoverXmlActivitySerializer;
import org.apache.streams.pojo.json.Activity;
-import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
@@ -32,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.nio.charset.Charset;
+import java.util.Collections;
import java.util.List;
/**
@@ -49,7 +49,7 @@ public class MoreoverXmlActivitySerializerIT {
@Test
public void loadData() throws Exception {
- List<Activity> activities = serializer.deserializeAll(Lists.newArrayList(xml));
+ List<Activity> activities = serializer.deserializeAll(Collections.singletonList(xml));
for (Activity activity : activities) {
MoreoverTestUtil.validate(activity);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/processor/RssTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/processor/RssTypeConverter.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/processor/RssTypeConverter.java
index d3c763a..5bc4cf2 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/processor/RssTypeConverter.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/processor/RssTypeConverter.java
@@ -24,13 +24,13 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.rss.serializer.SyndEntryActivitySerializer;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -53,7 +53,7 @@ public class RssTypeConverter implements StreamsProcessor {
@Override
public List<StreamsDatum> process(StreamsDatum datum) {
- List<StreamsDatum> datums = Lists.newLinkedList();
+ List<StreamsDatum> datums = new LinkedList<>();
if (datum.getDocument() instanceof ObjectNode) {
Activity activity = this.serializer.deserialize((ObjectNode) datum.getDocument());
datums.add(new StreamsDatum(activity, activity.getId(), DateTime.now().withZone(DateTimeZone.UTC)));
[3/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/RssStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/RssStreamProvider.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/RssStreamProvider.java
index 9de1863..81b4f79 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/RssStreamProvider.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/RssStreamProvider.java
@@ -25,7 +25,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProvider;
import org.apache.streams.core.StreamsResultSet;
import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.rss.FeedDetails;
import org.apache.streams.rss.RssStreamConfiguration;
import org.apache.streams.rss.provider.perpetual.RssFeedScheduler;
import org.apache.streams.util.ComponentUtils;
@@ -47,11 +46,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import java.util.Queue;
-import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
@@ -65,7 +60,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public class RssStreamProvider implements StreamsProvider {
- public static final String STREAMS_ID = "RssStreamProvider";
+ private static final String STREAMS_ID = "RssStreamProvider";
private static final Logger LOGGER = LoggerFactory.getLogger(RssStreamProvider.class);
@@ -142,7 +137,7 @@ public class RssStreamProvider implements StreamsProvider {
@Override
public void prepare(Object configurationObject) {
- this.executor = new ThreadPoolExecutor(1, 4, 15L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+ this.executor = new ThreadPoolExecutor(1, 4, 15L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
this.dataQueue = new LinkedBlockingQueue<>();
this.scheduler = getScheduler(this.dataQueue);
this.isComplete = new AtomicBoolean(false);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/perpetual/RssFeedScheduler.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/perpetual/RssFeedScheduler.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/perpetual/RssFeedScheduler.java
index e4bfd35..975749f 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/perpetual/RssFeedScheduler.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/provider/perpetual/RssFeedScheduler.java
@@ -22,10 +22,10 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.rss.FeedDetails;
import org.apache.streams.rss.provider.RssStreamProviderTask;
-import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
@@ -64,7 +64,7 @@ public class RssFeedScheduler implements Runnable {
this.feedDetailsList = feedDetailsList;
this.peroid = peroid;
this.keepRunning = new AtomicBoolean(true);
- this.lastScheduled = Maps.newHashMap();
+ this.lastScheduled = new HashMap<>();
this.dataQueue = dataQueue;
this.complete = new AtomicBoolean(false);
}
@@ -116,7 +116,7 @@ public class RssFeedScheduler implements Runnable {
}
if (currentTime - lastTime > pollInterval) {
this.service.execute(new RssStreamProviderTask(this.dataQueue, detail.getUrl()));
- this.LOGGER.trace("Scheduled data collection on rss feed, {}", detail.getUrl());
+ LOGGER.trace("Scheduled data collection on rss feed, {}", detail.getUrl());
this.lastScheduled.put(detail.getUrl(), currentTime);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
index 1e3aedd..45d5d96 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
@@ -38,6 +37,7 @@ import org.slf4j.LoggerFactory;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNode> {
@@ -84,7 +84,7 @@ public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNod
* @return Activity
*/
public Activity deserializeWithRomeExtension(ObjectNode entry, boolean withExtension) {
- Preconditions.checkNotNull(entry);
+ Objects.requireNonNull(entry);
Activity activity = new Activity();
Provider provider = buildProvider(entry);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntrySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntrySerializer.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntrySerializer.java
index 6868bfc..63920e7 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntrySerializer.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntrySerializer.java
@@ -21,7 +21,6 @@ package org.apache.streams.rss.serializer;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import com.sun.syndication.feed.module.Module;
import com.sun.syndication.feed.rss.Category;
import com.sun.syndication.feed.rss.Content;
@@ -37,7 +36,6 @@ import org.joda.time.format.ISODateTimeFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -250,9 +248,7 @@ public class SyndEntrySerializer {
}
private void serializeLinks(ObjectNode root, JsonNodeFactory factory, List links) {
- if (links == null || links.size() == 0) {
- return;
- } else if (links.get(0) instanceof String) {
+ if (links.get(0) instanceof String) {
serializeListOfStrings(links, "links", root, factory);
} else if (links.get(0) instanceof SyndLinkImpl) {
ArrayNode linksArray = factory.arrayNode();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTest.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTest.java
index 08a58d3..102c3db 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTest.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/RssStreamProviderTest.java
@@ -24,13 +24,13 @@ import org.apache.streams.rss.RssStreamConfiguration;
import org.apache.streams.rss.provider.perpetual.RssFeedScheduler;
import com.carrotsearch.randomizedtesting.RandomizedTest;
-import com.google.common.collect.Queues;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
/**
* Unit tests for {@link org.apache.streams.rss.provider.RssStreamProvider}
@@ -44,7 +44,7 @@ public class RssStreamProviderTest extends RandomizedTest {
RssStreamProvider provider = null;
try {
final CountDownLatch latch = new CountDownLatch(1);
- BlockingQueue<StreamsDatum> datums = Queues.newLinkedBlockingQueue();
+ BlockingQueue<StreamsDatum> datums = new LinkedBlockingQueue<>();
provider = new RssStreamProvider(new RssStreamConfiguration()) {
@Override
protected RssFeedScheduler getScheduler(BlockingQueue<StreamsDatum> queue) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/perpetual/RssFeedSchedulerTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/perpetual/RssFeedSchedulerTest.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/perpetual/RssFeedSchedulerTest.java
index 830f0e7..779c2ab 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/perpetual/RssFeedSchedulerTest.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/provider/perpetual/RssFeedSchedulerTest.java
@@ -18,16 +18,13 @@
package org.apache.streams.rss.provider.perpetual;
-import org.apache.streams.core.StreamsDatum;
import org.apache.streams.rss.FeedDetails;
import org.apache.streams.rss.provider.RssStreamProviderTask;
-import com.google.common.collect.Lists;
import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -51,15 +48,12 @@ public class RssFeedSchedulerTest {
public void testScheduleFeeds() {
ExecutorService mockService = mock(ExecutorService.class);
final List<String> queuedTasks = new ArrayList<>(5);
- doAnswer(new Answer() {
- @Override
- public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
- queuedTasks.add(((RssStreamProviderTask) invocationOnMock.getArguments()[0]).getRssFeed());
- return null;
- }
+ doAnswer(invocationOnMock -> {
+ queuedTasks.add(((RssStreamProviderTask) invocationOnMock.getArguments()[0]).getRssFeed());
+ return null;
}).when(mockService).execute(any(Runnable.class));
- RssFeedScheduler scheduler = new RssFeedScheduler(mockService, createFeedList(), new LinkedBlockingQueue<StreamsDatum>(), 1);
+ RssFeedScheduler scheduler = new RssFeedScheduler(mockService, createFeedList(), new LinkedBlockingQueue<>(), 1);
scheduler.scheduleFeeds();
assertEquals("Expected 2 Feeds to be scheduled", 2, queuedTasks.size());
assertEquals("Expected Feed 1 to be queued first", "1", queuedTasks.get(0));
@@ -78,7 +72,7 @@ public class RssFeedSchedulerTest {
}
private List<FeedDetails> createFeedList() {
- List<FeedDetails> list = Lists.newLinkedList();
+ List<FeedDetails> list = new LinkedList<>();
FeedDetails fd = new FeedDetails();
fd.setPollIntervalMillis(1L);
fd.setUrl("1");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
index ccd8b74..c3f10f9 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/RssStreamProviderIT.java
@@ -26,7 +26,6 @@ import org.apache.streams.rss.provider.RssStreamProvider;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -43,13 +42,11 @@ import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.util.ArrayList;
import java.util.List;
import static org.hamcrest.number.OrderingComparison.greaterThan;
-/**
- * Created by sblackmon on 2/5/14.
- */
public class RssStreamProviderIT {
private static final Logger LOGGER = LoggerFactory.getLogger(RssStreamProviderIT.class);
@@ -67,7 +64,7 @@ public class RssStreamProviderIT {
BufferedReader br = new BufferedReader(isr);
RssStreamConfiguration configuration = new RssStreamConfiguration();
- List<FeedDetails> feedArray = Lists.newArrayList();
+ List<FeedDetails> feedArray = new ArrayList<>();
try {
while (br.ready()) {
String line = br.readLine();
@@ -77,7 +74,6 @@ public class RssStreamProviderIT {
}
configuration.setFeeds(feedArray);
} catch ( Exception ex ) {
- System.out.println(ex);
ex.printStackTrace();
Assert.fail();
}
@@ -101,7 +97,7 @@ public class RssStreamProviderIT {
assert (config.canRead());
assert (config.isFile());
- RssStreamProvider.main(Lists.newArrayList(configfile, outfile).toArray(new String[2]));
+ RssStreamProvider.main(new String[]{configfile, outfile});
File out = new File(outfile);
assert (out.exists());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
index 01f1999..37ff7cf 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
@@ -27,7 +27,6 @@ import org.apache.streams.rss.serializer.SyndEntryActivitySerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.Test;
@@ -35,7 +34,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URL;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.Scanner;
import static org.junit.Assert.assertEquals;
@@ -54,8 +55,8 @@ public class SyndEntryActivitySerializerIT {
@Test
public void testJsonData() throws Exception {
Scanner scanner = new Scanner(this.getClass().getResourceAsStream("/TestSyndEntryJson.txt"));
- List<Activity> activities = Lists.newLinkedList();
- List<ObjectNode> objects = Lists.newLinkedList();
+ List<Activity> activities = new LinkedList<>();
+ List<ObjectNode> objects = new LinkedList<>();
SyndEntryActivitySerializer serializer = new SyndEntryActivitySerializer();
@@ -125,7 +126,8 @@ public class SyndEntryActivitySerializerIT {
}
public void testUrl(String expectedUri, String expectedLink, Activity activity) {
- assertTrue((expectedUri == activity.getUrl() || expectedLink == activity.getUrl()));
- assertTrue((expectedUri == activity.getObject().getUrl() || expectedLink == activity.getObject().getUrl()));
+ assertTrue((Objects.equals(expectedUri, activity.getUrl()) || Objects.equals(expectedLink, activity.getUrl())));
+ assertTrue((Objects.equals(expectedUri, activity.getObject().getUrl()) ||
+ Objects.equals(expectedLink, activity.getObject().getUrl())));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/provider/SysomosClient.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/provider/SysomosClient.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/provider/SysomosClient.java
index 6b59d1e..95d8ad9 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/provider/SysomosClient.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/provider/SysomosClient.java
@@ -19,11 +19,7 @@
package org.apache.streams.sysomos.provider;
-import org.apache.streams.sysomos.data.HeartbeatInfo;
-import org.apache.streams.sysomos.util.SysomosUtils;
-
import java.net.HttpURLConnection;
-import java.net.URL;
/**
* Wrapper for the Sysomos API.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
index f555e8d..915a8cf 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterDocumentClassifier.java
@@ -30,12 +30,12 @@ import org.apache.streams.twitter.pojo.UserstreamEvent;
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 java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import static org.apache.streams.twitter.converter.TwitterDateTimeFormat.TWITTER_FORMAT;
@@ -47,9 +47,9 @@ public class TwitterDocumentClassifier implements DocumentClassifier {
@Override
public List<Class> detectClasses(Object document) {
- Preconditions.checkNotNull(document);
+ Objects.requireNonNull(document);
- ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TWITTER_FORMAT));
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance(Collections.singletonList(TWITTER_FORMAT));
ObjectNode objectNode;
try {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserActivityConverter.java
index b8ce79b..9ca354f 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserActivityConverter.java
@@ -23,16 +23,17 @@ import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.twitter.pojo.User;
-import com.google.common.collect.Lists;
import org.apache.commons.lang.NotImplementedException;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import static org.apache.streams.twitter.converter.util.TwitterActivityUtil.updateActivity;
public class TwitterJsonUserActivityConverter implements ActivityConverter<User> {
- public static Class requiredClass = User.class;
+ private static Class requiredClass = User.class;
@Override
public Class requiredClass() {
@@ -67,12 +68,12 @@ public class TwitterJsonUserActivityConverter implements ActivityConverter<User>
Activity activity = new Activity();
updateActivity(user, activity);
- return Lists.newArrayList(activity);
+ return Collections.singletonList(activity);
}
@Override
public List<Activity> toActivityList(List<User> serializedList) {
- List<Activity> result = Lists.newArrayList();
+ List<Activity> result = new ArrayList<>();
for ( User item : serializedList ) {
try {
List<Activity> activities = toActivityList(item);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/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 e0e2e80..3344d05 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
@@ -32,15 +32,14 @@ import org.apache.streams.twitter.pojo.Entities;
import org.apache.streams.twitter.pojo.Hashtag;
import org.apache.streams.twitter.pojo.Place;
import org.apache.streams.twitter.pojo.Retweet;
+import org.apache.streams.twitter.pojo.TargetObject;
import org.apache.streams.twitter.pojo.Tweet;
import org.apache.streams.twitter.pojo.User;
import org.apache.streams.twitter.pojo.UserMentions;
-import org.apache.streams.twitter.provider.TwitterErrorHandler;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
@@ -50,6 +49,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import static com.google.common.math.DoubleMath.mean;
@@ -71,13 +71,11 @@ public class TwitterActivityUtil {
public static void updateActivity(Tweet tweet, Activity activity) throws ActivityConversionException {
activity.setActor(buildActor(tweet));
activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- tweet.getIdStr())
- .or(Optional.of(tweet.getId().toString()))
- .orNull()));
+ Optional.ofNullable(Optional.ofNullable(tweet.getIdStr())
+ .orElseGet(Optional.of(tweet.getId().toString())::get)).orElse(null)));
if (tweet instanceof Retweet) {
- updateActivityContent(activity, ((Retweet) tweet).getRetweetedStatus(), "share");
+ updateActivityContent(activity, (tweet).getRetweetedStatus(), "share");
} else {
updateActivityContent(activity, tweet, "post");
}
@@ -127,7 +125,7 @@ public class TwitterActivityUtil {
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the tweet
+ * Builds the activity {@link ActivityObject} actor from the tweet
* @param tweet the object to use as the source
* @return a valid Actor populated from the Tweet
*/
@@ -139,17 +137,15 @@ public class TwitterActivityUtil {
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the User
+ * Builds the activity {@link ActivityObject} actor from the User
* @param user the object to use as the source
* @return a valid Actor populated from the Tweet
*/
public static ActivityObject buildActor(User user) {
ActivityObject actor = new ActivityObject();
actor.setId(formatId(
- Optional.fromNullable(
- user.getIdStr())
- .or(Optional.of(user.getId().toString()))
- .orNull()
+ Optional.ofNullable(Optional.ofNullable(user.getIdStr())
+ .orElseGet(Optional.of(user.getId().toString())::get)).orElse(null)
));
actor.setObjectType("page");
actor.setDisplayName(user.getName());
@@ -189,16 +185,14 @@ public class TwitterActivityUtil {
}
/**
- * Creates an {@link org.apache.streams.pojo.json.ActivityObject} for the tweet
+ * Creates an {@link ActivityObject} for the tweet
* @param tweet the object to use as the source
* @return a valid ActivityObject
*/
public static ActivityObject buildActivityObject(Tweet tweet) {
ActivityObject actObj = new ActivityObject();
- String id = Optional.fromNullable(
- tweet.getIdStr())
- .or(Optional.of(tweet.getId().toString()))
- .orNull();
+ String id = Optional.ofNullable(Optional.ofNullable(tweet.getIdStr())
+ .orElseGet(Optional.of(tweet.getId().toString())::get)).orElse(null);
if ( id != null ) {
actObj.setId(id);
}
@@ -261,7 +255,7 @@ public class TwitterActivityUtil {
}
/**
- * Builds the {@link org.apache.streams.twitter.pojo.TargetObject} from the tweet.
+ * Builds the {@link TargetObject} from the tweet.
* @param tweet the object to use as the source
* @return currently returns null for all activities
*/
@@ -278,17 +272,15 @@ public class TwitterActivityUtil {
Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
Map<String, Object> location = new HashMap<>();
location.put("id", formatId(
- Optional.fromNullable(
- tweet.getIdStr())
- .or(Optional.of(tweet.getId().toString()))
- .orNull()
+ Optional.ofNullable(Optional.ofNullable(tweet.getIdStr())
+ .orElseGet(Optional.of(tweet.getId().toString())::get)).orElse(null)
));
location.put("coordinates", boundingBoxCenter(tweet.getPlace()));
extensions.put("location", location);
}
/**
- * Gets the common twitter {@link org.apache.streams.pojo.json.Provider} object
+ * Gets the common twitter {@link Provider} object
* @return a provider object representing Twitter
*/
public static Provider getProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProviderTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProviderTask.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProviderTask.java
index ee800fa..764b3ee 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProviderTask.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProviderTask.java
@@ -33,6 +33,8 @@ import twitter4j.Twitter;
import twitter4j.TwitterException;
import twitter4j.TwitterObjectFactory;
+import java.util.Objects;
+
/**
* Retrieve friend or follower connections for a single user id.
*/
@@ -43,11 +45,11 @@ public class TwitterFollowingProviderTask implements Runnable {
private static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
protected TwitterFollowingProvider provider;
- protected Twitter client;
+ private Twitter client;
protected Long id;
- protected String screenName;
+ private String screenName;
- int count = 0;
+ private int count = 0;
/**
* TwitterFollowingProviderTask constructor.
@@ -81,7 +83,7 @@ public class TwitterFollowingProviderTask implements Runnable {
if ( id != null ) {
getFollowing(id);
- } else if ( screenName != null) {
+ } else {
getFollowing(screenName);
}
@@ -89,7 +91,7 @@ public class TwitterFollowingProviderTask implements Runnable {
}
- protected void getFollowing(Long id) {
+ private void getFollowing(Long id) {
Preconditions.checkArgument(
provider.getConfig().getEndpoint().equals("friends")
@@ -103,7 +105,7 @@ public class TwitterFollowingProviderTask implements Runnable {
}
}
- protected void getFollowing(String screenName) {
+ private void getFollowing(String screenName) {
twitter4j.User user = null;
try {
@@ -111,7 +113,7 @@ public class TwitterFollowingProviderTask implements Runnable {
} catch (TwitterException ex) {
LOGGER.error("Failure looking up " + id);
}
- Preconditions.checkNotNull(user);
+ Objects.requireNonNull(user);
getFollowing(user.getId());
}
@@ -134,12 +136,12 @@ public class TwitterFollowingProviderTask implements Runnable {
PagableResponseList<twitter4j.User> list = null;
if ( provider.getConfig().getEndpoint().equals("followers") ) {
- list = client.friendsFollowers().getFollowersList(id.longValue(), curser, provider.getConfig().getMaxItems().intValue());
+ list = client.friendsFollowers().getFollowersList(id, curser, provider.getConfig().getMaxItems().intValue());
} else if ( provider.getConfig().getEndpoint().equals("friends") ) {
- list = client.friendsFollowers().getFriendsList(id.longValue(), curser, provider.getConfig().getMaxItems().intValue());
+ list = client.friendsFollowers().getFriendsList(id, curser, provider.getConfig().getMaxItems().intValue());
}
- Preconditions.checkNotNull(list);
+ Objects.requireNonNull(list);
Preconditions.checkArgument(list.size() > 0);
for (twitter4j.User other : list) {
@@ -176,8 +178,6 @@ public class TwitterFollowingProviderTask implements Runnable {
break;
}
curser = list.getNextCursor();
- } catch (TwitterException twitterException) {
- keepTrying += TwitterErrorHandler.handleTwitterError(client, twitterException);
} catch (Exception ex) {
keepTrying += TwitterErrorHandler.handleTwitterError(client, ex);
}
@@ -194,12 +194,12 @@ public class TwitterFollowingProviderTask implements Runnable {
try {
twitter4j.IDs ids = null;
if ( provider.getConfig().getEndpoint().equals("followers") ) {
- ids = client.friendsFollowers().getFollowersIDs(id.longValue(), curser, provider.getConfig().getMaxItems().intValue());
+ ids = client.friendsFollowers().getFollowersIDs(id, curser, provider.getConfig().getMaxItems().intValue());
} else if ( provider.getConfig().getEndpoint().equals("friends") ) {
- ids = client.friendsFollowers().getFriendsIDs(id.longValue(), curser, provider.getConfig().getMaxItems().intValue());
+ ids = client.friendsFollowers().getFriendsIDs(id, curser, provider.getConfig().getMaxItems().intValue());
}
- Preconditions.checkNotNull(ids);
+ Objects.requireNonNull(ids);
Preconditions.checkArgument(ids.getIDs().length > 0);
for (long otherId : ids.getIDs()) {
@@ -216,7 +216,7 @@ public class TwitterFollowingProviderTask implements Runnable {
.withFollower(new User().withId(id));
}
- Preconditions.checkNotNull(follow);
+ Objects.requireNonNull(follow);
if ( count < provider.getConfig().getMaxItems()) {
ComponentUtils.offerUntilSuccess(new StreamsDatum(follow), provider.providerQueue);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamHelper.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamHelper.java
index a4562ef..2be77ac 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamHelper.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamHelper.java
@@ -24,7 +24,6 @@ import org.apache.streams.twitter.converter.TwitterDocumentClassifier;
import org.apache.streams.util.ComponentUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
import com.twitter.hbc.core.processor.StringDelimitedProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,7 +99,9 @@ public class TwitterStreamHelper extends StringDelimitedProcessor {
Class itemClass = TWITTER_DOCUMENT_CLASSIFIER.detectClasses(item).get(0);
Object document = mapper.readValue(item, itemClass);
StreamsDatum rawDatum = new StreamsDatum(document);
- return Lists.newArrayList(rawDatum);
+ List<StreamsDatum> streamsDatumList = new ArrayList<>();
+ streamsDatumList.add(rawDatum);
+ return streamsDatumList;
}
return new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
index 1895ee2..a37ec4d 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
@@ -35,8 +35,6 @@ import org.apache.streams.util.ComponentUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Queues;
import com.google.common.util.concurrent.Uninterruptibles;
import com.twitter.hbc.ClientBuilder;
import com.twitter.hbc.core.Constants;
@@ -67,25 +65,24 @@ import java.io.PrintStream;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Queue;
-import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * TwitterStreamProvider wraps a hosebird client and passes recieved documents
+ * TwitterStreamProvider wraps a hosebird client and passes received documents
* to subscribing components.
*/
public class TwitterStreamProvider implements StreamsProvider, Serializable, DatumStatusCountable {
- public static final String STREAMS_ID = "TwitterStreamProvider";
+ private static final String STREAMS_ID = "TwitterStreamProvider";
private static final Logger LOGGER = LoggerFactory.getLogger(TwitterStreamProvider.class);
@@ -127,9 +124,9 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
TwitterStreamConfiguration config = new ComponentConfigurator<>(TwitterStreamConfiguration.class).detectConfiguration(typesafe, "twitter");
TwitterStreamProvider provider = new TwitterStreamProvider(config);
- ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance(Collections.singletonList(TwitterDateTimeFormat.TWITTER_FORMAT));
- PrintStream outStream = null;
+ PrintStream outStream;
try {
outStream = new PrintStream(new BufferedOutputStream(new FileOutputStream(outfile)));
} catch (FileNotFoundException ex) {
@@ -140,9 +137,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
provider.startStream();
do {
Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS);
- Iterator<StreamsDatum> iterator = provider.readCurrent().iterator();
- while (iterator.hasNext()) {
- StreamsDatum datum = iterator.next();
+ for (StreamsDatum datum : provider.readCurrent()) {
String json;
try {
json = mapper.writeValueAsString(datum.getDocument());
@@ -157,7 +152,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
outStream.flush();
}
- public static final int MAX_BATCH = 1000;
+ private static final int MAX_BATCH = 1000;
private TwitterStreamConfiguration config;
@@ -169,13 +164,12 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
this.config = config;
}
- protected volatile Queue<Future<List<StreamsDatum>>> providerQueue;
+ private volatile Queue<Future<List<StreamsDatum>>> providerQueue;
- protected Hosts hosebirdHosts;
- protected Authentication auth;
+ private Authentication auth;
protected StreamingEndpoint endpoint;
- protected BasicClient client;
- protected AtomicBoolean running = new AtomicBoolean(false);
+ private BasicClient client;
+ private AtomicBoolean running = new AtomicBoolean(false);
protected TwitterStreamHelper processor = new TwitterStreamHelper(this);
private DatumStatusCounter countersCurrent = new DatumStatusCounter();
private DatumStatusCounter countersTotal = new DatumStatusCounter();
@@ -204,7 +198,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
StreamsResultSet current;
synchronized (this) {
- Queue<StreamsDatum> drain = Queues.newLinkedBlockingDeque();
+ Queue<StreamsDatum> drain = new LinkedBlockingDeque<>();
drainTo(drain);
current = new StreamsResultSet(drain);
current.setCounter(new DatumStatusCounter());
@@ -234,8 +228,9 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
@Override
public void prepare(Object configurationObject) {
- Preconditions.checkNotNull(config.getEndpoint());
+ Objects.requireNonNull(config.getEndpoint());
+ Hosts hosebirdHosts;
if (config.getEndpoint().equals("userstream") ) {
hosebirdHosts = new HttpHosts(Constants.USERSTREAM_HOST);
@@ -276,8 +271,8 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
if ( config.getBasicauth() != null ) {
- Preconditions.checkNotNull(config.getBasicauth().getUsername());
- Preconditions.checkNotNull(config.getBasicauth().getPassword());
+ Objects.requireNonNull(config.getBasicauth().getUsername());
+ Objects.requireNonNull(config.getBasicauth().getPassword());
auth = new BasicAuth(
config.getBasicauth().getUsername(),
@@ -286,10 +281,10 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
} else if ( config.getOauth() != null ) {
- Preconditions.checkNotNull(config.getOauth().getConsumerKey());
- Preconditions.checkNotNull(config.getOauth().getConsumerSecret());
- Preconditions.checkNotNull(config.getOauth().getAccessToken());
- Preconditions.checkNotNull(config.getOauth().getAccessTokenSecret());
+ Objects.requireNonNull(config.getOauth().getConsumerKey());
+ Objects.requireNonNull(config.getOauth().getConsumerSecret());
+ Objects.requireNonNull(config.getOauth().getAccessToken());
+ Objects.requireNonNull(config.getOauth().getAccessTokenSecret());
auth = new OAuth1(config.getOauth().getConsumerKey(),
config.getOauth().getConsumerSecret(),
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
index 3210f80..214d204 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterUserInformationProvider.java
@@ -35,7 +35,6 @@ import org.apache.streams.util.ComponentUtils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.Uninterruptibles;
@@ -47,7 +46,6 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import twitter4j.Twitter;
-import twitter4j.TwitterException;
import twitter4j.TwitterFactory;
import twitter4j.conf.ConfigurationBuilder;
import twitter4j.json.DataObjectFactory;
@@ -59,8 +57,10 @@ import java.io.PrintStream;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
@@ -78,9 +78,9 @@ import static java.util.concurrent.Executors.newSingleThreadExecutor;
*/
public class TwitterUserInformationProvider implements StreamsProvider, Serializable {
- public static final String STREAMS_ID = "TwitterUserInformationProvider";
+ private static final String STREAMS_ID = "TwitterUserInformationProvider";
- private static ObjectMapper MAPPER = new StreamsJacksonMapper(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
+ private static ObjectMapper MAPPER = new StreamsJacksonMapper(Collections.singletonList(TwitterDateTimeFormat.TWITTER_FORMAT));
private static final Logger LOGGER = LoggerFactory.getLogger(TwitterUserInformationProvider.class);
@@ -133,9 +133,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
provider.startStream();
do {
Uninterruptibles.sleepUninterruptibly(streamsConfiguration.getBatchFrequencyMs(), TimeUnit.MILLISECONDS);
- Iterator<StreamsDatum> iterator = provider.readCurrent().iterator();
- while (iterator.hasNext()) {
- StreamsDatum datum = iterator.next();
+ for (StreamsDatum datum : provider.readCurrent()) {
String json;
try {
json = MAPPER.writeValueAsString(datum.getDocument());
@@ -176,7 +174,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
public static ExecutorService newFixedThreadPoolWithQueueSize(int numThreads, int queueSize) {
return new ThreadPoolExecutor(numThreads, numThreads,
5000L, TimeUnit.MILLISECONDS,
- new ArrayBlockingQueue<Runnable>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
+ new ArrayBlockingQueue<>(queueSize, true), new ThreadPoolExecutor.CallerRunsPolicy());
}
/**
@@ -207,13 +205,13 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
config = (TwitterUserInformationConfiguration) configurationObject;
}
- Preconditions.checkNotNull(config);
- Preconditions.checkNotNull(config.getOauth());
- Preconditions.checkNotNull(config.getOauth().getConsumerKey());
- Preconditions.checkNotNull(config.getOauth().getConsumerSecret());
- Preconditions.checkNotNull(config.getOauth().getAccessToken());
- Preconditions.checkNotNull(config.getOauth().getAccessTokenSecret());
- Preconditions.checkNotNull(config.getInfo());
+ Objects.requireNonNull(config);
+ Objects.requireNonNull(config.getOauth());
+ Objects.requireNonNull(config.getOauth().getConsumerKey());
+ Objects.requireNonNull(config.getOauth().getConsumerSecret());
+ Objects.requireNonNull(config.getOauth().getAccessToken());
+ Objects.requireNonNull(config.getOauth().getAccessTokenSecret());
+ Objects.requireNonNull(config.getInfo());
try {
lock.writeLock().lock();
@@ -222,13 +220,13 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
lock.writeLock().unlock();
}
- Preconditions.checkNotNull(providerQueue);
+ Objects.requireNonNull(providerQueue);
- List<String> screenNames = new ArrayList<String>();
- List<String[]> screenNameBatches = new ArrayList<String[]>();
+ List<String> screenNames = new ArrayList<>();
+ List<String[]> screenNameBatches = new ArrayList<>();
- List<Long> ids = new ArrayList<Long>();
- List<Long[]> idsBatches = new ArrayList<Long[]>();
+ List<Long> ids = new ArrayList<>();
+ List<Long[]> idsBatches = new ArrayList<>();
for (String s : config.getInfo()) {
if (s != null) {
@@ -248,14 +246,14 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
// add the batch
idsBatches.add(ids.toArray(new Long[ids.size()]));
// reset the Ids
- ids = new ArrayList<Long>();
+ ids = new ArrayList<>();
}
if (screenNames.size() >= 100) {
// add the batch
screenNameBatches.add(screenNames.toArray(new String[ids.size()]));
// reset the Ids
- screenNames = new ArrayList<String>();
+ screenNames = new ArrayList<>();
}
}
}
@@ -275,7 +273,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
executor = MoreExecutors.listeningDecorator(newSingleThreadExecutor());
}
- Preconditions.checkNotNull(executor);
+ Objects.requireNonNull(executor);
this.idsBatches = idsBatches.iterator();
this.screenNameBatches = screenNameBatches.iterator();
@@ -284,7 +282,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
@Override
public void startStream() {
- Preconditions.checkNotNull(executor);
+ Objects.requireNonNull(executor);
Preconditions.checkArgument(idsBatches.hasNext() || screenNameBatches.hasNext());
@@ -327,8 +325,6 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
}
}
keepTrying = 10;
- } catch (TwitterException twitterException) {
- keepTrying += TwitterErrorHandler.handleTwitterError(client, twitterException);
} catch (Exception ex) {
keepTrying += TwitterErrorHandler.handleTwitterError(client, ex);
}
@@ -353,8 +349,6 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
}
}
keepTrying = 10;
- } catch (TwitterException twitterException) {
- keepTrying += TwitterErrorHandler.handleTwitterError(client, twitterException);
} catch (Exception ex) {
keepTrying += TwitterErrorHandler.handleTwitterError(client, ex);
}
@@ -383,7 +377,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
}
protected Queue<StreamsDatum> constructQueue() {
- return new LinkedBlockingQueue<StreamsDatum>();
+ return new LinkedBlockingQueue<>();
}
public StreamsResultSet readNew(BigInteger sequence) {
@@ -397,8 +391,7 @@ public class TwitterUserInformationProvider implements StreamsProvider, Serializ
this.start = start;
this.end = end;
readCurrent();
- StreamsResultSet result = (StreamsResultSet)providerQueue.iterator();
- return result;
+ return (StreamsResultSet)providerQueue.iterator();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/processor/YoutubeTypeConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/processor/YoutubeTypeConverter.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/processor/YoutubeTypeConverter.java
index 6e269e5..d8967d1 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/processor/YoutubeTypeConverter.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/processor/YoutubeTypeConverter.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.api.services.youtube.model.Channel;
import com.google.api.services.youtube.model.Video;
-import com.google.common.collect.Lists;
import com.youtube.serializer.YoutubeActivityUtil;
import com.youtube.serializer.YoutubeChannelDeserializer;
import com.youtube.serializer.YoutubeEventClassifier;
@@ -35,6 +34,7 @@ import org.apache.commons.lang.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
@@ -47,7 +47,6 @@ public class YoutubeTypeConverter implements StreamsProcessor {
private StreamsJacksonMapper mapper;
private Queue<Video> inQueue;
private Queue<StreamsDatum> outQueue;
- private YoutubeActivityUtil youtubeActivityUtil;
private int count = 0;
public YoutubeTypeConverter() {}
@@ -65,7 +64,7 @@ public class YoutubeTypeConverter implements StreamsProcessor {
Object item = streamsDatum.getDocument();
LOGGER.debug("{} processing {}", STREAMS_ID, item.getClass());
- Activity activity = null;
+ Activity activity;
if (item instanceof String) {
item = deserializeItem(item);
@@ -73,10 +72,10 @@ public class YoutubeTypeConverter implements StreamsProcessor {
if (item instanceof Video) {
activity = new Activity();
- youtubeActivityUtil.updateActivity((Video)item, activity, streamsDatum.getId());
+ YoutubeActivityUtil.updateActivity((Video)item, activity, streamsDatum.getId());
} else if (item instanceof Channel) {
activity = new Activity();
- this.youtubeActivityUtil.updateActivity((Channel)item, activity, null);
+ YoutubeActivityUtil.updateActivity((Channel)item, activity, null);
} else {
throw new NotImplementedException("Type conversion not implement for type : " + item.getClass().getName());
}
@@ -90,9 +89,11 @@ public class YoutubeTypeConverter implements StreamsProcessor {
}
if ( result != null ) {
- return Lists.newArrayList(result);
+ List<StreamsDatum> streamsDatumList = new ArrayList<>();
+ streamsDatumList.add(result);
+ return streamsDatumList;
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
@@ -113,7 +114,6 @@ public class YoutubeTypeConverter implements StreamsProcessor {
@Override
public void prepare(Object configurationObject) {
- youtubeActivityUtil = new YoutubeActivityUtil();
mapper = StreamsJacksonMapper.getInstance();
SimpleModule simpleModule = new SimpleModule();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/provider/YoutubeProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/provider/YoutubeProvider.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/provider/YoutubeProvider.java
index 1442f8b..401b836 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/provider/YoutubeProvider.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/provider/YoutubeProvider.java
@@ -38,8 +38,6 @@ import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.repackaged.com.google.common.base.Strings;
import com.google.api.services.youtube.YouTube;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
@@ -54,9 +52,11 @@ import java.io.IOException;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executors;
@@ -65,24 +65,24 @@ import java.util.concurrent.atomic.AtomicBoolean;
public abstract class YoutubeProvider implements StreamsProvider {
- public static final String STREAMS_ID = "YoutubeProvider";
+ private static final String STREAMS_ID = "YoutubeProvider";
private static final Logger LOGGER = LoggerFactory.getLogger(YoutubeProvider.class);
private static final int MAX_BATCH_SIZE = 1000;
// This OAuth 2.0 access scope allows for full read/write access to the
// authenticated user's account.
- private List<String> scopes = Lists.newArrayList("https://www.googleapis.com/auth/youtube");
+ private List<String> scopes = Collections.singletonList("https://www.googleapis.com/auth/youtube");
/**
* Define a global instance of the HTTP transport.
*/
- public static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
+ private static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
/**
* Define a global instance of the JSON factory.
*/
- public static final JsonFactory JSON_FACTORY = new JacksonFactory();
+ private static final JsonFactory JSON_FACTORY = new JacksonFactory();
private static final int DEFAULT_THREAD_POOL_SIZE = 5;
@@ -104,7 +104,7 @@ public abstract class YoutubeProvider implements StreamsProvider {
this.config = new ComponentConfigurator<>(YoutubeConfiguration.class)
.detectConfiguration(StreamsConfigurator.getConfig().getConfig("youtube"));
- Preconditions.checkNotNull(this.config.getApiKey());
+ Objects.requireNonNull(this.config.getApiKey());
}
/**
@@ -114,7 +114,7 @@ public abstract class YoutubeProvider implements StreamsProvider {
public YoutubeProvider(YoutubeConfiguration config) {
this.config = config;
- Preconditions.checkNotNull(this.config.getApiKey());
+ Objects.requireNonNull(this.config.getApiKey());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
index 4754353..0ca161f 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
@@ -26,13 +26,12 @@ import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
-import com.google.api.client.util.Maps;
+import com.google.api.services.youtube.YouTube;
import com.google.api.services.youtube.model.Channel;
import com.google.api.services.youtube.model.Thumbnail;
import com.google.api.services.youtube.model.ThumbnailDetails;
import com.google.api.services.youtube.model.Video;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@@ -40,14 +39,15 @@ import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
public class YoutubeActivityUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(YoutubeActivityUtil.class);
/**
- * Given a {@link com.google.api.services.youtube.YouTube.Videos} object and an
- * {@link org.apache.streams.pojo.json.Activity} object, fill out the appropriate details
+ * Given a {@link YouTube.Videos} object and an
+ * {@link Activity} object, fill out the appropriate details
*
* @param video Video
* @param activity Activity
@@ -57,10 +57,7 @@ public class YoutubeActivityUtil {
activity.setActor(buildActor(video, video.getSnippet().getChannelId()));
activity.setVerb("post");
- activity.setId(formatId(activity.getVerb(),
- Optional.fromNullable(
- video.getId())
- .orNull()));
+ activity.setId(formatId(activity.getVerb(), Optional.ofNullable(video.getId()).orElse(null)));
activity.setPublished(new DateTime(video.getSnippet().getPublishedAt().getValue()));
activity.setTitle(video.getSnippet().getTitle());
@@ -76,8 +73,8 @@ public class YoutubeActivityUtil {
/**
- * Given a {@link com.google.api.services.youtube.model.Channel} object and an
- * {@link org.apache.streams.pojo.json.Activity} object, fill out the appropriate details
+ * Given a {@link Channel} object and an
+ * {@link Activity} object, fill out the appropriate details
*
* @param channel Channel
* @param activity Activity
@@ -88,7 +85,7 @@ public class YoutubeActivityUtil {
activity.setProvider(getProvider());
activity.setVerb("post");
activity.setActor(createActorForChannel(channel));
- Map<String, Object> extensions = Maps.newHashMap();
+ Map<String, Object> extensions = new HashMap<>();
extensions.put("youtube", channel);
activity.setAdditionalProperty("extensions", extensions);
} catch (Throwable throwable) {
@@ -111,7 +108,7 @@ public class YoutubeActivityUtil {
image.setUrl(channel.getSnippet().getThumbnails().getHigh().getUrl());
actor.setImage(image);
actor.setUrl("https://youtube.com/user/" + channel.getId());
- Map<String, Object> actorExtensions = Maps.newHashMap();
+ Map<String, Object> actorExtensions = new HashMap<>();
actorExtensions.put("followers", channel.getStatistics().getSubscriberCount());
actorExtensions.put("posts", channel.getStatistics().getVideoCount());
actor.setAdditionalProperty("extensions", actorExtensions);
@@ -163,7 +160,7 @@ public class YoutubeActivityUtil {
}
/**
- * Build an {@link org.apache.streams.pojo.json.ActivityObject} actor given the video object
+ * Build an {@link ActivityObject} actor given the video object
* @param video Video
* @param id id
* @return Actor object
@@ -180,7 +177,7 @@ public class YoutubeActivityUtil {
}
/**
- * Gets the common youtube {@link org.apache.streams.pojo.json.Provider} object
+ * Gets the common youtube {@link Provider} object
* @return a provider object representing YouTube
*/
public static Provider getProvider() {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeChannelDeserializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeChannelDeserializer.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeChannelDeserializer.java
index ea9a49d..e28b4a1 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeChannelDeserializer.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeChannelDeserializer.java
@@ -20,7 +20,6 @@
package com.youtube.serializer;
import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
@@ -33,10 +32,9 @@ import com.google.api.services.youtube.model.ChannelStatistics;
import com.google.api.services.youtube.model.ChannelTopicDetails;
import com.google.api.services.youtube.model.Thumbnail;
import com.google.api.services.youtube.model.ThumbnailDetails;
-import com.google.common.collect.Lists;
import java.io.IOException;
-import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -45,7 +43,7 @@ import java.util.List;
public class YoutubeChannelDeserializer extends JsonDeserializer<Channel> {
@Override
- public Channel deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+ public Channel deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
JsonNode node = jp.getCodec().readTree(jp);
try {
Channel channel = new Channel();
@@ -144,10 +142,9 @@ public class YoutubeChannelDeserializer extends JsonDeserializer<Channel> {
if (node == null) {
return details;
}
- List<String> topicIds = Lists.newLinkedList();
- Iterator<JsonNode> it = node.get("topicIds").iterator();
- while (it.hasNext()) {
- topicIds.add(it.next().asText());
+ List<String> topicIds = new LinkedList<>();
+ for (JsonNode jsonNode : node.get("topicIds")) {
+ topicIds.add(jsonNode.asText());
}
details.setTopicIds(topicIds);
return details;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeEventClassifier.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeEventClassifier.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeEventClassifier.java
index 65a454c..e7645bd 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeEventClassifier.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeEventClassifier.java
@@ -27,6 +27,7 @@ import com.google.common.base.Preconditions;
import org.apache.commons.lang.StringUtils;
import java.io.IOException;
+import java.util.Objects;
public class YoutubeEventClassifier {
private static ObjectMapper mapper = StreamsJacksonMapper.getInstance();
@@ -39,7 +40,7 @@ public class YoutubeEventClassifier {
* @return Class
*/
public static Class detectClass(String json) {
- Preconditions.checkNotNull(json);
+ Objects.requireNonNull(json);
Preconditions.checkArgument(StringUtils.isNotEmpty(json));
ObjectNode objectNode;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeChannelDataCollectorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeChannelDataCollectorTest.java b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeChannelDataCollectorTest.java
index 4751f00..0ae4822 100644
--- a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeChannelDataCollectorTest.java
+++ b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeChannelDataCollectorTest.java
@@ -27,13 +27,13 @@ import org.apache.streams.util.api.requests.backoff.impl.LinearTimeBackOffStrate
import com.google.api.services.youtube.YouTube;
import com.google.api.services.youtube.model.Channel;
import com.google.api.services.youtube.model.ChannelListResponse;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Queues;
import org.apache.youtube.pojo.YoutubeConfiguration;
import org.junit.Test;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -51,7 +51,7 @@ public class YoutubeChannelDataCollectorTest {
@Test
public void testDataCollector() throws Exception {
YouTube youTube = createMockYoutube();
- BlockingQueue<StreamsDatum> queue = Queues.newLinkedBlockingQueue();
+ BlockingQueue<StreamsDatum> queue = new LinkedBlockingQueue<>();
BackOffStrategy strategy = new LinearTimeBackOffStrategy(1);
UserInfo userInfo = new UserInfo();
userInfo.setUserId(ID);
@@ -91,7 +91,7 @@ public class YoutubeChannelDataCollectorTest {
private ChannelListResponse createMockResponse() {
ChannelListResponse response = new ChannelListResponse();
- List<Channel> channelList = Lists.newLinkedList();
+ List<Channel> channelList = new LinkedList<>();
response.setItems(channelList);
Channel channel = new Channel();
channel.setId(ID);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeProviderTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeProviderTest.java b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeProviderTest.java
index 5a2af8a..54c0375 100644
--- a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeProviderTest.java
+++ b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeProviderTest.java
@@ -23,15 +23,15 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.google.gplus.configuration.UserInfo;
import org.apache.streams.util.api.requests.backoff.BackOffStrategy;
-import com.google.api.client.util.Maps;
-import com.google.api.client.util.Sets;
import com.google.api.services.youtube.YouTube;
-import com.google.common.collect.Lists;
import org.apache.youtube.pojo.YoutubeConfiguration;
import org.joda.time.DateTime;
import org.junit.Test;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -54,7 +54,7 @@ public class YoutubeProviderTest {
public void testDataCollectorRunsPerUser() {
Random random = new Random(System.currentTimeMillis());
int numUsers = random.nextInt(1000);
- List<UserInfo> userList = Lists.newLinkedList();
+ List<UserInfo> userList = new LinkedList<>();
for ( int i = 0; i < numUsers; ++i ) {
userList.add(new UserInfo());
@@ -107,7 +107,7 @@ public class YoutubeProviderTest {
provider.setDefaultAfterDate(afterDate);
provider.setDefaultBeforeDate(beforeDate);
- Set<String> users = Sets.newHashSet();
+ Set<String> users = new HashSet<>();
users.add("test_user_1");
users.add("test_user_2");
users.add("test_user_3");
@@ -128,7 +128,7 @@ public class YoutubeProviderTest {
config.setApiKey("API_KEY");
YoutubeProvider provider = buildProvider(config);
- Map<String, DateTime> users = Maps.newHashMap();
+ Map<String, DateTime> users = new HashMap<>();
users.put("user1", new DateTime(System.currentTimeMillis()));
users.put("user3", new DateTime(System.currentTimeMillis()));
users.put("user4", new DateTime(System.currentTimeMillis()));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeUserActivityCollectorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeUserActivityCollectorTest.java b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeUserActivityCollectorTest.java
index 1870c14..d6a540e 100644
--- a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeUserActivityCollectorTest.java
+++ b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/provider/YoutubeUserActivityCollectorTest.java
@@ -24,7 +24,6 @@ import org.apache.streams.google.gplus.configuration.UserInfo;
import org.apache.streams.local.queues.ThroughputQueue;
import org.apache.streams.util.api.requests.backoff.impl.ExponentialBackOffStrategy;
-import com.google.api.client.util.Lists;
import com.google.api.services.youtube.YouTube;
import com.google.api.services.youtube.model.Activity;
import com.google.api.services.youtube.model.ActivityContentDetails;
@@ -41,6 +40,8 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -170,7 +171,7 @@ public class YoutubeUserActivityCollectorTest {
private ActivityListResponse buildActivityListResponse(int num) {
ActivityListResponse activityListResponse = new ActivityListResponse();
- List<Activity> items = Lists.newArrayList();
+ List<Activity> items = new ArrayList<>();
for ( int x = 0; x < num; x++ ) {
Activity activity = new Activity();
@@ -193,21 +194,15 @@ public class YoutubeUserActivityCollectorTest {
private YouTube buildYouTube(int numBeforeRange, int numAfterRange, int numInRange, DateTime afterDate, DateTime beforeDate) {
- YouTube youtube = createYoutubeMock(numBeforeRange, numAfterRange, numInRange, afterDate, beforeDate);
+ return createYoutubeMock(numBeforeRange, numAfterRange, numInRange, afterDate, beforeDate);
- return youtube;
}
private YouTube createYoutubeMock(int numBefore, int numAfter, int numInRange, DateTime after, DateTime before) {
YouTube youtube = mock(YouTube.class);
final YouTube.Videos videos = createMockVideos(numBefore, numAfter, numInRange, after, before);
- doAnswer(new Answer() {
- @Override
- public YouTube.Videos answer(InvocationOnMock invocationOnMock) throws Throwable {
- return videos;
- }
- }).when(youtube).videos();
+ doAnswer(invocationOnMock -> videos).when(youtube).videos();
return youtube;
}
@@ -245,7 +240,7 @@ public class YoutubeUserActivityCollectorTest {
private static VideoListResponse createMockVideoListResponse(int numBefore, int numAfter, int numInRange, DateTime after, DateTime before, boolean page) {
VideoListResponse feed = new VideoListResponse();
- List<Video> list = com.google.common.collect.Lists.newLinkedList();
+ List<Video> list = new LinkedList<>();
for (int i = 0; i < numAfter; ++i) {
com.google.api.client.util.DateTime published = new com.google.api.client.util.DateTime(after.getMillis() + 1000000);
@@ -255,7 +250,7 @@ public class YoutubeUserActivityCollectorTest {
list.add(video);
}
for (int i = 0; i < numInRange; ++i) {
- DateTime published = null;
+ DateTime published;
if ((before == null && after == null) || before == null) {
published = DateTime.now(); // no date range or end time date range so just make the time now.
} else if (after == null) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-core/src/main/java/org/apache/streams/core/StreamBuilder.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamBuilder.java b/streams-core/src/main/java/org/apache/streams/core/StreamBuilder.java
index 1052647..0920829 100644
--- a/streams-core/src/main/java/org/apache/streams/core/StreamBuilder.java
+++ b/streams-core/src/main/java/org/apache/streams/core/StreamBuilder.java
@@ -40,9 +40,9 @@ import java.math.BigInteger;
*/
public interface StreamBuilder extends Serializable {
- public StreamBuilder setStreamsConfiguration(StreamsConfiguration configuration);
+ StreamBuilder setStreamsConfiguration(StreamsConfiguration configuration);
- public StreamsConfiguration getStreamsConfiguration();
+ StreamsConfiguration getStreamsConfiguration();
/**
* Add a {@link org.apache.streams.core.StreamsProcessor} to the data processing stream.
@@ -53,7 +53,7 @@ public interface StreamBuilder extends Serializable {
* receive data from.
* @return this
*/
- public StreamBuilder addStreamsProcessor(String processorId, StreamsProcessor processor, int numTasks, String... connectToIds);
+ StreamBuilder addStreamsProcessor(String processorId, StreamsProcessor processor, int numTasks, String... connectToIds);
/**
* Add a {@link org.apache.streams.core.StreamsPersistWriter} to the data processing stream.
@@ -64,7 +64,7 @@ public interface StreamBuilder extends Serializable {
* receive data from.
* @return this
*/
- public StreamBuilder addStreamsPersistWriter(String persistWriterId, StreamsPersistWriter writer, int numTasks, String... connectToIds);
+ StreamBuilder addStreamsPersistWriter(String persistWriterId, StreamsPersistWriter writer, int numTasks, String... connectToIds);
/**
* Add a {@link org.apache.streams.core.StreamsProvider} to the data processing stream. The provider will execute
@@ -73,7 +73,7 @@ public interface StreamBuilder extends Serializable {
* @param provider provider to execute
* @return this
*/
- public StreamBuilder newPerpetualStream(String streamId, StreamsProvider provider);
+ StreamBuilder newPerpetualStream(String streamId, StreamsProvider provider);
/**
* Add a {@link org.apache.streams.core.StreamsProvider} to the data processing stream. The provider will execute
@@ -82,7 +82,7 @@ public interface StreamBuilder extends Serializable {
* @param provider provider to execute
* @return this
*/
- public StreamBuilder newReadCurrentStream(String streamId, StreamsProvider provider);
+ StreamBuilder newReadCurrentStream(String streamId, StreamsProvider provider);
/**
* Add a {@link org.apache.streams.core.StreamsProvider} to the data processing stream. The provider will execute
@@ -92,7 +92,7 @@ public interface StreamBuilder extends Serializable {
* @param sequence sequence to pass to {@link org.apache.streams.core.StreamsProvider:readNext(BigInteger)} method
* @return this
*/
- public StreamBuilder newReadNewStream(String streamId, StreamsProvider provider, BigInteger sequence);
+ StreamBuilder newReadNewStream(String streamId, StreamsProvider provider, BigInteger sequence);
/**
* Add a {@link org.apache.streams.core.StreamsProvider} to the data processing stream. The provider will execute
@@ -104,25 +104,17 @@ public interface StreamBuilder extends Serializable {
* @param end end date
* @return this
*/
- public StreamBuilder newReadRangeStream(String streamId, StreamsProvider provider, DateTime start, DateTime end);
+ StreamBuilder newReadRangeStream(String streamId, StreamsProvider provider, DateTime start, DateTime end);
/**
* Builds the stream, and starts it or submits it based on implementation.
*/
- public void start();
+ void start();
/**
* Stops the streams processing. No guarantee on a smooth shutdown. Optional method, may not be implemented in
* all cases.
*/
- public void stop();
-
-
-
-
-
-
-
-
+ void stop();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-core/src/main/java/org/apache/streams/core/StreamsOperation.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsOperation.java b/streams-core/src/main/java/org/apache/streams/core/StreamsOperation.java
index 490f454..a86499b 100644
--- a/streams-core/src/main/java/org/apache/streams/core/StreamsOperation.java
+++ b/streams-core/src/main/java/org/apache/streams/core/StreamsOperation.java
@@ -28,19 +28,19 @@ public interface StreamsOperation extends Serializable {
/**
* Each operation must publish an identifier.
*/
- public String getId();
+ String getId();
/**
* This method will be called after initialization/serialization. Initialize any non-serializable objects here.
* @param configurationObject Any object to help intialize the operation. ie. Map, JobContext, Properties, etc. The type
* will be based on where the operation is being run (ie. hadoop, storm, locally, etc.)
*/
- public void prepare(Object configurationObject);
+ void prepare(Object configurationObject);
/**
* No guarantee that this method will ever be called. But upon shutdown of the stream, an attempt to call this method
* will be made.
* Use this method to terminate connections, etc.
*/
- public void cleanUp();
+ void cleanUp();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
----------------------------------------------------------------------
diff --git a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
index a797ce5..5b85e68 100644
--- a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
+++ b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
@@ -40,11 +40,11 @@ import org.apache.streams.pojo.json.ThroughputQueueBroadcast;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.common.collect.Lists;
import org.slf4j.Logger;
import java.lang.management.ManagementFactory;
import java.net.URI;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -128,7 +128,7 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple
LOGGER.info("BroadcastMonitorThread running");
while (keepRunning) {
try {
- List<String> messages = Lists.newArrayList();
+ List<String> messages = new ArrayList<>();
Set<ObjectName> beans = server.queryNames(null, null);
for (ObjectName name : beans) {
@@ -185,13 +185,16 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple
}
if (broadcastUri != null) {
- if (broadcastUri.getScheme().equals("http")) {
- messagePersister = new BroadcastMessagePersister(broadcastUri.toString());
- } else if (broadcastUri.getScheme().equals("udp")) {
- messagePersister = new LogstashUdpMessagePersister(broadcastUri.toString());
- } else {
- LOGGER.error("You need to specify a broadcast URI with either a HTTP or UDP protocol defined.");
- throw new RuntimeException();
+ switch (broadcastUri.getScheme()) {
+ case "http":
+ messagePersister = new BroadcastMessagePersister(broadcastUri.toString());
+ break;
+ case "udp":
+ messagePersister = new LogstashUdpMessagePersister(broadcastUri.toString());
+ break;
+ default:
+ LOGGER.error("You need to specify a broadcast URI with either a HTTP or UDP protocol defined.");
+ throw new RuntimeException();
}
} else {
messagePersister = new Slf4jMessagePersister();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-monitoring/src/test/java/org/apache/streams/monitoring/persist/impl/LogstashUdpMessagePersisterTest.java
----------------------------------------------------------------------
diff --git a/streams-monitoring/src/test/java/org/apache/streams/monitoring/persist/impl/LogstashUdpMessagePersisterTest.java b/streams-monitoring/src/test/java/org/apache/streams/monitoring/persist/impl/LogstashUdpMessagePersisterTest.java
index 3f9a4c1..c85ff90 100644
--- a/streams-monitoring/src/test/java/org/apache/streams/monitoring/persist/impl/LogstashUdpMessagePersisterTest.java
+++ b/streams-monitoring/src/test/java/org/apache/streams/monitoring/persist/impl/LogstashUdpMessagePersisterTest.java
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.SocketException;
+import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -37,7 +38,7 @@ public class LogstashUdpMessagePersisterTest {
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(LogstashUdpMessagePersisterTest.class);
- DatagramSocket socket = null;
+ private DatagramSocket socket = null;
/**
* setup.
@@ -56,7 +57,7 @@ public class LogstashUdpMessagePersisterTest {
public void testFailedPersist() {
LogstashUdpMessagePersister persister = new LogstashUdpMessagePersister("udp://127.0.0.1:56789");
- List<String> messageArray = Lists.newArrayList();
+ List<String> messageArray = new ArrayList<>();
for (int x = 0; x < 10; x ++) {
messageArray.add("Fake_message #" + x);
}
[2/7] incubator-streams git commit: STREAMS-441: Remove compile
dependency on guava for core packages,
this closes apache/incubator-streams#320
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-cassandra/src/main/java/org/apache/streams/plugins/cassandra/StreamsCassandraResourceGenerator.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-cassandra/src/main/java/org/apache/streams/plugins/cassandra/StreamsCassandraResourceGenerator.java b/streams-plugins/streams-plugin-cassandra/src/main/java/org/apache/streams/plugins/cassandra/StreamsCassandraResourceGenerator.java
index 7afa9fc..9819a93 100644
--- a/streams-plugins/streams-plugin-cassandra/src/main/java/org/apache/streams/plugins/cassandra/StreamsCassandraResourceGenerator.java
+++ b/streams-plugins/streams-plugin-cassandra/src/main/java/org/apache/streams/plugins/cassandra/StreamsCassandraResourceGenerator.java
@@ -21,7 +21,6 @@ package org.apache.streams.plugins.cassandra;
import org.apache.streams.util.schema.FieldType;
import org.apache.streams.util.schema.FieldUtil;
-import org.apache.streams.util.schema.GenerationConfig;
import org.apache.streams.util.schema.Schema;
import org.apache.streams.util.schema.SchemaStore;
import org.apache.streams.util.schema.SchemaStoreImpl;
@@ -29,10 +28,7 @@ import org.apache.streams.util.schema.SchemaStoreImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
import org.jsonschema2pojo.util.URLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,10 +36,13 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.streams.util.schema.FileUtil.dropExtension;
@@ -113,7 +112,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
*/
public void generate(StreamsCassandraGenerationConfig config) {
- LinkedList<File> sourceFiles = new LinkedList<File>();
+ LinkedList<File> sourceFiles = new LinkedList<>();
for (Iterator<URL> sources = config.getSource(); sources.hasNext();) {
URL source = sources.next();
@@ -122,12 +121,11 @@ public class StreamsCassandraResourceGenerator implements Runnable {
LOGGER.info("Seeded with {} source paths:", sourceFiles.size());
- resolveRecursive((GenerationConfig)config, sourceFiles);
+ resolveRecursive(config, sourceFiles);
LOGGER.info("Resolved {} schema files:", sourceFiles.size());
- for (Iterator<File> iterator = sourceFiles.iterator(); iterator.hasNext();) {
- File item = iterator.next();
+ for (File item : sourceFiles) {
schemaStore.create(item.toURI());
}
@@ -273,7 +271,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
// safe to append nothing
checkNotNull(builder);
String schemaSymbol = schemaSymbol(schema);
- if ( !Strings.isNullOrEmpty(fieldId) && schemaSymbol != null ) {
+ if (StringUtils.isNotBlank(fieldId) && schemaSymbol != null ) {
builder.append(cqlEscape(fieldId));
builder.append(seperator);
builder.append("list<" + schemaSymbol + ">");
@@ -287,7 +285,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
// safe to append nothing
checkNotNull(builder);
String schemaSymbol = schemaSymbol(schema);
- if ( !Strings.isNullOrEmpty(fieldId) && schemaSymbol != null ) {
+ if (StringUtils.isNotBlank(fieldId) && schemaSymbol != null ) {
builder.append(cqlEscape(fieldId));
builder.append(seperator);
builder.append(schemaSymbol);
@@ -307,7 +305,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
checkNotNull(propertiesNode);
Iterator<Map.Entry<String, JsonNode>> fields = propertiesNode.fields();
Joiner joiner = Joiner.on("," + LS).skipNulls();
- List<String> fieldStrings = Lists.newArrayList();
+ List<String> fieldStrings = new ArrayList<>();
for ( ; fields.hasNext(); ) {
Map.Entry<String, JsonNode> field = fields.next();
String fieldId = field.getKey();
@@ -320,7 +318,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
ObjectNode itemsNode = (ObjectNode) fieldNode.get("items");
if ( currentDepth <= config.getMaxDepth()) {
StringBuilder arrayItemsBuilder = appendArrayItems(new StringBuilder(), schema, fieldId, itemsNode, seperator);
- if ( !Strings.isNullOrEmpty(arrayItemsBuilder.toString())) {
+ if (StringUtils.isNotBlank(arrayItemsBuilder.toString())) {
fieldStrings.add(arrayItemsBuilder.toString());
}
}
@@ -355,14 +353,14 @@ public class StreamsCassandraResourceGenerator implements Runnable {
//ObjectNode childProperties = schemaStore.resolveProperties(schema, fieldNode, fieldId);
if ( currentDepth < config.getMaxDepth()) {
StringBuilder structFieldBuilder = appendSchemaField(new StringBuilder(), objectSchema, fieldId, seperator);
- if ( !Strings.isNullOrEmpty(structFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(structFieldBuilder.toString())) {
fieldStrings.add(structFieldBuilder.toString());
}
}
break;
default:
StringBuilder valueFieldBuilder = appendValueField(new StringBuilder(), schema, fieldId, fieldType, seperator);
- if ( !Strings.isNullOrEmpty(valueFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(valueFieldBuilder.toString())) {
fieldStrings.add(valueFieldBuilder.toString());
}
}
@@ -370,7 +368,7 @@ public class StreamsCassandraResourceGenerator implements Runnable {
}
}
builder.append(joiner.join(fieldStrings)).append(LS);
- Preconditions.checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
index 1eada8a..e90c961 100644
--- a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java
@@ -25,6 +25,7 @@ import junit.framework.TestCase;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,9 +60,9 @@ public class StreamsCassandraResourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-resources"));
@@ -74,9 +75,9 @@ public class StreamsCassandraResourceGeneratorMojoIT extends TestCase {
File testOutput = testOutputPath.toFile();
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(cqlFilter);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-elasticsearch/src/main/java/org/apache/streams/plugins/elasticsearch/StreamsElasticsearchResourceGenerator.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-elasticsearch/src/main/java/org/apache/streams/plugins/elasticsearch/StreamsElasticsearchResourceGenerator.java b/streams-plugins/streams-plugin-elasticsearch/src/main/java/org/apache/streams/plugins/elasticsearch/StreamsElasticsearchResourceGenerator.java
index 47db819..3f715a7 100644
--- a/streams-plugins/streams-plugin-elasticsearch/src/main/java/org/apache/streams/plugins/elasticsearch/StreamsElasticsearchResourceGenerator.java
+++ b/streams-plugins/streams-plugin-elasticsearch/src/main/java/org/apache/streams/plugins/elasticsearch/StreamsElasticsearchResourceGenerator.java
@@ -22,7 +22,6 @@ package org.apache.streams.plugins.elasticsearch;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.util.schema.FieldType;
import org.apache.streams.util.schema.FieldUtil;
-import org.apache.streams.util.schema.GenerationConfig;
import org.apache.streams.util.schema.Schema;
import org.apache.streams.util.schema.SchemaStore;
import org.apache.streams.util.schema.SchemaStoreImpl;
@@ -32,8 +31,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.jsonschema2pojo.util.URLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +45,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import static org.apache.streams.util.schema.FileUtil.dropExtension;
import static org.apache.streams.util.schema.FileUtil.dropSourcePathPrefix;
@@ -124,7 +123,7 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
LOGGER.info("Seeded with {} source paths:", sourceFiles.size());
- resolveRecursive((GenerationConfig)config, sourceFiles);
+ resolveRecursive(config, sourceFiles);
LOGGER.info("Resolved {} schema files:", sourceFiles.size());
@@ -134,8 +133,6 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
LOGGER.info("Identified {} objects:", schemaStore.getSize());
- StringBuilder typesContent = new StringBuilder();
-
for (Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); schemaIterator.hasNext(); ) {
Schema schema = schemaIterator.next();
currentDepth = 0;
@@ -153,7 +150,7 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
String resourceContent = generateResource(schema, resourceId);
- if ( !Strings.isNullOrEmpty(resourceContent)) {
+ if (StringUtils.isNotBlank(resourceContent)) {
writeFile(outputFile, resourceContent);
}
@@ -283,7 +280,7 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
// safe to append nothing
Objects.requireNonNull(builder);
String schemaSymbol = schemaSymbol(schema);
- if ( !Strings.isNullOrEmpty(fieldId) && schemaSymbol != null ) {
+ if (StringUtils.isNotBlank(fieldId) && schemaSymbol != null ) {
builder.append(cqlEscape(fieldId));
builder.append(seperator);
builder.append("list<").append(schemaSymbol).append(">");
@@ -297,7 +294,7 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
// safe to append nothing
Objects.requireNonNull(builder);
String schemaSymbol = schemaSymbol(schema);
- if ( !Strings.isNullOrEmpty(fieldId) && schemaSymbol != null ) {
+ if (StringUtils.isNotBlank(fieldId) && schemaSymbol != null ) {
builder.append(cqlEscape(fieldId));
builder.append(seperator);
builder.append(schemaSymbol);
@@ -330,7 +327,7 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
ObjectNode itemsNode = (ObjectNode) fieldNode.get("items");
if ( currentDepth <= config.getMaxDepth()) {
StringBuilder arrayItemsBuilder = appendArrayItems(new StringBuilder(), schema, fieldId, itemsNode, seperator);
- if ( !Strings.isNullOrEmpty(arrayItemsBuilder.toString())) {
+ if (StringUtils.isNotBlank(arrayItemsBuilder.toString())) {
fieldStrings.add(arrayItemsBuilder.toString());
}
}
@@ -365,14 +362,14 @@ public class StreamsElasticsearchResourceGenerator implements Runnable {
//ObjectNode childProperties = schemaStore.resolveProperties(schema, fieldNode, fieldId);
if ( currentDepth < config.getMaxDepth()) {
StringBuilder structFieldBuilder = appendSchemaField(new StringBuilder(), objectSchema, fieldId, seperator);
- if ( !Strings.isNullOrEmpty(structFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(structFieldBuilder.toString())) {
fieldStrings.add(structFieldBuilder.toString());
}
}
break;
default:
StringBuilder valueFieldBuilder = appendValueField(new StringBuilder(), schema, fieldId, fieldType, seperator);
- if ( !Strings.isNullOrEmpty(valueFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(valueFieldBuilder.toString())) {
fieldStrings.add(valueFieldBuilder.toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
index a0fbb99..5769d4d 100644
--- a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java
@@ -53,9 +53,9 @@ public class StreamsElasticsearchResourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-resources"));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-hbase/src/main/java/org/apache/streams/plugins/hbase/StreamsHbaseResourceGenerator.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hbase/src/main/java/org/apache/streams/plugins/hbase/StreamsHbaseResourceGenerator.java b/streams-plugins/streams-plugin-hbase/src/main/java/org/apache/streams/plugins/hbase/StreamsHbaseResourceGenerator.java
index cbea67f..62bdb6d 100644
--- a/streams-plugins/streams-plugin-hbase/src/main/java/org/apache/streams/plugins/hbase/StreamsHbaseResourceGenerator.java
+++ b/streams-plugins/streams-plugin-hbase/src/main/java/org/apache/streams/plugins/hbase/StreamsHbaseResourceGenerator.java
@@ -21,7 +21,6 @@ package org.apache.streams.plugins.hbase;
import org.apache.streams.util.schema.FieldType;
import org.apache.streams.util.schema.FieldUtil;
-import org.apache.streams.util.schema.GenerationConfig;
import org.apache.streams.util.schema.Schema;
import org.apache.streams.util.schema.SchemaStore;
import org.apache.streams.util.schema.SchemaStoreImpl;
@@ -48,9 +47,6 @@ import static org.apache.streams.util.schema.FileUtil.resolveRecursive;
import static org.apache.streams.util.schema.FileUtil.swapExtension;
import static org.apache.streams.util.schema.FileUtil.writeFile;
-/**
- * Created by sblackmon on 5/3/16.
- */
public class StreamsHbaseResourceGenerator implements Runnable {
private static final Logger LOGGER = LoggerFactory.getLogger(StreamsHbaseResourceGenerator.class);
@@ -111,7 +107,7 @@ public class StreamsHbaseResourceGenerator implements Runnable {
*/
public void generate(StreamsHbaseGenerationConfig config) {
- LinkedList<File> sourceFiles = new LinkedList<File>();
+ LinkedList<File> sourceFiles = new LinkedList<>();
for (Iterator<URL> sources = config.getSource(); sources.hasNext();) {
URL source = sources.next();
@@ -120,12 +116,11 @@ public class StreamsHbaseResourceGenerator implements Runnable {
LOGGER.info("Seeded with {} source paths:", sourceFiles.size());
- resolveRecursive((GenerationConfig)config, sourceFiles);
+ resolveRecursive(config, sourceFiles);
LOGGER.info("Resolved {} schema files:", sourceFiles.size());
- for (Iterator<File> iterator = sourceFiles.iterator(); iterator.hasNext();) {
- File item = iterator.next();
+ for (File item : sourceFiles) {
schemaStore.create(item.toURI());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
index 254bd0e..55c4b7a 100644
--- a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
+++ b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorCLITest.java
@@ -23,6 +23,7 @@ import org.apache.streams.plugins.hbase.StreamsHbaseResourceGenerator;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
+import org.junit.Assert;
import org.junit.Test;
import java.io.File;
@@ -47,9 +48,9 @@ public class StreamsHbaseResourceGeneratorCLITest {
File testOutput = new File(targetDirectory);
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(txtFilter);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
index ff4e49a..cdc5d47 100644
--- a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java
@@ -24,6 +24,7 @@ import com.google.common.io.Files;
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,9 +58,9 @@ public class StreamsHbaseResourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-resources"));
@@ -70,13 +71,12 @@ public class StreamsHbaseResourceGeneratorMojoIT extends TestCase {
File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hbase-mojo");
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
- Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
- .filter(txtFilter);
+ Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput).filter(txtFilter);
Collection<File> outputCollection = Lists.newArrayList(outputIterator);
- assert ( outputCollection.size() == 133 );
+ Assert.assertEquals(outputCollection.size(), 133);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
index ac876d5..2dd9dd5 100644
--- a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
+++ b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorTest.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.Collection;
-import java.util.Iterator;
-import javax.annotation.Nullable;
import static org.apache.streams.util.schema.FileUtil.dropSourcePathPrefix;
@@ -46,16 +44,7 @@ public class StreamsHbaseResourceGeneratorTest {
private static final Logger LOGGER = LoggerFactory.getLogger(StreamsHbaseResourceGeneratorTest.class);
- public static final Predicate<File> txtFilter = new Predicate<File>() {
- @Override
- public boolean apply(@Nullable File file) {
- if ( file.getName().endsWith(".txt") ) {
- return true;
- } else {
- return false;
- }
- }
- };
+ public static final Predicate<File> txtFilter = file -> file.getName().endsWith(".txt");
/**
* Tests that all example activities can be loaded into Activity beans.
@@ -83,9 +72,9 @@ public class StreamsHbaseResourceGeneratorTest {
File testOutput = config.getTargetDirectory();
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(txtFilter);
@@ -101,14 +90,12 @@ public class StreamsHbaseResourceGeneratorTest {
int fails = 0;
- Iterator<File> iterator = expectedCollection.iterator();
- while ( iterator.hasNext() ) {
- File objectExpected = iterator.next();
- String expectedEnd = dropSourcePathPrefix(objectExpected.getAbsolutePath(), expectedDirectory);
+ for (File objectExpected : expectedCollection) {
+ String expectedEnd = dropSourcePathPrefix(objectExpected.getAbsolutePath(), expectedDirectory);
File objectActual = new File(config.getTargetDirectory() + "/" + expectedEnd);
LOGGER.info("Comparing: {} and {}", objectExpected.getAbsolutePath(), objectActual.getAbsolutePath());
- assert ( objectActual.exists());
- if ( FileUtils.contentEquals(objectActual, objectExpected) == true ) {
+ assert (objectActual.exists());
+ if (FileUtils.contentEquals(objectActual, objectExpected)) {
LOGGER.info("Exact Match!");
} else {
LOGGER.info("No Match!");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
index b5ea4b4..cbb3fda 100644
--- a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java
@@ -24,6 +24,7 @@ import com.google.common.io.Files;
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,9 +58,9 @@ public class StreamsHiveResourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-resources"));
@@ -70,13 +71,13 @@ public class StreamsHiveResourceGeneratorMojoIT extends TestCase {
File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hive-mojo");
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(hqlFilter);
Collection<File> outputCollection = Lists.newArrayList(outputIterator);
- assert ( outputCollection.size() == 133 );
+ Assert.assertEquals (outputCollection.size(), 133);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-pig/src/main/java/org/apache/streams/plugins/pig/StreamsPigResourceGenerator.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pig/src/main/java/org/apache/streams/plugins/pig/StreamsPigResourceGenerator.java b/streams-plugins/streams-plugin-pig/src/main/java/org/apache/streams/plugins/pig/StreamsPigResourceGenerator.java
index 039f45b..e7f7be7 100644
--- a/streams-plugins/streams-plugin-pig/src/main/java/org/apache/streams/plugins/pig/StreamsPigResourceGenerator.java
+++ b/streams-plugins/streams-plugin-pig/src/main/java/org/apache/streams/plugins/pig/StreamsPigResourceGenerator.java
@@ -22,7 +22,6 @@ package org.apache.streams.plugins.pig;
import org.apache.streams.util.schema.FieldType;
import org.apache.streams.util.schema.FieldUtil;
import org.apache.streams.util.schema.FileUtil;
-import org.apache.streams.util.schema.GenerationConfig;
import org.apache.streams.util.schema.Schema;
import org.apache.streams.util.schema.SchemaStore;
import org.apache.streams.util.schema.SchemaStoreImpl;
@@ -30,21 +29,20 @@ import org.apache.streams.util.schema.SchemaStoreImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
import org.jsonschema2pojo.util.URLUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.streams.util.schema.FileUtil.dropExtension;
import static org.apache.streams.util.schema.FileUtil.dropSourcePathPrefix;
import static org.apache.streams.util.schema.FileUtil.swapExtension;
@@ -109,7 +107,7 @@ public class StreamsPigResourceGenerator implements Runnable {
@Override
public void run() {
- checkNotNull(config);
+ Objects.requireNonNull(config);
generate(config);
@@ -121,7 +119,7 @@ public class StreamsPigResourceGenerator implements Runnable {
*/
public void generate(StreamsPigGenerationConfig config) {
- LinkedList<File> sourceFiles = new LinkedList<File>();
+ LinkedList<File> sourceFiles = new LinkedList<>();
for (Iterator<URL> sources = config.getSource(); sources.hasNext(); ) {
URL source = sources.next();
@@ -130,12 +128,11 @@ public class StreamsPigResourceGenerator implements Runnable {
LOGGER.info("Seeded with {} source paths:", sourceFiles.size());
- FileUtil.resolveRecursive((GenerationConfig) config, sourceFiles);
+ FileUtil.resolveRecursive(config, sourceFiles);
LOGGER.info("Resolved {} schema files:", sourceFiles.size());
- for (Iterator<File> iterator = sourceFiles.iterator(); iterator.hasNext(); ) {
- File item = iterator.next();
+ for (File item : sourceFiles) {
schemaStore.create(item.toURI());
}
@@ -181,20 +178,20 @@ public class StreamsPigResourceGenerator implements Runnable {
return resourceBuilder.toString();
}
- protected StringBuilder appendRootObject(StringBuilder builder, Schema schema, String resourceId, Character seperator) {
+ protected StringBuilder appendRootObject(StringBuilder builder, Schema schema, String resourceId, Character separator) {
ObjectNode propertiesNode = schemaStore.resolveProperties(schema, null, resourceId);
if (propertiesNode != null && propertiesNode.isObject() && propertiesNode.size() > 0) {
- builder = appendPropertiesNode(builder, schema, propertiesNode, seperator);
+ builder = appendPropertiesNode(builder, schema, propertiesNode, separator);
}
return builder;
}
private StringBuilder appendPropertiesNode(StringBuilder builder, Schema schema, ObjectNode propertiesNode, Character seperator) {
- checkNotNull(builder);
- checkNotNull(propertiesNode);
+ Objects.requireNonNull(builder);
+ Objects.requireNonNull(propertiesNode);
Iterator<Map.Entry<String, JsonNode>> fields = propertiesNode.fields();
Joiner joiner = Joiner.on(", ").skipNulls();
- List<String> fieldStrings = Lists.newArrayList();
+ List<String> fieldStrings = new ArrayList<>();
for ( ; fields.hasNext(); ) {
Map.Entry<String, JsonNode> field = fields.next();
String fieldId = field.getKey();
@@ -207,7 +204,7 @@ public class StreamsPigResourceGenerator implements Runnable {
ObjectNode resolvedItems = schemaStore.resolveItems(schema, fieldNode, fieldId);
if ( resolvedItems != null && currentDepth <= config.getMaxDepth()) {
StringBuilder arrayItemsBuilder = appendArrayItems(new StringBuilder(), schema, fieldId, resolvedItems, seperator);
- if ( !Strings.isNullOrEmpty(arrayItemsBuilder.toString())) {
+ if (StringUtils.isNotBlank(arrayItemsBuilder.toString())) {
fieldStrings.add(arrayItemsBuilder.toString());
}
}
@@ -216,14 +213,14 @@ public class StreamsPigResourceGenerator implements Runnable {
ObjectNode childProperties = schemaStore.resolveProperties(schema, fieldNode, fieldId);
if ( currentDepth < config.getMaxDepth()) {
StringBuilder structFieldBuilder = appendStructField(new StringBuilder(), schema, fieldId, childProperties, seperator);
- if ( !Strings.isNullOrEmpty(structFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(structFieldBuilder.toString())) {
fieldStrings.add(structFieldBuilder.toString());
}
}
break;
default:
StringBuilder valueFieldBuilder = appendValueField(new StringBuilder(), schema, fieldId, fieldType, seperator);
- if ( !Strings.isNullOrEmpty(valueFieldBuilder.toString())) {
+ if (StringUtils.isNotBlank(valueFieldBuilder.toString())) {
fieldStrings.add(valueFieldBuilder.toString());
}
}
@@ -231,13 +228,13 @@ public class StreamsPigResourceGenerator implements Runnable {
}
}
joiner.appendTo(builder, fieldStrings);
- Preconditions.checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
private StringBuilder appendValueField(StringBuilder builder, Schema schema, String fieldId, FieldType fieldType, Character seperator) {
// safe to append nothing
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
builder.append(pigEscape(fieldId));
builder.append(seperator);
builder.append(pigType(fieldType));
@@ -246,7 +243,7 @@ public class StreamsPigResourceGenerator implements Runnable {
protected StringBuilder appendArrayItems(StringBuilder builder, Schema schema, String fieldId, ObjectNode itemsNode, Character seperator) {
// not safe to append nothing
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
if ( itemsNode == null ) {
return builder;
}
@@ -267,48 +264,48 @@ public class StreamsPigResourceGenerator implements Runnable {
LOGGER.warn("No item type resolvable for {}", fieldId);
}
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
private StringBuilder appendArrayField(StringBuilder builder, Schema schema, String fieldId, FieldType fieldType, Character seperator) {
// safe to append nothing
- checkNotNull(builder);
- checkNotNull(fieldId);
+ Objects.requireNonNull(builder);
+ Objects.requireNonNull(fieldId);
builder.append("{t: (");
builder.append(pigEscape(fieldId));
builder.append(seperator);
builder.append(pigType(fieldType));
builder.append(")}");
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
private StringBuilder appendArrayObject(StringBuilder builder, Schema schema, String fieldId, ObjectNode fieldNode, Character seperator) {
// safe to append nothing
- checkNotNull(builder);
- checkNotNull(fieldId);
- checkNotNull(fieldNode);
+ Objects.requireNonNull(builder);
+ Objects.requireNonNull(fieldId);
+ Objects.requireNonNull(fieldNode);
ObjectNode propertiesNode = schemaStore.resolveProperties(schema, fieldNode, fieldId);
if ( propertiesNode.size() > 0 ) {
builder.append("{t: (");
builder = appendStructField(builder, schema, "", propertiesNode, ':');
builder.append(")}");
}
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
private StringBuilder appendStructField(StringBuilder builder, Schema schema, String fieldId, ObjectNode propertiesNode, Character seperator) {
// safe to append nothing
- checkNotNull(builder);
- checkNotNull(propertiesNode);
+ Objects.requireNonNull(builder);
+ Objects.requireNonNull(propertiesNode);
if ( propertiesNode != null && propertiesNode.isObject() && propertiesNode.size() > 0 ) {
currentDepth += 1;
- if ( !Strings.isNullOrEmpty(fieldId)) {
+ if (StringUtils.isNotBlank(fieldId)) {
builder.append(pigEscape(fieldId));
builder.append(seperator);
builder.append("(");
@@ -319,7 +316,7 @@ public class StreamsPigResourceGenerator implements Runnable {
currentDepth -= 1;
}
- checkNotNull(builder);
+ Objects.requireNonNull(builder);
return builder;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
index 5cd612f..54d0745 100644
--- a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java
@@ -24,6 +24,7 @@ import com.google.common.io.Files;
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,9 +58,9 @@ public class StreamsPigResourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-resources"));
@@ -70,13 +71,13 @@ public class StreamsPigResourceGeneratorMojoIT extends TestCase {
File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/pig-mojo");
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(pigFilter);
Collection<File> outputCollection = Lists.newArrayList(outputIterator);
- assert ( outputCollection.size() == 133 );
+ Assert.assertEquals(outputCollection.size(), 133 );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
index a1d48cc..6718275 100644
--- a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java
@@ -24,6 +24,7 @@ import com.google.common.io.Files;
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,9 +59,9 @@ public class StreamsPojoSourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"clean",
"dependency:unpack-dependencies",
"generate-sources",
@@ -72,14 +73,13 @@ public class StreamsPojoSourceGeneratorMojoIT extends TestCase {
File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-sources/pojo-mojo");
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
- Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
- .filter(javaFilter);
+ Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput).filter(javaFilter);
Collection<File> outputCollection = Lists.newArrayList(outputIterator);
- assert ( outputCollection.size() > 133 );
+ Assert.assertTrue( outputCollection.size() > 133);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorMojoIT.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorMojoIT.java
index a0caecf..3af6228 100644
--- a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorMojoIT.java
+++ b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorMojoIT.java
@@ -24,6 +24,7 @@ import com.google.common.io.Files;
import junit.framework.TestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,9 +59,9 @@ public class StreamsScalaSourceGeneratorMojoIT extends TestCase {
verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
+ List cliOptions = new ArrayList<>();
cliOptions.add( "-N" );
- verifier.executeGoals( Lists.<String>newArrayList(
+ verifier.executeGoals( Lists.newArrayList(
"compile"));
verifier.verifyErrorFreeLog();
@@ -69,9 +70,9 @@ public class StreamsScalaSourceGeneratorMojoIT extends TestCase {
File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-sources/scala-mojo");
- assert ( testOutput != null );
- assert ( testOutput.exists() == true );
- assert ( testOutput.isDirectory() == true );
+ Assert.assertNotNull(testOutput);
+ Assert.assertTrue(testOutput.exists());
+ Assert.assertTrue(testOutput.isDirectory());
Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput)
.filter(scalaFilter);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
index 1fafaf4..e4cd263 100644
--- a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
+++ b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
@@ -30,9 +30,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileFilter;
-import javax.annotation.Nullable;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -43,16 +42,7 @@ public class StreamsScalaSourceGeneratorTest {
private static final Logger LOGGER = LoggerFactory.getLogger(StreamsScalaSourceGeneratorTest.class);
- public static final Predicate<File> scalaFilter = new Predicate<File>() {
- @Override
- public boolean apply(@Nullable File file) {
- if ( file.getName().endsWith(".scala") ) {
- return true;
- } else {
- return false;
- }
- }
- };
+ public static final Predicate<File> scalaFilter = file -> file.getName().endsWith(".scala");
/**
* Tests that StreamsScalaSourceGenerator via SDK generates scala sources.
@@ -71,16 +61,7 @@ public class StreamsScalaSourceGeneratorTest {
streamsScalaSourceGenerator.run();
File testOutput = new File( "./target/generated-sources/scala-test/org/apache/streams/scala");
- FileFilter scalaFilter = new FileFilter() {
- @Override
- public boolean accept(File pathname) {
- if ( pathname.getName().endsWith(".scala") ) {
- return true;
- } else {
- return false;
- }
- }
- };
+ FileFilter scalaFilter = pathname -> pathname.getName().endsWith(".scala");
assertNotNull( testOutput );
assertTrue( testOutput.exists() );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo-extensions/src/main/java/org/apache/streams/data/util/PropertyUtil.java
----------------------------------------------------------------------
diff --git a/streams-pojo-extensions/src/main/java/org/apache/streams/data/util/PropertyUtil.java b/streams-pojo-extensions/src/main/java/org/apache/streams/data/util/PropertyUtil.java
index 827bc6a..981de44 100644
--- a/streams-pojo-extensions/src/main/java/org/apache/streams/data/util/PropertyUtil.java
+++ b/streams-pojo-extensions/src/main/java/org/apache/streams/data/util/PropertyUtil.java
@@ -27,9 +27,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ValueNode;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -42,26 +42,26 @@ public class PropertyUtil {
private static final ObjectMapper mapper = StreamsJacksonMapper.getInstance();
public static Map<String, Object> flattenToMap(ObjectNode object) {
- Map<String, Object> flatObject = Maps.newHashMap();
- addKeys(new String(), object, flatObject, '.');
+ Map<String, Object> flatObject = new HashMap<>();
+ addKeys("", object, flatObject, '.');
return flatObject;
}
public static Map<String, Object> flattenToMap(ObjectNode object, char seperator) {
- Map<String, Object> flatObject = Maps.newHashMap();
- addKeys(new String(), object, flatObject, seperator);
+ Map<String, Object> flatObject = new HashMap<>();
+ addKeys("", object, flatObject, seperator);
return flatObject;
}
public static ObjectNode flattenToObjectNode(ObjectNode object) {
Map<String, Object> flatObject = flattenToMap(object, '.');
- addKeys(new String(), object, flatObject, '.');
+ addKeys("", object, flatObject, '.');
return mapper.convertValue(flatObject, ObjectNode.class);
}
public static ObjectNode flattenToObjectNode(ObjectNode object, char seperator) {
Map<String, Object> flatObject = flattenToMap(object, seperator);
- addKeys(new String(), object, flatObject, seperator);
+ addKeys("", object, flatObject, seperator);
return mapper.convertValue(flatObject, ObjectNode.class);
}
@@ -102,12 +102,10 @@ public class PropertyUtil {
root.put(item.getKey(), item.getValue());
} else {
ObjectNode currentNode = root;
- List<String> keyParts = Lists.newArrayList();
+ List<String> keyParts = new ArrayList<>();
Iterables.addAll(keyParts, Splitter.on(seperator).split(item.getKey()));
- Iterator<String> keyPartIterator = Iterables.limit(Splitter.on(seperator).split(item.getKey()), keyParts.size() - 1).iterator();
- while ( keyPartIterator.hasNext()) {
- String part = keyPartIterator.next();
- if ( currentNode.has(part) && currentNode.get(part).isObject() ) {
+ for (String part : Iterables.limit(Splitter.on(seperator).split(item.getKey()), keyParts.size() - 1)) {
+ if (currentNode.has(part) && currentNode.get(part).isObject()) {
currentNode = (ObjectNode) currentNode.get(part);
} else {
ObjectNode newNode = mapper.createObjectNode();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
----------------------------------------------------------------------
diff --git a/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java b/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
index 988a269..2c6555b 100644
--- a/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
+++ b/streams-pojo-extensions/src/main/java/org/apache/streams/pojo/extensions/ExtensionUtil.java
@@ -23,7 +23,7 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map;
@@ -124,7 +124,7 @@ public class ExtensionUtil {
if (additionalProperties == null) {
additionalProperties = new HashMap<>();
}
- if ( !Strings.isNullOrEmpty(extensionProperty) ) {
+ if (StringUtils.isNotBlank(extensionProperty) ) {
extensions = (Map<String, Object>) additionalProperties.get(extensionProperty);
if (extensions == null) {
extensions = new HashMap<>();
@@ -148,7 +148,7 @@ public class ExtensionUtil {
if (additionalProperties == null) {
additionalProperties = new HashMap<>();
}
- if ( !Strings.isNullOrEmpty(extensionProperty) ) {
+ if (StringUtils.isNotBlank(extensionProperty) ) {
extensions = (Map<String, Object>) additionalProperties.get(extensionProperty);
if (extensions == null) {
extensions = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/extensions/test/ExtensionUtilTest.java
----------------------------------------------------------------------
diff --git a/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/extensions/test/ExtensionUtilTest.java b/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/extensions/test/ExtensionUtilTest.java
index de49da4..b63220f 100644
--- a/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/extensions/test/ExtensionUtilTest.java
+++ b/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/extensions/test/ExtensionUtilTest.java
@@ -21,7 +21,7 @@ package org.apache.streams.pojo.extensions.test;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
-import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import java.util.Map;
@@ -39,7 +39,7 @@ public class ExtensionUtilTest {
String value = "value";
extensions.put("extension", value);
customExtensionUtil.setExtensions(activity, extensions);
- assert (!Strings.isNullOrEmpty((String)customExtensionUtil.getExtension(activity, "extension")));
+ assert (StringUtils.isNotBlank((String) customExtensionUtil.getExtension(activity, "extension")));
extensions = customExtensionUtil.getExtensions(activity);
assert (value.equals((String)extensions.get("extension")));
assert (activity.getAdditionalProperties().get("ext") != null);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeDeserializer.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeDeserializer.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeDeserializer.java
index d64fd53..50ffb5d 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeDeserializer.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeDeserializer.java
@@ -23,7 +23,6 @@ import org.apache.streams.data.util.RFC3339Utils;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.google.common.collect.Lists;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -32,6 +31,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -45,7 +45,7 @@ import java.util.List;
*/
public class StreamsDateTimeDeserializer extends StdDeserializer<DateTime> implements Serializable {
- List<DateTimeFormatter> formatters = Lists.newArrayList();
+ private List<DateTimeFormatter> formatters = new ArrayList<>();
private static final Logger LOGGER = LoggerFactory.getLogger(StreamsDateTimeDeserializer.class);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeFormat.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeFormat.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeFormat.java
index a3cc936..55b198d 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeFormat.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeFormat.java
@@ -26,6 +26,6 @@ package org.apache.streams.jackson;
*/
public interface StreamsDateTimeFormat {
- public String getFormat();
+ String getFormat();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeSerializer.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeSerializer.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeSerializer.java
index 0bae22f..4310503 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeSerializer.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsDateTimeSerializer.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
/**
* StreamsDateTimeSerializer is a supporting class for
- * @see {@link org.apache.streams.jackson.StreamsJacksonMapper}.
+ * @link org.apache.streams.jackson.StreamsJacksonMapper.
*/
public class StreamsDateTimeSerializer extends StdSerializer<DateTime> implements Serializable {
@@ -40,6 +40,6 @@ public class StreamsDateTimeSerializer extends StdSerializer<DateTime> implement
@Override
public void serialize(DateTime value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
- jgen.writeString(RFC3339Utils.getInstance().format(value));
+ jgen.writeString(RFC3339Utils.format(value));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
index 6df9f85..f31efc4 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonMapper.java
@@ -28,11 +28,11 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.module.scala.DefaultScalaModule;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* StreamsJacksonMapper is the recommended interface to jackson for any streams component.
@@ -45,7 +45,7 @@ import java.util.Map;
*/
public class StreamsJacksonMapper extends ObjectMapper {
- private static Map<StreamsJacksonMapperConfiguration, StreamsJacksonMapper> INSTANCE_MAP = Maps.newConcurrentMap();
+ private static Map<StreamsJacksonMapperConfiguration, StreamsJacksonMapper> INSTANCE_MAP = new ConcurrentHashMap<>();
private StreamsJacksonMapperConfiguration configuration = new StreamsJacksonMapperConfiguration();
@@ -81,9 +81,7 @@ public class StreamsJacksonMapper extends ObjectMapper {
@Deprecated
public static StreamsJacksonMapper getInstance(String format) {
- StreamsJacksonMapper instance = new StreamsJacksonMapper(Lists.newArrayList(format));
-
- return instance;
+ return new StreamsJacksonMapper(Collections.singletonList(format));
}
@@ -95,9 +93,7 @@ public class StreamsJacksonMapper extends ObjectMapper {
@Deprecated
public static StreamsJacksonMapper getInstance(List<String> formats) {
- StreamsJacksonMapper instance = new StreamsJacksonMapper(formats);
-
- return instance;
+ return new StreamsJacksonMapper(formats);
}
@@ -119,7 +115,7 @@ public class StreamsJacksonMapper extends ObjectMapper {
@Deprecated
public StreamsJacksonMapper(String format) {
super();
- registerModule(new StreamsJacksonModule(Lists.newArrayList(format)));
+ registerModule(new StreamsJacksonModule(Collections.singletonList(format)));
if ( configuration.getEnableScala()) {
registerModule(new DefaultScalaModule());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonModule.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonModule.java b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonModule.java
index 6696885..6445881 100644
--- a/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonModule.java
+++ b/streams-pojo/src/main/java/org/apache/streams/jackson/StreamsJacksonModule.java
@@ -34,7 +34,7 @@ import java.util.Set;
/**
* StreamsJacksonModule is a supporting class for
- * @see {@link org.apache.streams.jackson.StreamsJacksonMapper}.
+ * @link org.apache.streams.jackson.StreamsJacksonMapper
*
* <p/>
* RFC3339 dates are supported by default.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
index 1bd8427..258108c 100644
--- a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
+++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
@@ -64,7 +64,7 @@ public class ActivitySerDeTest {
.getResourceAsStream("activities/" + file);
Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
activity.setGenerator(null);
- activity.setLinks(new LinkedList<String>());
+ activity.setLinks(new LinkedList<>());
String activityString = MAPPER.writeValueAsString(activity);
LOGGER.info("Deserialized: " + activityString );
assert ( !activityString.contains("null") );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
index 9e5089e..d4d697b 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
@@ -22,7 +22,6 @@ import org.apache.streams.config.StreamsConfiguration;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.DatumStatusCountable;
import org.apache.streams.core.StreamBuilder;
-import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsPersistWriter;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.core.StreamsProvider;
@@ -130,7 +129,7 @@ public class LocalStreamBuilder implements StreamBuilder {
@Deprecated
public LocalStreamBuilder(int maxQueueCapacity, Map<String, Object> streamConfig) {
this(new LocalRuntimeConfiguration());
- this.streamConfig.setQueueSize(new Long(maxQueueCapacity));
+ this.streamConfig.setQueueSize((long) maxQueueCapacity);
if( streamConfig != null && streamConfig.get(LocalStreamBuilder.TIMEOUT_KEY) != null )
this.streamConfig.setProviderTimeoutMs(new Long((Integer) (streamConfig.get(LocalStreamBuilder.TIMEOUT_KEY))));
if( streamConfig != null && streamConfig.get(LocalStreamBuilder.STREAM_IDENTIFIER_KEY) != null )
@@ -146,8 +145,8 @@ public class LocalStreamBuilder implements StreamBuilder {
public LocalStreamBuilder(LocalRuntimeConfiguration streamConfig) {
this.streamConfig = streamConfig;
- this.providers = new HashMap<String, StreamComponent>();
- this.components = new HashMap<String, StreamComponent>();
+ this.providers = new HashMap<>();
+ this.components = new HashMap<>();
this.totalTasks = 0;
this.monitorTasks = 0;
this.futures = new HashMap<>();
@@ -157,13 +156,10 @@ public class LocalStreamBuilder implements StreamBuilder {
this.streamIdentifier = streamConfig.getIdentifier();
this.streamConfig.setStartedAt(startedAt.getMillis());
final LocalStreamBuilder self = this;
- this.shutdownHook = new Thread() {
- @Override
- public void run() {
- LOGGER.debug("Shutdown hook received. Beginning shutdown");
- self.stopInternal(true);
- }
- };
+ this.shutdownHook = new Thread(() -> {
+ LOGGER.debug("Shutdown hook received. Beginning shutdown");
+ self.stopInternal(true);
+ });
this.useDeprecatedMonitors = false;
this.broadcastMonitor = new BroadcastMonitorThread(this.streamConfig.getMonitoring());
}
@@ -226,7 +222,7 @@ public class LocalStreamBuilder implements StreamBuilder {
@Override
public StreamBuilder addStreamsProcessor(String id, StreamsProcessor processor, int numTasks, String... inBoundIds) {
validateId(id);
- StreamComponent comp = new StreamComponent(id, processor, new ThroughputQueue<StreamsDatum>(this.maxQueueCapacity, id, streamIdentifier, startedAt.getMillis()), numTasks, streamConfig);
+ StreamComponent comp = new StreamComponent(id, processor, new ThroughputQueue<>(this.maxQueueCapacity, id, streamIdentifier, startedAt.getMillis()), numTasks, streamConfig);
this.components.put(id, comp);
connectToOtherComponents(inBoundIds, comp);
this.totalTasks += numTasks;
@@ -238,7 +234,7 @@ public class LocalStreamBuilder implements StreamBuilder {
@Override
public StreamBuilder addStreamsPersistWriter(String id, StreamsPersistWriter writer, int numTasks, String... inBoundIds) {
validateId(id);
- StreamComponent comp = new StreamComponent(id, writer, new ThroughputQueue<StreamsDatum>(this.maxQueueCapacity, id, streamIdentifier, startedAt.getMillis()), numTasks, streamConfig);
+ StreamComponent comp = new StreamComponent(id, writer, new ThroughputQueue<>(this.maxQueueCapacity, id, streamIdentifier, startedAt.getMillis()), numTasks, streamConfig);
this.components.put(id, comp);
connectToOtherComponents(inBoundIds, comp);
this.totalTasks += numTasks;
@@ -257,8 +253,8 @@ public class LocalStreamBuilder implements StreamBuilder {
boolean isRunning = true;
this.executor = new ShutdownStreamOnUnhandleThrowableThreadPoolExecutor(this.totalTasks, this);
this.monitor = Executors.newCachedThreadPool();
- Map<String, StreamsProviderTask> provTasks = new HashMap<String, StreamsProviderTask>();
- tasks = new HashMap<String, List<StreamsTask>>();
+ Map<String, StreamsProviderTask> provTasks = new HashMap<>();
+ tasks = new HashMap<>();
boolean forcedShutDown = false;
try {
@@ -279,7 +275,7 @@ public class LocalStreamBuilder implements StreamBuilder {
boolean tasksRunning = false;
for(StreamsTask t : task.getStreamsTasks()) {
if(t instanceof BaseStreamsTask) {
- tasksRunning = tasksRunning || ((BaseStreamsTask) t).isRunning();
+ tasksRunning = tasksRunning || t.isRunning();
}
}
isRunning = isRunning || (tasksRunning && task.getInBoundQueue().size() > 0);
@@ -376,7 +372,7 @@ public class LocalStreamBuilder implements StreamBuilder {
protected void setupComponentTasks(Map<String, List<StreamsTask>> streamsTasks) {
for(StreamComponent comp : this.components.values()) {
int tasks = comp.getNumTasks();
- List<StreamsTask> compTasks = new LinkedList<StreamsTask>();
+ List<StreamsTask> compTasks = new LinkedList<>();
StreamsTaskCounter counter = new StreamsTaskCounter(comp.getId(), streamIdentifier, startedAt.getMillis());
for(int i=0; i < tasks; ++i) {
StreamsTask task = comp.createConnectedTask(getTimeout());
@@ -472,7 +468,7 @@ public class LocalStreamBuilder implements StreamBuilder {
private void connectToOtherComponents(String[] conntectToIds, StreamComponent toBeConnected) {
for(String id : conntectToIds) {
- StreamComponent upStream = null;
+ StreamComponent upStream;
if(this.providers.containsKey(id)) {
upStream = this.providers.get(id);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/StreamComponent.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/StreamComponent.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/StreamComponent.java
index 75799b7..d0c7fe2 100644
--- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/StreamComponent.java
+++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/StreamComponent.java
@@ -146,8 +146,8 @@ public class StreamComponent implements Serializable {
}
private void initializePrivateVariables() {
- this.inBound = new HashSet<StreamComponent>();
- this.outBound = new HashMap<StreamComponent, BlockingQueue<StreamsDatum>>();
+ this.inBound = new HashSet<>();
+ this.outBound = new HashMap<>();
this.tasks = Lists.newArrayList();
}
@@ -211,7 +211,7 @@ public class StreamComponent implements Serializable {
StreamsTask task;
if(this.processor != null) {
if(this.numTasks > 1) {
- task = new StreamsProcessorTask((StreamsProcessor)SerializationUtil.cloneBySerialization(this.processor), streamConfig);
+ task = new StreamsProcessorTask(SerializationUtil.cloneBySerialization(this.processor), streamConfig);
task.addInputQueue(this.inQueue);
for(BlockingQueue<StreamsDatum> q : this.outBound.values()) {
task.addOutputQueue(q);
@@ -226,7 +226,7 @@ public class StreamComponent implements Serializable {
}
else if(this.writer != null) {
if(this.numTasks > 1) {
- task = new StreamsPersistWriterTask((StreamsPersistWriter) SerializationUtil.cloneBySerialization(this.writer), streamConfig);
+ task = new StreamsPersistWriterTask(SerializationUtil.cloneBySerialization(this.writer), streamConfig);
task.addInputQueue(this.inQueue);
} else {
task = new StreamsPersistWriterTask(this.writer, streamConfig);
@@ -236,7 +236,7 @@ public class StreamComponent implements Serializable {
else if(this.provider != null) {
StreamsProvider prov;
if(this.numTasks > 1) {
- prov = (StreamsProvider)SerializationUtil.cloneBySerialization(this.provider);
+ prov = SerializationUtil.cloneBySerialization(this.provider);
} else {
prov = this.provider;
}
@@ -284,21 +284,18 @@ public class StreamComponent implements Serializable {
@Override
public boolean equals(Object o) {
- if(o instanceof StreamComponent)
- return this.id.equals(((StreamComponent) o).id);
- else
- return false;
+ return o instanceof StreamComponent && this.id.equals(((StreamComponent) o).id);
}
protected StreamsOperation getOperation() {
if(this.processor != null) {
- return (StreamsOperation) this.processor;
+ return this.processor;
}
else if(this.writer != null) {
- return (StreamsOperation) this.writer;
+ return this.writer;
}
else if(this.provider != null) {
- return (StreamsOperation) this.provider;
+ return this.provider;
}
else {
throw new InvalidStreamException("Underlying StreamComponoent was NULL.");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-runtimes/streams-runtime-pig/src/main/java/org/apache/streams/pig/StreamsProcessDatumExec.java
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-pig/src/main/java/org/apache/streams/pig/StreamsProcessDatumExec.java b/streams-runtimes/streams-runtime-pig/src/main/java/org/apache/streams/pig/StreamsProcessDatumExec.java
index cd08020..3a71ffe 100644
--- a/streams-runtimes/streams-runtime-pig/src/main/java/org/apache/streams/pig/StreamsProcessDatumExec.java
+++ b/streams-runtimes/streams-runtime-pig/src/main/java/org/apache/streams/pig/StreamsProcessDatumExec.java
@@ -26,7 +26,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import datafu.pig.util.AliasableEvalFunc;
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
@@ -42,8 +41,10 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
/**
@@ -59,13 +60,13 @@ public class StreamsProcessDatumExec extends AliasableEvalFunc<DataBag> {
StreamsProcessor streamsProcessor;
- ObjectMapper mapper = StreamsJacksonMapper.getInstance();
+ private ObjectMapper mapper = StreamsJacksonMapper.getInstance();
public StreamsProcessDatumExec(String... execArgs) throws ClassNotFoundException{
- Preconditions.checkNotNull(execArgs);
+ Objects.requireNonNull(execArgs);
Preconditions.checkArgument(execArgs.length > 0);
String classFullName = execArgs[0];
- Preconditions.checkNotNull(classFullName);
+ Objects.requireNonNull(classFullName);
String[] prepareArgs = (String[]) ArrayUtils.remove(execArgs, 0);
streamsProcessor = StreamsComponentFactory.getProcessorInstance(Class.forName(classFullName));
if( execArgs.length == 1 ) {
@@ -112,7 +113,7 @@ public class StreamsProcessDatumExec extends AliasableEvalFunc<DataBag> {
StreamsDatum entry = new StreamsDatum(object, id, new DateTime(timestamp));
List<StreamsDatum> resultSet = streamsProcessor.process(entry);
- List<Tuple> resultTupleList = Lists.newArrayList();
+ List<Tuple> resultTupleList = new ArrayList<>();
for( StreamsDatum resultDatum : resultSet ) {
Tuple tuple = mTupleFactory.newTuple();
@@ -127,9 +128,7 @@ public class StreamsProcessDatumExec extends AliasableEvalFunc<DataBag> {
resultTupleList.add(tuple);
}
- DataBag result = mBagFactory.newDefaultBag(resultTupleList);
-
- return result;
+ return mBagFactory.newDefaultBag(resultTupleList);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
index 514c851..26a6284 100644
--- a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
+++ b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
@@ -18,7 +18,6 @@
package org.apache.streams.util;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/GuidUtils.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/GuidUtils.java b/streams-util/src/main/java/org/apache/streams/util/GuidUtils.java
index 2d129de..c0767d4 100644
--- a/streams-util/src/main/java/org/apache/streams/util/GuidUtils.java
+++ b/streams-util/src/main/java/org/apache/streams/util/GuidUtils.java
@@ -19,10 +19,12 @@
package org.apache.streams.util;
import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
import com.google.common.hash.Hashing;
+import org.apache.commons.lang3.StringUtils;
import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Objects;
/**
* GuidUtils contains methods for generating guids from identifiers.
@@ -41,14 +43,12 @@ public class GuidUtils {
StringBuilder seed = new StringBuilder();
for ( String part : parts ) {
- Preconditions.checkNotNull(part);
- Preconditions.checkArgument(!Strings.isNullOrEmpty(part));
+ Objects.requireNonNull(part);
+ Preconditions.checkArgument(!StringUtils.isNotBlank(part));
seed.append(part);
}
- String hash = Hashing.goodFastHash(24).hashString(seed, UTF8_CHARSET).asBytes().toString();
-
- return hash;
+ return Arrays.toString(Hashing.goodFastHash(24).hashString(seed, UTF8_CHARSET).asBytes());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/SerializationUtil.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/SerializationUtil.java b/streams-util/src/main/java/org/apache/streams/util/SerializationUtil.java
index ba22d3d..4a4d831 100644
--- a/streams-util/src/main/java/org/apache/streams/util/SerializationUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/SerializationUtil.java
@@ -70,10 +70,8 @@ public class SerializationUtil {
Object ret = ois.readObject();
ois.close();
return ret;
- } catch (IOException ioe) {
+ } catch (IOException | ClassNotFoundException ioe) {
throw new RuntimeException(ioe);
- } catch (ClassNotFoundException ex) {
- throw new RuntimeException(ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/oauth/tokens/tokenmanager/impl/BasicTokenManager.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/oauth/tokens/tokenmanager/impl/BasicTokenManager.java b/streams-util/src/main/java/org/apache/streams/util/oauth/tokens/tokenmanager/impl/BasicTokenManager.java
index 7c1a9e3..d69c61f 100644
--- a/streams-util/src/main/java/org/apache/streams/util/oauth/tokens/tokenmanager/impl/BasicTokenManager.java
+++ b/streams-util/src/main/java/org/apache/streams/util/oauth/tokens/tokenmanager/impl/BasicTokenManager.java
@@ -47,21 +47,17 @@ public class BasicTokenManager<T> implements SimpleTokenManager<T> {
*/
public BasicTokenManager(Collection<T> tokens) {
if (tokens != null) {
- this.availableTokens = new ArrayList<T>(tokens.size());
+ this.availableTokens = new ArrayList<>(tokens.size());
this.addAllTokensToPool(tokens);
} else {
- this.availableTokens = new ArrayList<T>();
+ this.availableTokens = new ArrayList<>();
}
this.nextToken = 0;
}
@Override
public synchronized boolean addTokenToPool(T token) {
- if (token == null || this.availableTokens.contains(token)) {
- return false;
- } else {
- return this.availableTokens.add(token);
- }
+ return !(token == null || this.availableTokens.contains(token)) && this.availableTokens.add(token);
}
@Override
@@ -75,9 +71,9 @@ public class BasicTokenManager<T> implements SimpleTokenManager<T> {
@Override
public synchronized T getNextAvailableToken() {
- T token = null;
+ T token;
if (this.availableTokens.size() == 0) {
- return token;
+ return null;
} else {
token = this.availableTokens.get(nextToken++);
if (nextToken == this.availableTokens.size()) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java b/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
index a437ca4..acbe12f 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
@@ -36,20 +36,21 @@ public class FieldUtil {
return null;
}
String typeSchemaFieldValue = fieldNode.get(typeSchemaField).asText();
- if ( typeSchemaFieldValue.equals("string")) {
- return FieldType.STRING;
- } else if ( typeSchemaFieldValue.equals("integer")) {
- return FieldType.INTEGER;
- } else if ( typeSchemaFieldValue.equals("number")) {
- return FieldType.NUMBER;
- } else if ( typeSchemaFieldValue.equals("object")) {
- return FieldType.OBJECT;
- } else if ( typeSchemaFieldValue.equals("boolean")) {
- return FieldType.BOOLEAN;
- } else if ( typeSchemaFieldValue.equals("array")) {
- return FieldType.ARRAY;
- } else {
- return null;
+ switch (typeSchemaFieldValue) {
+ case "string":
+ return FieldType.STRING;
+ case "integer":
+ return FieldType.INTEGER;
+ case "number":
+ return FieldType.NUMBER;
+ case "object":
+ return FieldType.OBJECT;
+ case "boolean":
+ return FieldType.BOOLEAN;
+ case "array":
+ return FieldType.ARRAY;
+ default:
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java b/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
index 5acd5a8..9de044a 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
@@ -19,7 +19,7 @@
package org.apache.streams.util.schema;
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;
@@ -45,7 +45,7 @@ public class FileUtil {
* @return without path prefix
*/
public static String dropSourcePathPrefix(String inputFile, String sourceDirectory) {
- if (Strings.isNullOrEmpty(sourceDirectory)) {
+ if (StringUtils.isBlank(sourceDirectory)) {
return inputFile;
} else {
try {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
index 4fca239..5bdf8b0 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
@@ -19,11 +19,11 @@
package org.apache.streams.util.schema;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Optional;
import java.net.URI;
import java.util.Comparator;
import java.util.Iterator;
+import java.util.Optional;
/**
* A SchemaStore resolves and indexes json schemas and makes their properties available.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
index e99380d..6d8cf8b 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
@@ -21,7 +21,6 @@ package org.apache.streams.util.schema;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
import org.apache.commons.lang3.StringUtils;
@@ -31,11 +30,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.URI;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import static org.apache.streams.util.schema.UriUtil.safeResolve;
@@ -47,7 +46,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
private static final Logger LOGGER = LoggerFactory.getLogger(SchemaStore.class);
private static final JsonNodeFactory NODE_FACTORY = JsonNodeFactory.instance;
- protected Map<URI, Schema> schemas = new HashMap();
+ protected Map<URI, Schema> schemas = new HashMap<>();
protected FragmentResolver fragmentResolver = new FragmentResolver();
protected ContentResolver contentResolver = new ContentResolver();
@@ -66,7 +65,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
this.schemas.put(uri, new Schema(uri, childContent, newSchema, false));
} else {
if ( baseNode.has("extends") && baseNode.get("extends").isObject()) {
- URI ref = URI.create(((ObjectNode)baseNode.get("extends")).get("$ref").asText());
+ URI ref = URI.create((baseNode.get("extends")).get("$ref").asText());
URI absoluteUri;
if ( ref.isAbsolute()) {
absoluteUri = ref;
@@ -74,7 +73,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
absoluteUri = baseUri.resolve(ref);
}
JsonNode parentNode = this.contentResolver.resolve(absoluteUri);
- Schema parentSchema = null;
+ Schema parentSchema;
if ( this.schemas.get(absoluteUri) != null ) {
parentSchema = this.schemas.get(absoluteUri);
} else {
@@ -148,7 +147,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
return Optional.of(schema);
}
}
- return Optional.absent();
+ return Optional.empty();
}
@Override
@@ -158,7 +157,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
return Optional.of(schema);
}
}
- return Optional.absent();
+ return Optional.empty();
}
@Override
@@ -186,7 +185,7 @@ public class SchemaStoreImpl extends Ordering<Schema> implements SchemaStore {
@Override
public Iterator<Schema> getSchemaIterator() {
List<Schema> schemaList = Lists.newArrayList(schemas.values());
- Collections.sort(schemaList, this);
+ schemaList.sort(this);
return schemaList.iterator();
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/main/java/org/apache/streams/util/schema/UriUtil.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/schema/UriUtil.java b/streams-util/src/main/java/org/apache/streams/util/schema/UriUtil.java
index 33b656d..5bd1dc5 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/UriUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/UriUtil.java
@@ -18,10 +18,10 @@
package org.apache.streams.util.schema;
-import com.google.common.base.Optional;
import org.apache.commons.lang3.StringUtils;
import java.net.URI;
+import java.util.Optional;
/**
* UriUtil contains methods to assist in resolving URIs and URI fragments.
@@ -44,12 +44,12 @@ public class UriUtil {
*/
public static Optional<URI> safeResolve(URI absolute, String relativePart) {
if ( !absolute.isAbsolute()) {
- return Optional.absent();
+ return Optional.empty();
}
try {
return Optional.of(absolute.resolve(relativePart));
} catch ( IllegalArgumentException ex ) {
- return Optional.absent();
+ return Optional.empty();
}
}