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(); } }
